Merge lp:~kelwin-lee/midori/fix-738479 into lp:midori

[Danielle Foré]

[Cody Garver (codygarver)]

Clean lines 8, 9, 12 of the diff.

review: Needs Fixing

Unmerged revisions

4717. By Cuzzie Lee on 2012-03-26

Moved "Import Bookmarks" and "Export Bookmarks" to Bookmark menu

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-05-19 09:33:02 +0000
+++ midori/midori-browser.c	2013-05-20 06:52:26 +0000
@@ -3095,6 +3095,11 @@
                                    KatzeArray*    folder,
                                    MidoriBrowser* browser)
 {
+<<<<<<< TREE
+=======
+
+    const gchar* folder_name;
+>>>>>>> MERGE-SOURCE
     KatzeArray* bookmarks;
     const gchar* id = katze_item_get_meta_string (KATZE_ITEM (folder), "id");
     gchar* condition;
@@ -3116,6 +3121,21 @@
     gtk_container_foreach (GTK_CONTAINER (menu),
         (GtkCallback)(gtk_widget_destroy), NULL);
 
+    /* "Import Bookmarks" and "Export Bookmarks" are moved here */
+    gtk_menu_shell_append (menu, menuitem);
+    gtk_widget_show (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"));
@@ -3127,6 +3147,7 @@
 
     katze_array_action_generate_menu (KATZE_ARRAY_ACTION (action), bookmarks,
                                       menu, GTK_WIDGET (browser));
+
     return TRUE;
 }
 
@@ -5708,8 +5729,6 @@
                 "<menuitem action='WindowClose'/>"
                 "<separator/>"
                 "<menuitem action='Print'/>"
-                "<menuitem action='BookmarksImport'/>"
-                "<menuitem action='BookmarksExport'/>"
                 "<separator/>"
                 "<menuitem action='Quit'/>"
             "</menu>"
@@ -5772,7 +5791,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'>"