Merge lp:~niels-avonds/midori/midori-bm-icons into lp:~vcs-imports/midori/master

Proposed by Niels Avonds
Status: Merged
Merge reported by: Cris Dywan
Merged at revision: not available
Proposed branch: lp:~niels-avonds/midori/midori-bm-icons
Merge into: lp:~vcs-imports/midori/master
Diff against target: 24 lines (+5/-2)
1 file modified
panels/midori-bookmarks.c (+5/-2)
To merge this branch: bzr merge lp:~niels-avonds/midori/midori-bm-icons
Reviewer Review Type Date Requested Status
VCS imports Pending
Review via email: mp+95209@code.launchpad.net

Description of the change

Fixes bugs #940536 and #940538.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/midori-bookmarks.c'
2--- panels/midori-bookmarks.c 2012-01-13 23:45:01 +0000
3+++ panels/midori-bookmarks.c 2012-02-29 16:43:05 +0000
4@@ -420,7 +420,9 @@
5 gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
6 gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
7 bookmarks->toolbar = toolbar;
8- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
9+
10+ toolitem = gtk_tool_button_new (0, "Add");
11+ gtk_tool_button_set_icon_name (toolitem, "bookmark-new");
12 gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
13 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
14 _("Add a new bookmark"));
15@@ -451,7 +453,8 @@
16 gtk_tool_item_set_expand (toolitem, TRUE);
17 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
18 gtk_widget_show (GTK_WIDGET (toolitem));
19- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
20+ toolitem = gtk_tool_button_new (0, "");
21+ gtk_tool_button_set_icon_name (toolitem, "folder-new");
22 gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd");
23 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
24 _("Add a new folder"));

Subscribers

People subscribed via source and target branches

to all changes: