diff options
| author | Paul Aurich <darkrain42@pidgin.im> | 2009-05-10 22:07:22 +0000 |
|---|---|---|
| committer | Paul Aurich <darkrain42@pidgin.im> | 2009-05-10 22:07:22 +0000 |
| commit | 67ec677a773183b0d36113c1d2126272b34cbb64 (patch) | |
| tree | 5cb24276244faf9f838f363a5fad9ea6369495e7 | |
| parent | f935d48c31cd3de2ca7b1ab40221125f0b69987a (diff) | |
| parent | 6322c3e35dded913d6f8b34036eca8aa7ba672af (diff) | |
| download | pidgin-67ec677a773183b0d36113c1d2126272b34cbb64.tar.gz | |
merge of 'baa7cbe5775a7d975ae89e23e89d3072cafbb0bc'
and '1223166a8d708c79d8c3bffb571569839da4d9be'
| -rw-r--r-- | libpurple/protocols/jabber/buddy.c | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/disco.h | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/google.c | 3 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/oob.h | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/ping.h | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/si.h | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c index 183cf4e39b..2e0c3f0ecc 100644 --- a/libpurple/protocols/jabber/buddy.c +++ b/libpurple/protocols/jabber/buddy.c @@ -1741,7 +1741,7 @@ static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid) 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 --git a/libpurple/protocols/jabber/disco.h b/libpurple/protocols/jabber/disco.h index 7a45086559..c6ae6ad2c7 100644 --- a/libpurple/protocols/jabber/disco.h +++ b/libpurple/protocols/jabber/disco.h @@ -1,5 +1,5 @@ /** - * @file iq.h JabberID handlers + * @file disco.h service discovery handlers * * purple * diff --git a/libpurple/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c index 837c1affce..48fcd10f54 100644 --- a/libpurple/protocols/jabber/google.c +++ b/libpurple/protocols/jabber/google.c @@ -764,7 +764,8 @@ jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type, /* 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 --git a/libpurple/protocols/jabber/oob.h b/libpurple/protocols/jabber/oob.h index 9b73a45fa1..c1103e6b12 100644 --- a/libpurple/protocols/jabber/oob.h +++ b/libpurple/protocols/jabber/oob.h @@ -1,5 +1,5 @@ /** - * @file jutil.h utility functions + * @file oob.h out-of-band transfer functions * * purple * diff --git a/libpurple/protocols/jabber/ping.h b/libpurple/protocols/jabber/ping.h index 4b1a22cca6..95eedac276 100644 --- a/libpurple/protocols/jabber/ping.h +++ b/libpurple/protocols/jabber/ping.h @@ -1,5 +1,5 @@ /** - * @file ping.h utility functions + * @file ping.h ping functions * * purple * diff --git a/libpurple/protocols/jabber/si.h b/libpurple/protocols/jabber/si.h index efbc8ce2d2..8186d94554 100644 --- a/libpurple/protocols/jabber/si.h +++ b/libpurple/protocols/jabber/si.h @@ -1,5 +1,5 @@ /** - * @file jutil.h utility functions + * @file si.h SI transfer functions * * purple * |