# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1227413205 0
# Node ID f18f67d0548a4a0adccce488d5f53078fc8bd243
# Parent  7c09f32d01cba2ce87749c9b17a2095700255339# Parent  c26d9f8063222c1f4ba66935aafb1c817d1f8ea4
merge of '8298236e9cd6a6127656eacf513bc6928bee9065'
     and 'f75666909dcf5a84177e1cc50025f197341650f1'

diff -r 7c09f32d01cb -r f18f67d0548a libpurple/protocols/jabber/parser.c
--- 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);
 	}
 }
 
diff -r 7c09f32d01cb -r f18f67d0548a libpurple/protocols/jabber/presence.c
--- 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;
 		}
 
diff -r 7c09f32d01cb -r f18f67d0548a libpurple/protocols/jabber/si.c
--- 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;
diff -r 7c09f32d01cb -r f18f67d0548a libpurple/protocols/msn/notification.c
diff -r 7c09f32d01cb -r f18f67d0548a libpurple/protocols/msn/servconn.c
--- 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);
diff -r 7c09f32d01cb -r f18f67d0548a libpurple/protocols/sametime/sametime.c
--- 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