pidgin: b3bd6197: jabber: Don't ignore Google buddies with...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b3bd619705d16cc5a946ed1be4f2a9ee6d05d19e
Ancestor: c15edccce86f480e7a519688b6f53317f9538ece
Author: darkrain42 at pidgin.im
Date: 2009-10-26T02:17:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b3bd619705d16cc5a946ed1be4f2a9ee6d05d19e

Modified files:
        libpurple/protocols/jabber/google.c

ChangeLog: 

jabber: Don't ignore Google buddies with subscription="none", but ask="subscribe".

Refs #7458. (Partially fixes it)

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	2d90472f0343782c63ff6571fbe909e94072481a
+++ libpurple/protocols/jabber/google.c	c13e8e9e8c1544036464abaae7fec1a383731938
@@ -994,8 +994,9 @@ gboolean jabber_google_roster_incoming(J
 
 	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.
 		 */