changeset 4572:06084165a966

[gaim-migrate @ 4853] Leakbug fixes for everybody committer: Tailor Script <[e-mail]>

--- a/src/conversation.c	Tue Feb 11 17:26:16 2003 +0000
+++ b/src/conversation.c	Tue Feb 11 17:49:07 2003 +0000
@@ -985,6 +985,11 @@
 		gaim_im_stop_typing_timeout(conv->u.im);
 		gaim_im_stop_type_again_timeout(conv->u.im);
 
+		for (node = conv->u.im->images; node != NULL; node = node->next) {
+			if (node->data != NULL)
+				g_free(node->data);
+		}
+
 		g_slist_free(conv->u.im->images);
 
 		g_free(conv->u.im);
@@ -992,6 +997,17 @@
 		ims = g_list_remove(ims, conv);
 	}
 	else if (conv->type == GAIM_CONV_CHAT) {
+
+		for (node = conv->u.chat->in_room; node != NULL; node = node->next) {
+			if (node->data != NULL)
+				g_free(node->data);
+		}
+
+		for (node = conv->u.chat->ignored; node != NULL; node = node->next) {
+			if (node->data != NULL)
+				g_free(node->data);
+		}
+
 		g_list_free(conv->u.chat->in_room);
 		g_list_free(conv->u.chat->ignored);
 
@@ -1001,6 +1017,8 @@
 		if (conv->u.chat->topic != NULL)
 			g_free(conv->u.chat->topic);
 
+		g_free(conv->u.chat->who);
+		g_free(conv->u.chat->topic);
 		g_free(conv->u.chat);
 
 		chats = g_list_remove(chats, conv);

--- a/src/gtkconv.c	Tue Feb 11 17:26:16 2003 +0000
+++ b/src/gtkconv.c	Tue Feb 11 17:49:07 2003 +0000
@@ -3174,7 +3174,7 @@
 	gtk_window_set_policy(GTK_WINDOW(gtkwin->window), TRUE, TRUE, FALSE);
 	gtk_container_set_border_width(GTK_CONTAINER(gtkwin->window), 0);
 	gtk_widget_realize(gtkwin->window);
-	gtk_window_set_title(GTK_WINDOW(gtkwin->window), _("Gaim - Conversations"));
+	gtk_window_set_title(GTK_WINDOW(gtkwin->window), _("Conversations"));
 
 	g_signal_connect(G_OBJECT(gtkwin->window), "delete_event",
 					 G_CALLBACK(close_win_cb), win);
@@ -3202,12 +3202,12 @@
 	gtk_widget_add_events(gtkwin->notebook,
 				GDK_BUTTON1_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
 	g_signal_connect(G_OBJECT(gtkwin->notebook), "button_press_event",
-			 G_CALLBACK(notebook_press_cb), win);
+					 G_CALLBACK(notebook_press_cb), win);
 	g_signal_connect(G_OBJECT(gtkwin->notebook), "button_release_event",
-			 G_CALLBACK(notebook_release_cb), win);
-	
+					 G_CALLBACK(notebook_release_cb), win);
+
 	testidea = gtk_vbox_new(FALSE, 0);
-	
+
 	/* Setup the menubar. */
 	menubar = setup_menubar(win);
 	gtk_box_pack_start(GTK_BOX(testidea), menubar, FALSE, TRUE, 0);
@@ -3329,12 +3329,8 @@
 		}
 
 		if (pane == NULL) {
-			if (conv_type == GAIM_CONV_CHAT) {
-				g_free(gtkconv->u.chat);
-			}
-			else if (conv_type == GAIM_CONV_IM) {
-				g_free(gtkconv->u.im);
-			};
+			if      (conv_type == GAIM_CONV_CHAT) g_free(gtkconv->u.chat);
+			else if (conv_type == GAIM_CONV_IM)   g_free(gtkconv->u.im);
 
 			g_free(gtkconv);
 			conv->ui_data = NULL;
@@ -3394,7 +3390,7 @@
 			  GTK_ICON_SIZE_MENU));
 	gtk_button_set_relief(GTK_BUTTON(gtkconv->close), GTK_RELIEF_NONE);
 	gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
-    			 _("Close conversation"), NULL);
+						 _("Close conversation"), NULL);
 
 	g_signal_connect(G_OBJECT(gtkconv->close), "clicked",
 					 G_CALLBACK(close_conv_cb), conv);