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

Proposed by Cuzzie Lee
Status: Superseded
Proposed branch: lp:~kelwin-lee/midori/fix-738479
Merge into: lp:~vcs-imports/midori/master
Diff against target: 62 lines (+21/-3)
1 file modified
midori/midori-browser.c (+21/-3)
To merge this branch: bzr merge lp:~kelwin-lee/midori/fix-738479
Reviewer Review Type Date Requested Status
Cody Garver (community) Needs Fixing
VCS imports Pending
Review via email: mp+99406@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

Retarget this to lp:midori

review: Needs Fixing

Unmerged revisions

4717. By Cuzzie Lee

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

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 2012-03-25 17:35:58 +0000
3+++ midori/midori-browser.c 2012-03-26 19:17:18 +0000
4@@ -3008,6 +3008,7 @@
5 KatzeArray* folder,
6 MidoriBrowser* browser)
7 {
8+
9 const gchar* folder_name;
10 KatzeArray* bookmarks;
11 GtkWidget* menuitem;
12@@ -3021,6 +3022,21 @@
13 gtk_container_foreach (GTK_CONTAINER (menu),
14 (GtkCallback)(gtk_widget_destroy), NULL);
15
16+ /* "Import Bookmarks" and "Export Bookmarks" are moved here */
17+ gtk_menu_shell_append (menu, menuitem);
18+ gtk_widget_show (menuitem);
19+ menuitem = gtk_action_create_menu_item (
20+ _action_by_name (browser, "BookmarksImport"));
21+ gtk_menu_shell_append (menu, menuitem);
22+ gtk_widget_show (menuitem);
23+ menuitem = gtk_action_create_menu_item (
24+ _action_by_name (browser, "BookmarksExport"));
25+ gtk_menu_shell_append (menu, menuitem);
26+ gtk_widget_show (menuitem);
27+ menuitem = gtk_separator_menu_item_new ();
28+ gtk_menu_shell_append(menu, menuitem);
29+ gtk_widget_show (menuitem);
30+
31 if (katze_array_is_empty (bookmarks))
32 {
33 menuitem = gtk_image_menu_item_new_with_label (_("Empty"));
34@@ -3032,6 +3048,7 @@
35
36 katze_array_action_generate_menu (KATZE_ARRAY_ACTION (action), bookmarks,
37 menu, GTK_WIDGET (browser));
38+
39 return TRUE;
40 }
41
42@@ -5567,8 +5584,6 @@
43 "<menuitem action='WindowClose'/>"
44 "<separator/>"
45 "<menuitem action='Print'/>"
46- "<menuitem action='BookmarksImport'/>"
47- "<menuitem action='BookmarksExport'/>"
48 "<separator/>"
49 "<menuitem action='Quit'/>"
50 "</menu>"
51@@ -5629,7 +5644,10 @@
52 "<menuitem action='Search'/>"
53 "<menuitem action='Trash'/>"
54 "</menu>"
55- "<menuitem action='Bookmarks'/>"
56+ "<menu action='Bookmarks'>"
57+ "<menuitem action='BookmarksImport'/>"
58+ "<menuitem action='BookmarksExport'/>"
59+ "</menu>"
60 "<menuitem action='Tools'/>"
61 "<menuitem action='Window'/>"
62 "<menu action='Help'>"

Subscribers

People subscribed via source and target branches

to all changes: