[Gaim-commits] SF.net SVN: gaim: [17768] trunk/gtk/gtkblist.c

[<dat...@us...>]

Revision: 17768
          http://svn.sourceforge.net/gaim/?rev=17768&view=rev
Author:   datallah
Date:     2006-11-17 11:27:58 -0800 (Fri, 17 Nov 2006)

Log Message:
-----------
some more situations where gtk_widget_destroy() should be used instead of gtk_container_remove()

Modified Paths:
--------------
    trunk/gtk/gtkblist.c

Modified: trunk/gtk/gtkblist.c
===================================================================
--- trunk/gtk/gtkblist.c	2006-11-17 06:12:17 UTC (rev 17767)
+++ trunk/gtk/gtkblist.c	2006-11-17 19:27:58 UTC (rev 17768)
@@ -560,7 +560,7 @@
 rebuild_joinchat_entries(GaimGtkJoinChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -569,11 +569,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 	data->entries = NULL;
@@ -5111,7 +5108,7 @@
 rebuild_addchat_entries(GaimGtkAddChatData *data)
 {
 	GaimConnection *gc;
-	GList *list = NULL, *tmp = NULL;
+	GList *list = NULL, *tmp;
 	GHashTable *defaults = NULL;
 	struct proto_chat_entry *pce;
 	gboolean focus = TRUE;
@@ -5120,11 +5117,8 @@
 
 	gc = gaim_account_get_connection(data->account);
 
-	while (GTK_BOX(data->entries_box)->children)
-	{
-		gtk_container_remove(GTK_CONTAINER(data->entries_box),
-			((GtkBoxChild *)GTK_BOX(data->entries_box)->children->data)->widget);
-	}
+	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
+		gtk_widget_destroy(tmp->data);
 
 	g_list_free(data->entries);
 
@@ -6126,17 +6120,14 @@
 
 		submenu = l->data;
 
-		menuitems = gtk_container_get_children(GTK_CONTAINER(submenu));
-		while (menuitems != NULL)
+		while ((menuitems = gtk_container_get_children(GTK_CONTAINER(submenu))) != NULL)
 		{
-			GaimPluginAction *action;
 			menuitem = menuitems->data;
-			action = g_object_get_data(G_OBJECT(menuitem), "plugin_action");
-			g_free(action);
-			menuitems = g_list_delete_link(menuitems, menuitems);
+			g_free(g_object_get_data(G_OBJECT(menuitem), "plugin_action"));
+			gtk_widget_destroy(menuitem);
 		}
 
-		gtk_container_remove(GTK_CONTAINER(pluginmenu), GTK_WIDGET(submenu));
+		gtk_widget_destroy(GTK_WIDGET(submenu));
 	}
 	g_list_free(plugin_submenus);
 	plugin_submenus = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.