From: Richard L. <rl...@us...> - 2006-03-26 08:07:24
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25718/src Modified Files: gtkconv.c Log Message: 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. Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.765 retrieving revision 1.766 diff -u -d -p -r1.765 -r1.766 --- gtkconv.c 21 Mar 2006 01:00:58 -0000 1.765 +++ gtkconv.c 26 Mar 2006 08:07:04 -0000 1.766 @@ -2453,7 +2453,7 @@ static gboolean 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 @@ icon_menu(GtkObject *obj, GdkEventButton 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, |