gaim/gaim

Parents 1e5118119c76
Children 048cc6449298
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.
--- a/src/gtkconv.c Sun Mar 26 02:45:35 2006 -0500
+++ b/src/gtkconv.c Sun Mar 26 03:07:04 2006 -0500
@@ -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,