Mercurial > pidgin

changeset 26856:c837cf614adc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'bc166fa1753ca1852b8b0dd0566d93a85644884f' and 'e160cbb1c4048444bbd3bff885d56e49eb34ee1e'
author Paul Aurich <paul@darkrain42.org>
date Sun, 10 May 2009 22:00:38 +0000
parents edff8cc58d66 (current diff) 40de88e41162 (diff)
children 657d42e865dd
files
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c	Sun May 10 21:59:30 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sun May 10 22:00:38 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 21:59:30 2009 +0000
+++ b/libpurple/protocols/jabber/disco.h	Sun May 10 22:00:38 2009 +0000
@@ -1,5 +1,5 @@
 /**
- * @file iq.h JabberID handlers
+ * @file disco.h service discovery handlers
  *
  * purple
  *
--- a/libpurple/protocols/jabber/oob.h	Sun May 10 21:59:30 2009 +0000
+++ b/libpurple/protocols/jabber/oob.h	Sun May 10 22:00:38 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 21:59:30 2009 +0000
+++ b/libpurple/protocols/jabber/ping.h	Sun May 10 22:00:38 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 21:59:30 2009 +0000
+++ b/libpurple/protocols/jabber/si.h	Sun May 10 22:00:38 2009 +0000
@@ -1,5 +1,5 @@
 /**
- * @file jutil.h utility functions
+ * @file si.h SI transfer functions
  *
  * purple
  *