Fix duplicate accelerators for Clear and Copy in the Messages Window popup menu.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4947 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2010-05-23  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/msgwindow.c:
+   Fix duplicate accelerators for Clear and Copy in the
+   Messages Window popup menu.
+
+
 2010-05-22  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/ui_utils.c:

src/msgwindow.c

@@ -511,7 +511,7 @@ on_hide_message_window                 (GtkMenuItem     *menuitem,
 
 static GtkWidget *create_message_popup_menu(gint type)
 {
-	GtkWidget *message_popup_menu, *clear, *copy, *image;
+	GtkWidget *message_popup_menu, *clear, *copy, *copy_all, *image;
 
 	message_popup_menu = gtk_menu_new();
 
@@ -521,19 +521,22 @@ static GtkWidget *create_message_popup_menu(gint type)
 	g_signal_connect(clear, "activate",
 		G_CALLBACK(on_message_treeview_clear_activate), GINT_TO_POINTER(type));
 
-	copy = gtk_image_menu_item_new_from_stock("gtk-copy", NULL);
+	copy = gtk_image_menu_item_new_with_mnemonic(_("C_opy"));
 	gtk_widget_show(copy);
 	gtk_container_add(GTK_CONTAINER(message_popup_menu), copy);
+	image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU);
+	gtk_widget_show(image);
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy), image);
 	g_signal_connect(copy, "activate",
 		G_CALLBACK(on_compiler_treeview_copy_activate), GINT_TO_POINTER(type));
 
-	copy = gtk_image_menu_item_new_with_mnemonic(_("Copy _All"));
-	gtk_widget_show(copy);
-	gtk_container_add(GTK_CONTAINER(message_popup_menu), copy);
+	copy_all = gtk_image_menu_item_new_with_mnemonic(_("Copy _All"));
+	gtk_widget_show(copy_all);
+	gtk_container_add(GTK_CONTAINER(message_popup_menu), copy_all);
 	image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy), image);
-	g_signal_connect(copy, "activate",
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy_all), image);
+	g_signal_connect(copy_all, "activate",
 		G_CALLBACK(on_compiler_treeview_copy_all_activate), GINT_TO_POINTER(type));
 
 	msgwin_menu_add_common_items(GTK_MENU(message_popup_menu));