Mercurial > pidgin.yaz
changeset 8120:81a63a9bff88
[gaim-migrate @ 8824]
tweaks just seem to accumulate in my tree
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 16 Jan 2004 01:03:54 +0000 |
| parents | 4acdd763e1ac |
| children | edc9d9b4197a |
| files | src/gtkimhtml.c src/protocols/jabber/chat.c src/protocols/jabber/roster.c |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkimhtml.c Thu Jan 15 23:35:43 2004 +0000 +++ b/src/gtkimhtml.c Fri Jan 16 01:03:54 2004 +0000 @@ -1650,7 +1650,10 @@ "font-family: "); size = gtk_imhtml_get_css_opt (style, "font-size: "); - if (!(color || family || size)) break; + if (!(color || family || size)) { + g_free(style); + break; + } if (url) gtk_imhtml_insert_link(imhtml, url, ws);
--- a/src/protocols/jabber/chat.c Thu Jan 15 23:35:43 2004 +0000 +++ b/src/protocols/jabber/chat.c Fri Jan 16 01:03:54 2004 +0000 @@ -619,12 +619,16 @@ if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result")) { /* XXX: error msg */ gaim_roomlist_set_in_progress(js->roomlist, FALSE); + gaim_roomlist_unref(js->roomlist); + js->roomlist = NULL; return; } if(!(query = xmlnode_get_child(packet, "query"))) { /* XXX: error msg */ gaim_roomlist_set_in_progress(js->roomlist, FALSE); + gaim_roomlist_unref(js->roomlist); + js->roomlist = NULL; return; }
--- a/src/protocols/jabber/roster.c Thu Jan 15 23:35:43 2004 +0000 +++ b/src/protocols/jabber/roster.c Fri Jan 16 01:03:54 2004 +0000 @@ -225,7 +225,8 @@ } } - b = gaim_find_buddy(js->gc->account, name); + if(!(b = gaim_find_buddy(js->gc->account, name))) + return; iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");