Mercurial > pidgin
changeset 27421:1ce607bc4dce
merge of '4659790302e1226bf3dd9eb699c028d230304638'
and '947111754d9b58f45801cb22f64596b1ed0a5a31'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 08 Jul 2009 06:06:38 +0000 |
| parents | a712df376f19 (diff) e420ce168630 (current diff) |
| children | d46ab8c52cc4 |
| files | |
| diffstat | 2 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/Makefile.am Wed Jul 08 05:59:49 2009 +0000 +++ b/libpurple/Makefile.am Wed Jul 08 06:06:38 2009 +0000 @@ -92,6 +92,9 @@ xmlnode.c \ whiteboard.c +purple_builtsources = \ + marshallers.c + purple_coreheaders = \ account.h \ accountopt.h \ @@ -248,18 +251,17 @@ bin_SCRIPTS = purple-remote purple-send purple-send-async purple-url-handler BUILT_SOURCES = $(purple_builtheaders) \ + $(purple_builtsources) \ dbus-bindings.c \ dbus-signals.c \ dbus-types.c \ dbus-types.h \ - marshallers.c \ - marshallers.h \ purple-client-bindings.c \ purple-client-bindings.h else -BUILT_SOURCES = $(purple_builtheaders) +BUILT_SOURCES = $(purple_builtheaders) $(purple_builtsources) endif @@ -267,6 +269,7 @@ libpurple_la_SOURCES = \ $(purple_coresources) \ + $(purple_builtsources) \ $(dbus_sources) noinst_HEADERS= \
--- a/libpurple/protocols/jabber/google.c Wed Jul 08 05:59:49 2009 +0000 +++ b/libpurple/protocols/jabber/google.c Wed Jul 08 06:06:38 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");