Mercurial > pidgin
changeset 24489:f18f67d0548a
merge of '8298236e9cd6a6127656eacf513bc6928bee9065'
and 'f75666909dcf5a84177e1cc50025f197341650f1'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 23 Nov 2008 04:06:45 +0000 |
| parents | 7c09f32d01cb (current diff) c26d9f806322 (diff) |
| children | 3f80f211417e |
| files | libpurple/protocols/msn/notification.c |
| diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/parser.c Sun Nov 23 04:04:57 2008 +0000 +++ b/libpurple/protocols/jabber/parser.c Sun Nov 23 04:06:45 2008 +0000 @@ -114,7 +114,8 @@ xmlnode *packet = js->current; js->current = NULL; jabber_process_packet(js, &packet); - xmlnode_free(packet); + if (packet != NULL) + xmlnode_free(packet); } }
--- a/libpurple/protocols/jabber/presence.c Sun Nov 23 04:04:57 2008 +0000 +++ b/libpurple/protocols/jabber/presence.c Sun Nov 23 04:06:45 2008 +0000 @@ -459,7 +459,7 @@ if (buddy) { jb = jabber_buddy_find(js, from, TRUE); - if ((jb->subscription & JABBER_SUB_TO)) + if ((jb->subscription & (JABBER_SUB_TO | JABBER_SUB_PENDING))) onlist = TRUE; }
--- a/libpurple/protocols/jabber/si.c Sun Nov 23 04:04:57 2008 +0000 +++ b/libpurple/protocols/jabber/si.c Sun Nov 23 04:06:45 2008 +0000 @@ -798,7 +798,7 @@ if (!(sh->jid && sh->host && sh->port > 0)) continue; - purple_debug_info("jabber", "jabber_si_xfer_bytestreams_listen_cb() will be looking at jsx %p: jsx->streamhosts %p and sh->jid %p", + purple_debug_info("jabber", "jabber_si_xfer_bytestreams_listen_cb() will be looking at jsx %p: jsx->streamhosts %p and sh->jid %p\n", jsx, jsx->streamhosts, sh->jid); if(g_list_find_custom(jsx->streamhosts, sh->jid, jabber_si_compare_jid) != NULL) continue;
--- a/libpurple/protocols/msn/servconn.c Sun Nov 23 04:04:57 2008 +0000 +++ b/libpurple/protocols/msn/servconn.c Sun Nov 23 04:06:45 2008 +0000 @@ -69,8 +69,7 @@ return; } - if (servconn->connected) - msn_servconn_disconnect(servconn); + msn_servconn_disconnect(servconn); if (servconn->destroy_cb) servconn->destroy_cb(servconn);
--- a/libpurple/protocols/sametime/sametime.c Sun Nov 23 04:04:57 2008 +0000 +++ b/libpurple/protocols/sametime/sametime.c Sun Nov 23 04:06:45 2008 +0000 @@ -1445,7 +1445,7 @@ MW_PLUGIN_DEFAULT_HOST); if(purple_account_get_bool(account, MW_KEY_FORCE, FALSE) || - (! strcmp(current_host, host)) || + !host || (! strcmp(current_host, host)) || (purple_proxy_connect(NULL, account, host, port, connect_cb, pd) == NULL)) { /* if we're configured to force logins, or if we're being