pidgin: 9b1aac90: disapproval of revision '7a65a44ab2e57a4...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Wed Jul 8 00:36:02 EDT 2009


-----------------------------------------------------------------
Revision: 9b1aac901f94e8679e9ab4f8c7901bdfd5b66d30
Ancestor: 7a65a44ab2e57a47d160be267b0f41062f5c540d
Author: darkrain42 at pidgin.im
Date: 2009-07-08T04:32:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9b1aac901f94e8679e9ab4f8c7901bdfd5b66d30

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

ChangeLog: 

disapproval of revision '7a65a44ab2e57a47d160be267b0f41062f5c540d'

Doesn't work for khc either.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	07b2f90511df11eef5eea3024bae0a49f095f35c
+++ libpurple/protocols/jabber/google.c	0afc59888472d527e3c531e061479113da6fc557
@@ -787,7 +787,7 @@ jabber_gmail_parse(JabberStream *js, con
 {
 	xmlnode *child;
 	xmlnode *message;
-	const char *to, *default_url;
+	const char *to, *url;
 	const char *in_str;
 	char *to_name;
 
@@ -837,20 +837,16 @@ jabber_gmail_parse(JabberStream *js, con
 
 	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 = "https://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");


More information about the Commits mailing list