Merge lp:~cbwcjw/midori/fix-bug790270 into lp:midori

[Chris Wallace]

Bug #790270: add "Add a new bookmark..." to bookmark toolmenu

This adds the same button now to the toolmenu. I'm not specifically sure if this is what was wanted, however.

[Robert Roth (evfool)]

@Daniel Fore, could you please take a look at this branch to see if this is what you had in your mind when you reported this bug?

[Danielle Foré (danrabbit)]

Yep, this appears to work correctly for me :)

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-04-29 00:20:45 +0000
+++ midori/midori-browser.c	2014-04-29 06:43:48 +0000
@@ -3199,10 +3199,13 @@
     gtk_container_foreach (GTK_CONTAINER (menu),
         (GtkCallback)(gtk_widget_destroy), NULL);
 
-    /* "Import Bookmarks" and "Export Bookmarks" at the top */
+    /* "Add Bookmarks", "Import Bookmarks", and "Export Bookmarks" at the top */
     if (id == NULL)
     {
         GtkWidget* menuitem;
+        menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarkAdd"));
+        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);
@@ -3274,6 +3277,7 @@
     while ((widget = midori_panel_get_nth_page (MIDORI_PANEL (browser->panel), j++)))
         midori_context_action_add (menu, g_object_get_data (G_OBJECT (widget), "midori-panel-action"));
     midori_context_action_add (menu, NULL);
+    midori_context_action_add_by_name (menu, "BookmarkAdd");
     midori_context_action_add_by_name (menu, "BookmarksImport");
     midori_context_action_add_by_name (menu, "BookmarksExport");
     midori_context_action_add_by_name (menu, "ClearPrivateData");
@@ -5610,6 +5614,7 @@
                 "<menuitem action='Trash'/>"
             "</menu>"
             "<menu action='Bookmarks'>"
+                "<menuitem action='BookmarksAdd'/>"
                 "<menuitem action='BookmarksImport'/>"
                 "<menuitem action='BookmarksExport'/>"
             "</menu>"