# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1256523474 0
# Node ID 54755c2d6836c10e3af8a8bcdd2b41be011eebad
# Parent  876ffa0f5465b925c5329fd4212ad62badd3dae4
jabber: Don't ignore Google buddies with subscription="none", but ask="subscribe".

Refs #7458. (Partially fixes it)

diff -r 876ffa0f5465 -r 54755c2d6836 libpurple/protocols/jabber/google.c
--- 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.
 		 */