SF.net SVN: geany:[3560] trunk

[eht16 at users.sourceforge.net]

Revision: 3560
          http://geany.svn.sourceforge.net/geany/?rev=3560&view=rev
Author:   eht16
Date:     2009-02-06 19:39:52 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
Fix ordering of the input methods submenu item in the VTE popup menu.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/vte.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-06 19:05:12 UTC (rev 3559)
+++ trunk/ChangeLog	2009-02-06 19:39:52 UTC (rev 3560)
@@ -6,6 +6,8 @@
    Add plugin_module_make_resident() to the plugin API which allows
    plugins to make the module resident. This seems necessary when
    using GTypes, e.g. by using the GObject API.
+ * src/vte.c:
+   Fix ordering of the input methods submenu item in the VTE popup menu.
 
 
 2009-02-05  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2009-02-06 19:05:12 UTC (rev 3559)
+++ trunk/src/vte.c	2009-02-06 19:39:52 UTC (rev 3560)
@@ -557,24 +557,25 @@
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	vc->im_submenu = gtk_menu_new();
-
-	item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods"));
+	item = gtk_image_menu_item_new_from_stock("gtk-preferences", NULL);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
+	g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PREFERENCES));
 
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu);
+	msgwin_menu_add_common_items(GTK_MENU(menu));
 
 	item = gtk_separator_menu_item_new();
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	item = gtk_image_menu_item_new_from_stock("gtk-preferences", NULL);
+	/* the IM submenu should always be the last item to be consistent with other GTK popup menus */
+	vc->im_submenu = gtk_menu_new();
+
+	item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PREFERENCES));
 
-	msgwin_menu_add_common_items(GTK_MENU(menu));
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu);
 
 	return menu;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.