Mercurial > pidgin
changeset 27420:a712df376f19
merge of '2a195c64281f3e4d2712dbe7d148d688dbdea252'
and '9b1aac901f94e8679e9ab4f8c7901bdfd5b66d30'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 08 Jul 2009 04:33:25 +0000 |
| parents | 6b11903c87c8 (current diff) e01ef82ba0f2 (diff) |
| children | 1ce607bc4dce |
| files | libpurple/protocols/jabber/google.c libpurple/protocols/yahoo/yahoo.c libpurple/protocols/yahoo/yahoo.h |
| diffstat | 1 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/google.c Wed Jul 08 04:06:38 2009 +0000 +++ b/libpurple/protocols/jabber/google.c Wed Jul 08 04:33:25 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");