From 9f68b17036e6f773996e4e8b37e1c369cafee75a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 25 Oct 2009 14:58:22 +0100 Subject: [PATCH] Remove cache and form history preferences These features are implemented as extensions, so the preferences don't belong in the core. --- midori/midori-preferences.c | 8 -------- midori/midori-websettings.c | 35 ----------------------------------- 2 files changed, 43 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index f7fa0f20..4088634b 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -497,12 +497,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, G_CALLBACK (midori_preferences_notify_identify_as_cb), entry); midori_preferences_notify_identify_as_cb (settings, NULL, entry); SPANNED_ADD (entry); - label = katze_property_label (settings, "cache-size"); - INDENTED_ADD (label); - entry = katze_property_proxy (settings, "cache-size", NULL); - SPANNED_ADD (entry); - label = gtk_label_new (_("MB")); - SPANNED_ADD (label); /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); @@ -526,8 +520,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences, SPANNED_ADD (button); label = gtk_label_new (_("days")); SPANNED_ADD (label); - button = katze_property_proxy (settings, "remember-last-form-inputs", NULL); - INDENTED_ADD (button); button = katze_property_proxy (settings, "remember-last-downloaded-files", NULL); INDENTED_ADD (button); } diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index e95b6ad5..83e078a2 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -82,14 +82,12 @@ struct _MidoriWebSettings gboolean remember_last_visited_pages; gint maximum_history_age; - gboolean remember_last_form_inputs; gboolean remember_last_downloaded_files; gchar* http_proxy; gboolean auto_detect_proxy; MidoriIdentity identify_as; gchar* ident_string; - gint cache_size; gint clear_private_data; }; @@ -159,14 +157,12 @@ enum PROP_REMEMBER_LAST_VISITED_PAGES, PROP_MAXIMUM_HISTORY_AGE, - PROP_REMEMBER_LAST_FORM_INPUTS, PROP_REMEMBER_LAST_DOWNLOADED_FILES, PROP_HTTP_PROXY, PROP_AUTO_DETECT_PROXY, PROP_IDENTIFY_AS, PROP_IDENT_STRING, - PROP_CACHE_SIZE, PROP_CLEAR_PRIVATE_DATA }; @@ -907,15 +903,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) 0, G_MAXINT, 30, flags)); - g_object_class_install_property (gobject_class, - PROP_REMEMBER_LAST_FORM_INPUTS, - g_param_spec_boolean ( - "remember-last-form-inputs", - _("Remember last form inputs"), - _("Whether the last form inputs are saved"), - TRUE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_REMEMBER_LAST_DOWNLOADED_FILES, g_param_spec_boolean ( @@ -986,15 +973,6 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, - PROP_CACHE_SIZE, - g_param_spec_int ( - "cache-size", - _("Cache size"), - _("The allowed size of the cache"), - 0, G_MAXINT, 100, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - /** * MidoriWebSettings:clear-private-data: * @@ -1049,7 +1027,6 @@ midori_web_settings_init (MidoriWebSettings* web_settings) web_settings->http_proxy = NULL; web_settings->show_panel_controls = TRUE; web_settings->open_popups_in_tabs = TRUE; - web_settings->remember_last_form_inputs = TRUE; web_settings->remember_last_downloaded_files = TRUE; web_settings->kinetic_scrolling = TRUE; web_settings->auto_detect_proxy = TRUE; @@ -1349,9 +1326,6 @@ midori_web_settings_set_property (GObject* object, case PROP_MAXIMUM_HISTORY_AGE: web_settings->maximum_history_age = g_value_get_int (value); break; - case PROP_REMEMBER_LAST_FORM_INPUTS: - web_settings->remember_last_form_inputs = g_value_get_boolean (value); - break; case PROP_REMEMBER_LAST_DOWNLOADED_FILES: web_settings->remember_last_downloaded_files = g_value_get_boolean (value); break; @@ -1383,9 +1357,6 @@ midori_web_settings_set_property (GObject* object, #endif } break; - case PROP_CACHE_SIZE: - web_settings->cache_size = g_value_get_int (value); - break; case PROP_CLEAR_PRIVATE_DATA: web_settings->clear_private_data = g_value_get_int (value); break; @@ -1555,9 +1526,6 @@ midori_web_settings_get_property (GObject* object, case PROP_MAXIMUM_HISTORY_AGE: g_value_set_int (value, web_settings->maximum_history_age); break; - case PROP_REMEMBER_LAST_FORM_INPUTS: - g_value_set_boolean (value, web_settings->remember_last_form_inputs); - break; case PROP_REMEMBER_LAST_DOWNLOADED_FILES: g_value_set_boolean (value, web_settings->remember_last_downloaded_files); break; @@ -1579,9 +1547,6 @@ midori_web_settings_get_property (GObject* object, } g_value_set_string (value, web_settings->ident_string); break; - case PROP_CACHE_SIZE: - g_value_set_int (value, web_settings->cache_size); - break; case PROP_CLEAR_PRIVATE_DATA: g_value_set_int (value, web_settings->clear_private_data); break; -- 2.39.5