Mercurial > pidgin
diff libpurple/protocols/jabber/google.c @ 21220:b1fa7765ca4b
propagate from branch 'im.pidgin.pidgin' (head d42511319051bcfa8adb3ed8e3f11a26cabc43f4)
to branch 'next.minor' (head 3526bc084159c5c57e580e9e9e190b6ff502fdbe)
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 12 Oct 2007 02:18:35 +0000 |
| parents | 5f829728a1a5 be363a3c618f |
| children | 1853d9d0cc65 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/google.c Fri Oct 12 02:06:38 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Fri Oct 12 02:18:35 2007 +0000 @@ -110,7 +110,7 @@ tos[i] = (to_name != NULL ? to_name : ""); froms[i] = (from != NULL ? from : ""); subjects[i] = (subject != NULL ? subject : g_strdup("")); - urls[i] = (url != NULL ? url : ""); + urls[i] = url; tid = xmlnode_get_attrib(message, "tid"); if (tid && @@ -231,7 +231,7 @@ const char *jid = xmlnode_get_attrib(item, "jid"); gboolean on_block_list = FALSE; - char *jid_norm = g_strdup(jabber_normalize(account, jid)); + char *jid_norm; const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster"); const char *subscription = xmlnode_get_attrib(item, "subscription"); @@ -243,6 +243,8 @@ return FALSE; } + jid_norm = g_strdup(jabber_normalize(account, jid)); + while (list) { if (!strcmp(jid_norm, (char*)list->data)) { on_block_list = TRUE;