Remove small toolbar option completely, leave it to gtkrc

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 4725cb067dd9ec30bea6f6c2c3827d82aa45f278..575b59070e9ef2b48b563c89d27064b674c1ae80 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3729,8 +3729,7 @@ _midori_browser_update_settings (MidoriBrowser* browser)
     gint last_window_width, last_window_height;
     gint last_panel_position, last_panel_page;
     gboolean show_navigationbar, show_bookmarkbar, show_panel, show_statusbar;
-    gboolean small_toolbar, show_new_tab, show_homepage,
-        show_web_search, show_trash;
+    gboolean show_new_tab, show_homepage, show_web_search, show_trash;
     MidoriToolbarStyle toolbar_style;
     gint last_web_search;
     gchar* last_pageholder_uri;
@@ -3749,7 +3748,6 @@ _midori_browser_update_settings (MidoriBrowser* browser)
                   "show-bookmarkbar", &show_bookmarkbar,
                   "show-panel", &show_panel,
                   "show-statusbar", &show_statusbar,
-                  "small-toolbar", &small_toolbar,
                   "show-new-tab", &show_new_tab,
                   "show-homepage", &show_homepage,
                   "show-web-search", &show_web_search,
@@ -3776,9 +3774,6 @@ _midori_browser_update_settings (MidoriBrowser* browser)
     }
 
     _midori_browser_set_toolbar_style (browser, toolbar_style);
-    gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar),
-                               small_toolbar ? GTK_ICON_SIZE_SMALL_TOOLBAR
-                               : GTK_ICON_SIZE_LARGE_TOOLBAR);
 
     if (browser->search_engines)
     {
@@ -3833,10 +3828,6 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings,
 
     if (name == g_intern_string ("toolbar-style"))
         _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value));
-    else if (name == g_intern_string ("small-toolbar"))
-        gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->navigationbar),
-            g_value_get_boolean (&value) ? GTK_ICON_SIZE_SMALL_TOOLBAR
-            : GTK_ICON_SIZE_LARGE_TOOLBAR);
     else if (name == g_intern_string ("show-new-tab"))
         sokoke_widget_set_visible (browser->button_tab_new,
             g_value_get_boolean (&value));

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index d87b8db2d111dfab7c1a29b45e6c1eedd23eca42..5d83ed4683b3706dd1199e744a1dc016ee96ef51 100644 (file)
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -34,7 +34,6 @@ struct _MidoriWebSettings
     gboolean show_statusbar;
 
     MidoriToolbarStyle toolbar_style;
-    gboolean small_toolbar;
     gboolean show_new_tab;
     gboolean show_homepage;
     gboolean show_web_search;
@@ -87,7 +86,6 @@ enum
     PROP_SHOW_STATUSBAR,
 
     PROP_TOOLBAR_STYLE,
-    PROP_SMALL_TOOLBAR,
     PROP_SHOW_NEW_TAB,
     PROP_SHOW_HOMEPAGE,
     PROP_SHOW_WEB_SEARCH,
@@ -347,15 +345,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      MIDORI_TOOLBAR_DEFAULT,
                                      flags));
 
-    g_object_class_install_property (gobject_class,
-                                     PROP_SMALL_TOOLBAR,
-                                     g_param_spec_boolean (
-                                     "small-toolbar",
-                                     _("Small toolbar"),
-                                     _("Use small toolbar icons"),
-                                     FALSE,
-                                     flags));
-
     g_object_class_install_property (gobject_class,
                                      PROP_SHOW_NEW_TAB,
                                      g_param_spec_boolean (
@@ -680,9 +669,6 @@ midori_web_settings_set_property (GObject*      object,
     case PROP_TOOLBAR_STYLE:
         web_settings->toolbar_style = g_value_get_enum (value);
         break;
-    case PROP_SMALL_TOOLBAR:
-        web_settings->small_toolbar = g_value_get_boolean (value);
-        break;
     case PROP_SHOW_NEW_TAB:
         web_settings->show_new_tab = g_value_get_boolean (value);
         break;
@@ -838,9 +824,6 @@ midori_web_settings_get_property (GObject*    object,
     case PROP_TOOLBAR_STYLE:
         g_value_set_enum (value, web_settings->toolbar_style);
         break;
-    case PROP_SMALL_TOOLBAR:
-        g_value_set_boolean (value, web_settings->small_toolbar);
-        break;
     case PROP_SHOW_NEW_TAB:
         g_value_set_boolean (value, web_settings->show_new_tab);
         break;
@@ -969,7 +952,6 @@ midori_web_settings_copy (MidoriWebSettings* web_settings)
                   "preferred-encoding", web_settings->preferred_encoding,
 
                   "toolbar-style", web_settings->toolbar_style,
-                  "small-toolbar", web_settings->small_toolbar,
                   "show-web-search", web_settings->show_web_search,
                   "show-new-tab", web_settings->show_new_tab,
                   "show-trash", web_settings->show_trash,