# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1241994277 0
# Node ID 88f1db1da582eb3efded7b834dd2f4eb40d3a5d6
# Parent  55a8fe9d824729de9927885681144800a06d33d4# Parent  657d42e865ddfdbb9f734b68f388bb6331ba53df
merge of 'd1fea663a03e5f80f539918a21f5f36c09a452b8'
     and 'f936cb2a5d4eb080fa7be1ee1b6599c98e9e12f4'

diff -r 55a8fe9d8247 -r 88f1db1da582 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Sun May 10 22:23:52 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sun May 10 22:24:37 2009 +0000
@@ -1741,7 +1741,7 @@
 		g_free(full_jid);
 	}
 
-	if (!jb->resources) {
+	if (!jb->resources && strchr(jid, '/') == NULL) {
 		/* user is offline, send a jabber:iq:last to find out last time online */
 		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
 		xmlnode_set_attrib(iq->node, "to", jid);
diff -r 55a8fe9d8247 -r 88f1db1da582 libpurple/protocols/jabber/disco.h
--- a/libpurple/protocols/jabber/disco.h	Sun May 10 22:23:52 2009 +0000
+++ b/libpurple/protocols/jabber/disco.h	Sun May 10 22:24:37 2009 +0000
@@ -1,5 +1,5 @@
 /**
- * @file iq.h JabberID handlers
+ * @file disco.h service discovery handlers
  *
  * purple
  *
diff -r 55a8fe9d8247 -r 88f1db1da582 libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Sun May 10 22:23:52 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Sun May 10 22:24:37 2009 +0000
@@ -764,7 +764,8 @@
 
 	/* Acknowledge the notification */
 	iq = jabber_iq_new(js, JABBER_IQ_RESULT);
-	xmlnode_set_attrib(iq->node, "to", from);
+	if (from)
+		xmlnode_set_attrib(iq->node, "to", from);
 	xmlnode_set_attrib(iq->node, "id", id);
 	jabber_iq_send(iq);
 
diff -r 55a8fe9d8247 -r 88f1db1da582 libpurple/protocols/jabber/oob.h
--- a/libpurple/protocols/jabber/oob.h	Sun May 10 22:23:52 2009 +0000
+++ b/libpurple/protocols/jabber/oob.h	Sun May 10 22:24:37 2009 +0000
@@ -1,5 +1,5 @@
 /**
- * @file jutil.h utility functions
+ * @file oob.h out-of-band transfer functions
  *
  * purple
  *
diff -r 55a8fe9d8247 -r 88f1db1da582 libpurple/protocols/jabber/ping.h
--- a/libpurple/protocols/jabber/ping.h	Sun May 10 22:23:52 2009 +0000
+++ b/libpurple/protocols/jabber/ping.h	Sun May 10 22:24:37 2009 +0000
@@ -1,5 +1,5 @@
 /**
- * @file ping.h utility functions
+ * @file ping.h ping functions
  *
  * purple
  *
diff -r 55a8fe9d8247 -r 88f1db1da582 libpurple/protocols/jabber/si.h
--- a/libpurple/protocols/jabber/si.h	Sun May 10 22:23:52 2009 +0000
+++ b/libpurple/protocols/jabber/si.h	Sun May 10 22:24:37 2009 +0000
@@ -1,5 +1,5 @@
 /**
- * @file jutil.h utility functions
+ * @file si.h SI transfer functions
  *
  * purple
  *