Mercurial > pidgin.yaz

changeset 28808:54755c2d6836

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jabber: Don't ignore Google buddies with subscription="none", but ask="subscribe". Refs #7458. (Partially fixes it)
author Paul Aurich <paul@darkrain42.org>
date Mon, 26 Oct 2009 02:17:54 +0000
parents 876ffa0f5465
children 05867b153f03
files libpurple/protocols/jabber/google.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/google.c	Mon Oct 26 00:00:24 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Mon Oct 26 02:17:54 2009 +0000
@@ -994,8 +994,9 @@
 
 	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster");
 	const char *subscription = xmlnode_get_attrib(item, "subscription");
+	const char *ask = xmlnode_get_attrib(item, "ask");
 
-	if (!subscription || !strcmp(subscription, "none")) {
+	if ((!subscription || !strcmp(subscription, "none")) && !ask) {
 		/* The Google Talk servers will automatically add people from your Gmail address book
 		 * with subscription=none. If we see someone with subscription=none, ignore them.
 		 */