[gaim-migrate @ 10903]

Wed, 08 Sep 2004 22:15:23 +0000

author
Nathan Walp <nwalp@pidgin.im>
date
Wed, 08 Sep 2004 22:15:23 +0000
changeset 9990
37b4db8472e6
parent 9989
e96493a81b0e
child 9991
a02e6b4e0959

[gaim-migrate @ 10903]
i thought I committed these

src/protocols/jabber/presence.c file | annotate | diff | comparison | revisions
src/protocols/jabber/roster.c file | annotate | diff | comparison | revisions
--- a/src/protocols/jabber/presence.c	Wed Sep 08 20:43:41 2004 +0000
+++ b/src/protocols/jabber/presence.c	Wed Sep 08 22:15:23 2004 +0000
@@ -71,9 +71,9 @@
 				jabber_buddy_track_resource(jb, js->user->resource, priority, state, msg);
 			}
 			if((jbr = jabber_buddy_find_resource(jb, NULL))) {
-				gaim_prpl_got_user_status(js->gc->account, my_base_jid, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status);
+				gaim_prpl_got_user_status(js->gc->account, my_base_jid, jabber_buddy_state_get_status_id(jbr->state), "priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL);
 			} else {
-				gaim_prpl_got_user_status(js->gc->account, my_base_jid, "offline", msg ? "message" : NULL, msg);
+				gaim_prpl_got_user_status(js->gc->account, my_base_jid, "offline", msg ? "message" : NULL, msg, NULL);
 			}
 		}
 	}
@@ -431,10 +431,10 @@
 
 		if((found_jbr = jabber_buddy_find_resource(jb, NULL))) {
 			if(!jbr || jbr == found_jbr) {
-				gaim_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(state), "priority", found_jbr->priority, found_jbr->status ? "message" : NULL, found_jbr->status);
+				gaim_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(state), "priority", found_jbr->priority, found_jbr->status ? "message" : NULL, found_jbr->status, NULL);
 			}
 		} else {
-			gaim_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status);
+			gaim_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status, NULL);
 		}
 		g_free(buddy_name);
 	}
--- a/src/protocols/jabber/roster.c	Wed Sep 08 20:43:41 2004 +0000
+++ b/src/protocols/jabber/roster.c	Wed Sep 08 22:15:23 2004 +0000
@@ -278,7 +278,7 @@
 	} else if((jbr =jabber_buddy_find_resource(jb, NULL))) {
 		gaim_prpl_got_user_status(gc->account, who,
 				jabber_buddy_state_get_status_id(jbr->state),
-				"priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status);
+				"priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL);
 	}
 
 	g_free(my_bare_jid);

mercurial