# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1143360424 0
# Node ID 41e4b22c0afbd907ebf8d227d82f111eecec6ccb
# Parent  73dc01e3b81a6bdae24c7dfda6ab32e1f3554aeb
[gaim-migrate @ 15949]
I went looking to see if we were connecting to the "activate" signal on
buttons anywhere else, and I found this code.  A menu item should not be
stored in a variable named "button".  That's just confusing.

committer: Tailor Script <tailor@pidgin.im>

diff -r 73dc01e3b81a -r 41e4b22c0afb src/gtkconv.c
--- a/src/gtkconv.c	Sun Mar 26 07:45:35 2006 +0000
+++ b/src/gtkconv.c	Sun Mar 26 08:07:04 2006 +0000
@@ -2453,7 +2453,7 @@
 icon_menu(GtkObject *obj, GdkEventButton *e, GaimGtkConversation *gtkconv)
 {
 	static GtkWidget *menu = NULL;
-	GtkWidget *button;
+	GtkWidget *item;
 
 	if (e->button != 3 || e->type != GDK_BUTTON_PRESS)
 		return FALSE;
@@ -2475,11 +2475,11 @@
 							gtkconv->u.im->icon_timer);
 	}
 
-	button = gtk_menu_item_new_with_label(_("Hide Icon"));
-	g_signal_connect_swapped(G_OBJECT(button), "activate",
+	item = gtk_menu_item_new_with_label(_("Hide Icon"));
+	g_signal_connect_swapped(G_OBJECT(item), "activate",
 							 G_CALLBACK(remove_icon), gtkconv);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
-	gtk_widget_show(button);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	gtk_widget_show(item);
 
 	gaim_new_item_from_stock(menu, _("Save Icon As..."), GTK_STOCK_SAVE_AS,
 							 G_CALLBACK(icon_menu_save_cb), gtkconv,