Mercurial > pidgin
changeset 25878:9f000fb8664e
Fix up the propagate from im.pidgin.pidgin
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 12 Dec 2008 20:24:24 +0000 |
| parents | 1260a3fb60f4 |
| children | fea25a73edba |
| files | libpurple/protocols/bonjour/jabber.c libpurple/protocols/msn/msn.c |
| diffstat | 2 files changed, 18 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/bonjour/jabber.c Fri Dec 12 20:03:58 2008 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Fri Dec 12 20:24:24 2008 +0000 @@ -379,6 +379,23 @@ purple_debug_warning("bonjour", "Unknown packet: %s\n", packet->name ? packet->name : "(null)"); } +static void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv) { + const gchar *name = NULL; + BonjourBuddy *bb = NULL; + + if(bconv->pb != NULL) { + name = purple_buddy_get_name(bconv->pb); + bb = purple_buddy_get_protocol_data(bconv->pb); + } + + purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name ? name : "(unknown)"); + + /* Close the socket, clear the watcher and free memory */ + bonjour_jabber_close_conversation(bconv); + + if(bb) + bb->conversation = NULL; +} static void _client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition) @@ -427,24 +444,6 @@ bonjour_parser_process(bconv, message, message_length); } -static void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv) { - const gchar *name = NULL; - BonjourBuddy *bb = NULL; - - if(bconv->pb != NULL) { - name = purple_buddy_get_name(bconv->pb); - bb = purple_buddy_get_protocol_data(bconv->pb); - } - - purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name ? name : "(unknown)"); - - /* Close the socket, clear the watcher and free memory */ - bonjour_jabber_close_conversation(bconv); - - if(bb) - bb->conversation = NULL; -} - struct _stream_start_data { char *msg; };
--- a/libpurple/protocols/msn/msn.c Fri Dec 12 20:03:58 2008 +0000 +++ b/libpurple/protocols/msn/msn.c Fri Dec 12 20:24:24 2008 +0000 @@ -1459,7 +1459,7 @@ msn_userlist_add_buddy(userlist, who, gname); } else { /* We need to check the network for this buddy first */ - msn_userlist_save_pending_buddy(userlist, who, gname : NULL); + msn_userlist_save_pending_buddy(userlist, who, gname); msn_notification_send_fqy(session, who); } }