Mercurial > pidgin

changeset 26858:88f1db1da582

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'd1fea663a03e5f80f539918a21f5f36c09a452b8' and 'f936cb2a5d4eb080fa7be1ee1b6599c98e9e12f4'
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 10 May 2009 22:24:37 +0000
parents 55a8fe9d8247 (current diff) 657d42e865dd (diff)
children ef61a2b746bd c69a2e88fee3
files
diffstat 6 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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
  *
--- 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);
 
--- 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
  *
--- 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
  *
--- 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
  *