Midori Web Browser

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

  1. fix-bug790270
  2. Merge into trunk
Proposed by Chris Wallace
Status: Merged
Merged at revision: 6789
Proposed branch: lp:~cbwcjw/midori/fix-bug790270
Merge into: lp:midori
Diff against target: 34 lines (+6/-1)
1 file modified
midori/midori-browser.c (+6/-1)
To merge this branch: bzr merge lp:~cbwcjw/midori/fix-bug790270
Reviewer Review Type Date Requested Status
Danielle Foré (community) Approve
Midori Devs Pending
Review via email: mp+217543@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Robert Roth (evfool) wrote :

@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?

Revision history for this message
Danielle Foré (danrabbit) wrote :

Yep, this appears to work correctly for me :)

Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2014-04-29 00:20:45 +0000
3+++ midori/midori-browser.c 2014-04-29 06:43:48 +0000
4@@ -3199,10 +3199,13 @@
5 gtk_container_foreach (GTK_CONTAINER (menu),
6 (GtkCallback)(gtk_widget_destroy), NULL);
7
8- /* "Import Bookmarks" and "Export Bookmarks" at the top */
9+ /* "Add Bookmarks", "Import Bookmarks", and "Export Bookmarks" at the top */
10 if (id == NULL)
11 {
12 GtkWidget* menuitem;
13+ menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarkAdd"));
14+ gtk_menu_shell_append (menu, menuitem);
15+ gtk_widget_show (menuitem);
16 menuitem = gtk_action_create_menu_item (_action_by_name (browser, "BookmarksImport"));
17 gtk_menu_shell_append (menu, menuitem);
18 gtk_widget_show (menuitem);
19@@ -3274,6 +3277,7 @@
20 while ((widget = midori_panel_get_nth_page (MIDORI_PANEL (browser->panel), j++)))
21 midori_context_action_add (menu, g_object_get_data (G_OBJECT (widget), "midori-panel-action"));
22 midori_context_action_add (menu, NULL);
23+ midori_context_action_add_by_name (menu, "BookmarkAdd");
24 midori_context_action_add_by_name (menu, "BookmarksImport");
25 midori_context_action_add_by_name (menu, "BookmarksExport");
26 midori_context_action_add_by_name (menu, "ClearPrivateData");
27@@ -5610,6 +5614,7 @@
28 "<menuitem action='Trash'/>"
29 "</menu>"
30 "<menu action='Bookmarks'>"
31+ "<menuitem action='BookmarksAdd'/>"
32 "<menuitem action='BookmarksImport'/>"
33 "<menuitem action='BookmarksExport'/>"
34 "</menu>"

Subscribers

People subscribed via source and target branches

to all changes: