# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1074215034 0
# Node ID d26183feb7e48e1ddd23ac1569a46238c12dcf80
# Parent  cae2f96e5e9e249f38c7bc0ed6c8e36543223fd4
[gaim-migrate @ 8824]
tweaks just seem to accumulate in my tree

diff -r cae2f96e5e9e -r d26183feb7e4 src/gtkimhtml.c
--- 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);
diff -r cae2f96e5e9e -r d26183feb7e4 src/protocols/jabber/chat.c
--- 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;
 	}
 
diff -r cae2f96e5e9e -r d26183feb7e4 src/protocols/jabber/roster.c
--- 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");