Index: src/gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.443
diff -u -p -r1.443 gtkconv.c
--- src/gtkconv.c	5 Aug 2004 23:21:54 -0000	1.443
+++ src/gtkconv.c	6 Aug 2004 16:31:00 -0000
@@ -5391,8 +5391,14 @@ gaim_gtkconv_chat_remove_users(GaimConve
 			gtk_tree_model_get(GTK_TREE_MODEL(model), &iter,
 							   CHAT_USERS_NAME_COLUMN, &val, -1);
 
-			if (!gaim_utf8_strcasecmp((char *)l->data, val))
+			if (!gaim_utf8_strcasecmp((char *)l->data, val)) {
+#if GTK_CHECK_VERSION(2,2,0)
 				f = gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+#else
+				gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+				f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
+#endif
+			}
 			else
 				f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
 
Index: src/gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.356
diff -u -p -r1.356 gtkimhtml.c
--- src/gtkimhtml.c	1 Aug 2004 22:00:33 -0000	1.356
+++ src/gtkimhtml.c	6 Aug 2004 16:31:01 -0000
@@ -2748,7 +2748,6 @@ image_save_yes_cb(GtkIMHtmlImage *image,
 #if GTK_CHECK_VERSION(2,2,0)
 	GSList *formats = gdk_pixbuf_get_formats();
 #else
-	GtkIMHtmlImage *image = g_object_get_data(G_OBJECT(sel), "GtkIMHtmlImage");
 	char *basename = g_path_get_basename(filename);
 	char *ext = strrchr(basename, '.');
 #endif