From ff8489da201936400ce5a3876403b0f4dd8b715e Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 20 Jul 2009 08:13:29 +0200
Subject: [PATCH] Put the Preferences menuitem in the Tools menu under Win32

---
 midori/midori-browser.c | 8 +++++++-
 midori/midori-panel.c   | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index aa6ab764..810891ca 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4432,8 +4432,10 @@ static const gchar* ui_markup =
     "<separator/>"
     "<menuitem action='Find'/>"
     "<menuitem action='FindNext'/>"
+    #ifndef G_OS_WIN32
     "<separator/>"
     "<menuitem action='Preferences'/>"
+    #endif
    "</menu>"
    "<menu action='View'>"
     "<menu action='Toolbars'>"
@@ -4478,6 +4480,10 @@ static const gchar* ui_markup =
     "<menuitem action='ManageSearchEngines'/>"
     "<menuitem action='ClearPrivateData'/>"
     /* Panel items shall be appended here */
+    #ifdef G_OS_WIN32
+    "<separator/>"
+    "<menuitem action='Preferences'/>"
+    #endif
    "</menu>"
    "<menuitem action='Window'/>"
    "<menu action='Help'>"
@@ -4917,7 +4923,7 @@ midori_browser_init (MidoriBrowser* browser)
         gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools")));
     menuitem = gtk_separator_menu_item_new ();
     gtk_widget_show (menuitem);
-    gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem);
+    gtk_menu_shell_insert (GTK_MENU_SHELL (browser->menu_tools), menuitem, 3);
 
     homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage");
     g_signal_connect (homepage, "button-press-event",
diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 730d9546..c299a9f4 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -661,7 +661,7 @@ midori_panel_append_page (MidoriPanel*    panel,
         g_signal_connect (menuitem, "activate",
                           G_CALLBACK (midori_panel_menu_item_activate_cb),
                           panel);
-        gtk_menu_shell_append (GTK_MENU_SHELL (panel->menu), menuitem);
+        gtk_menu_shell_insert (GTK_MENU_SHELL (panel->menu), menuitem, 4);
         g_object_set_data (G_OBJECT (scrolled), "panel-menuitem", menuitem);
         g_signal_connect (viewable, "destroy",
                           G_CALLBACK (midori_panel_widget_destroy_cb), menuitem);