Mercurial > pidgin
comparison src/protocols/jabber/presence.c @ 9990:bd5517471d99
[gaim-migrate @ 10903]
i thought I committed these
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Wed, 08 Sep 2004 22:15:23 +0000 |
parents | a9fb4493ae22 |
children | 9f358a718f38 |
comparison
equal
deleted
inserted
replaced
9989:e4d971338093 | 9990:bd5517471d99 |
---|---|
69 jabber_buddy_remove_resource(jb, js->user->resource); | 69 jabber_buddy_remove_resource(jb, js->user->resource); |
70 } else { | 70 } else { |
71 jabber_buddy_track_resource(jb, js->user->resource, priority, state, msg); | 71 jabber_buddy_track_resource(jb, js->user->resource, priority, state, msg); |
72 } | 72 } |
73 if((jbr = jabber_buddy_find_resource(jb, NULL))) { | 73 if((jbr = jabber_buddy_find_resource(jb, NULL))) { |
74 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); | 74 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); |
75 } else { | 75 } else { |
76 gaim_prpl_got_user_status(js->gc->account, my_base_jid, "offline", msg ? "message" : NULL, msg); | 76 gaim_prpl_got_user_status(js->gc->account, my_base_jid, "offline", msg ? "message" : NULL, msg, NULL); |
77 } | 77 } |
78 } | 78 } |
79 } | 79 } |
80 g_free(my_base_jid); | 80 g_free(my_base_jid); |
81 } | 81 } |
429 state, status); | 429 state, status); |
430 } | 430 } |
431 | 431 |
432 if((found_jbr = jabber_buddy_find_resource(jb, NULL))) { | 432 if((found_jbr = jabber_buddy_find_resource(jb, NULL))) { |
433 if(!jbr || jbr == found_jbr) { | 433 if(!jbr || jbr == found_jbr) { |
434 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); | 434 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); |
435 } | 435 } |
436 } else { | 436 } else { |
437 gaim_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status); | 437 gaim_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status, NULL); |
438 } | 438 } |
439 g_free(buddy_name); | 439 g_free(buddy_name); |
440 } | 440 } |
441 g_free(status); | 441 g_free(status); |
442 jabber_id_free(jid); | 442 jabber_id_free(jid); |