Merge lp:~kalikiana/midori/importexportmenu into lp:midori

[Cris Dywan]

Move Import and Export into menu Bookmarks

Move Import and Export into menu Bookmarks

[gue5t gue5t (gue5t)]

It would be nice to have a separator only if there are bookmarks in the menu below the import/export items. Looks fine otherwise.

[Cris Dywan (kalikiana)]

I looked at it again - you will see "Empty" when there're no bookmarks so I don't agree that the separator is unneeded then, for consistency it makes sense to always be there.

[gue5t gue5t (gue5t)]

Ah, my mistake. Carry on, I was thinking of old code without "Empty".

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-05-21 19:59:59 +0000
+++ midori/midori-browser.c	2013-05-27 22:21:29 +0000
@@ -3105,6 +3105,21 @@
     gtk_container_foreach (GTK_CONTAINER (menu),
         (GtkCallback)(gtk_widget_destroy), NULL);
 
+    /* "Import Bookmarks" and "Export Bookmarks" at the top */
+    if (id == NULL)
+    {
+        GtkWidget* menuitem;
+        menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarksImport"));
+        gtk_menu_shell_append (menu, menuitem);
+        gtk_widget_show (menuitem);
+        menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarksExport"));
+        gtk_menu_shell_append (menu, menuitem);
+        gtk_widget_show (menuitem);
+        menuitem = gtk_separator_menu_item_new ();
+        gtk_menu_shell_append (menu, menuitem);
+        gtk_widget_show (menuitem);
+    }
+
     if (katze_array_is_empty (bookmarks))
     {
         GtkWidget* menuitem = gtk_image_menu_item_new_with_label (_("Empty"));
@@ -5697,8 +5712,6 @@
                 "<menuitem action='WindowClose'/>"
                 "<separator/>"
                 "<menuitem action='Print'/>"
-                "<menuitem action='BookmarksImport'/>"
-                "<menuitem action='BookmarksExport'/>"
                 "<separator/>"
                 "<menuitem action='Quit'/>"
             "</menu>"
@@ -5761,7 +5774,10 @@
                 "<menuitem action='Search'/>"
                 "<menuitem action='Trash'/>"
             "</menu>"
-            "<menuitem action='Bookmarks'/>"
+            "<menu action='Bookmarks'>"
+                "<menuitem action='BookmarksImport'/>"
+                "<menuitem action='BookmarksExport'/>"
+            "</menu>"
             "<menuitem action='Tools'/>"
             "<menuitem action='Window'/>"
             "<menu action='Help'>"