libpurple/protocols/jabber/google.c

changeset 28757
055c0bc2a3dd
parent 28669
f67839ca0064
child 28807
b97a0cc0c2f0
child 28828
7c1855f037e7
child 29628
7ba47b28bda9
--- 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.
 		 */

mercurial