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

[Niels Avonds]

Fixes bugs #940536 and #940538.

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2012-01-13 23:45:01 +0000
+++ panels/midori-bookmarks.c	2012-02-29 16:43:05 +0000
@@ -420,7 +420,9 @@
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
         bookmarks->toolbar = toolbar;
-        toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
+
+        toolitem = gtk_tool_button_new (0, "Add");
+        gtk_tool_button_set_icon_name (toolitem, "bookmark-new");
         gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
                                      _("Add a new bookmark"));
@@ -451,7 +453,8 @@
         gtk_tool_item_set_expand (toolitem, TRUE);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
         gtk_widget_show (GTK_WIDGET (toolitem));
-        toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
+        toolitem = gtk_tool_button_new (0, "");
+        gtk_tool_button_set_icon_name (toolitem, "folder-new");
         gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd");
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
                                      _("Add a new folder"));