Mercurial > pidgin.yaz
changeset 27349:46e182c1c14f
merge of '4296be52d5b80da450d41464433feee7c438d8f9'
and 'c9200b58a3e76e0eb7e693c9262158bbad8a8afc'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 03 Jul 2009 06:03:01 +0000 |
| parents | 1e91cc59ab3d (current diff) 5afc3577b8cd (diff) |
| children | c0075538109b |
| files | |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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");