# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1246600981 0
# Node ID 46e182c1c14f1bb70b762dce7c8ff2fc36f89b3b
# Parent  1e91cc59ab3d1db860db0c100a46e7f48f51059f# Parent  5afc3577b8cda0fa44e6ca7415c826a174a9b7f2
merge of '4296be52d5b80da450d41464433feee7c438d8f9'
     and 'c9200b58a3e76e0eb7e693c9262158bbad8a8afc'

diff -r 1e91cc59ab3d -r 46e182c1c14f libpurple/protocols/jabber/google.c
--- a/libpurple/protocols/jabber/google.c	Fri Jul 03 05:24:26 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Fri Jul 03 06:03:01 2009 +0000
@@ -787,7 +787,7 @@
 {
 	xmlnode *child;
 	xmlnode *message;
-	const char *to, *url;
+	const char *to, *default_url;
 	const char *in_str;
 	char *to_name;
 
@@ -837,16 +837,20 @@
 
 	to = xmlnode_get_attrib(packet, "to");
 	to_name = jabber_get_bare_jid(to);
-	url = xmlnode_get_attrib(child, "url");
-	if (!url || !*url)
-		url = "http://www.gmail.com";
+	default_url = xmlnode_get_attrib(child, "url");
+	if (default_url == NULL || *default_url == '\0')
+		default_url = "http://mail.google.com/mail";
 
 	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;
+		const char *from, *tid, *url;
 		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");