Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/google.c	Mon Jul 06 04:37:41 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Sun Jul 12 02:56:06 2009 +0000
@@ -787,7 +787,7 @@
 {
 	xmlnode *child;
 	xmlnode *message;
-	const char *to, *default_url;
+	const char *to, *url;
 	const char *in_str;
 	char *to_name;
 
@@ -837,20 +837,16 @@
 
 	to = xmlnode_get_attrib(packet, "to");
 	to_name = jabber_get_bare_jid(to);
-	default_url = xmlnode_get_attrib(child, "url");
-	if (default_url == NULL || *default_url == '\0')
-		default_url = "http://mail.google.com/mail";
+	url = xmlnode_get_attrib(child, "url");
+	if (!url || !*url)
+		url = "http://www.gmail.com";
 
 	message= xmlnode_get_child(child, "mail-thread-info");
 	for (i=0; message; message = xmlnode_get_next_twin(message), i++) {
 		xmlnode *sender_node, *subject_node;
-		const char *from, *tid, *url;
+		const char *from, *tid;
 		char *subject;
 
-		url = xmlnode_get_attrib(message, "url");
-		if (url == NULL || *url == '\0')
-			url = default_url;
-
 		subject_node = xmlnode_get_child(message, "subject");
 		sender_node  = xmlnode_get_child(message, "senders");
 		sender_node  = xmlnode_get_child(sender_node, "sender");
@@ -1067,7 +1063,7 @@
 
 	js = (JabberStream*)(gc->proto_data);
 
-	if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
 		return;
 
 	jb = jabber_buddy_find(js, who, TRUE);
@@ -1137,7 +1133,7 @@
 
 	js = (JabberStream*)(gc->proto_data);
 
-	if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
 		return;
 
 	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);