# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1163827857 0
# Node ID 0d9f69b23352a285ee6d627903610d60d9dc5def
# Parent  5d71039b20eb0e3c14f6a7c2fa462017c7f9ddc9
[gaim-migrate @ 17774]
The data for "plugin_action" is set with a destructor function. So freeing it
twice would cause a crash. The reason it's not crashing is, the children of the
container are not the menuitems, but GtkAccelLabel (or some such thing). So all
we are doing is freeing null. Also, when the menu is destroyed, all the
menuitems are also destroyed anyway. So get rid of the unrequired loop.

Also, isdigit expects a character, not a string.

committer: Tailor Script <tailor@pidgin.im>

diff -r 5d71039b20eb -r 0d9f69b23352 gtk/gtkblist.c
--- a/gtk/gtkblist.c	Sat Nov 18 05:25:31 2006 +0000
+++ b/gtk/gtkblist.c	Sat Nov 18 05:30:57 2006 +0000
@@ -6115,20 +6115,7 @@
 
 	/* Remove old plugin action submenus from the Tools menu */
 	for (l = plugin_submenus; l; l = l->next)
-	{
-		GList *menuitems;
-
-		submenu = l->data;
-
-		while ((menuitems = gtk_container_get_children(GTK_CONTAINER(submenu))) != NULL)
-		{
-			menuitem = menuitems->data;
-			g_free(g_object_get_data(G_OBJECT(menuitem), "plugin_action"));
-			gtk_widget_destroy(menuitem);
-		}
-
-		gtk_widget_destroy(GTK_WIDGET(submenu));
-	}
+		gtk_widget_destroy(GTK_WIDGET(l->data));
 	g_list_free(plugin_submenus);
 	plugin_submenus = NULL;
 
diff -r 5d71039b20eb -r 0d9f69b23352 gtk/gtkmain.c
--- a/gtk/gtkmain.c	Sat Nov 18 05:25:31 2006 +0000
+++ b/gtk/gtkmain.c	Sat Nov 18 05:30:57 2006 +0000
@@ -735,7 +735,7 @@
 	for (accounts = gaim_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
 		GaimAccount *account = accounts->data;
 		if (!strcmp(gaim_account_get_protocol_id(account), "prpl-oscar")) {
-			if (isdigit(gaim_account_get_username(account)))
+			if (isdigit(*gaim_account_get_username(account)))
 				gaim_account_set_protocol_id(account, "prpl-icq");
 			else 
 				gaim_account_set_protocol_id(account, "prpl-aim");