[Xfce4-commits] <midori:master> Organize appmenu items into more logical groups

[Christian Dywan]

Updating branch refs/heads/master
         to 1ccdf3b35002316f1a5fb10dfb366b10801105e3 (commit)
       from 3d4f288ba0b3049d4617d8f4329b12cc9e4f5e44 (commit)

commit 1ccdf3b35002316f1a5fb10dfb366b10801105e3
Author: Daniel Foré <daniel.p.fore at gmail.com>
Date:   Thu Apr 7 21:17:18 2011 +0200

    Organize appmenu items into more logical groups
    
    Fixes: https://bugs.launchpad.net/midori/+bug/736072

 midori/midori-browser.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 2a7f942..ee205bd 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2951,31 +2951,41 @@ _action_compact_menu_populate_popup (GtkAction*     action,
     static const GtkActionEntry actions[] = {
       { "TabNew" },
       { "WindowNew" },
-      { "PrivateBrowsing" },
+      { NULL },
       { "Open" },
       { "Find" },
       #if !HAVE_HILDON
       { "Print" },
-      { NULL },
-      { "Panel" },
-      { "-" },
-      { "ClearPrivateData" },
       #if WEBKIT_CHECK_VERSION (1, 1, 17)
       { "InspectPage" },
       #endif
-      { "Fullscreen" },
+      #endif
+      { NULL },
+      { "PrivateBrowsing" },
+      #if !HAVE_HILDON
+      { "ClearPrivateData" },
+      { NULL },
       { "BookmarksImport"},
       { "BookmarksExport"},
+      { NULL },
+      { "Fullscreen" },
+      { "Panel" },
+      { "-" },
       #endif
+      { NULL },
+      #if !HAVE_HILDON
       { "HelpFAQ" },
+      #endif
       { "About" },
       { "Preferences" },
       #if HAVE_HILDON
+      { NULL },
       { "auto-load-images" },
       { "enable-scripts" },
       { "enable-plugins" },
       #endif
     };
+
     guint i;
 
     for (i = 0; i < G_N_ELEMENTS (actions); i++)