GNOME.org
 

[epiphany] Remove a bunch of unused settings

commit 2a269f64980331606e353849fa7188f3109a388b
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Oct 25 17:55:57 2016 -0500

    Remove a bunch of unused settings
    
    I included this in the 3.23.1 NEWS file but forgot to actually do it.
    Oops.

 data/org.gnome.epiphany.gschema.xml          |   49 --------------------------
 lib/ephy-prefs.h                             |   12 ------
 src/profile-migrator/ephy-profile-migrator.c |   16 +--------
 3 files changed, 1 insertions(+), 76 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index 187e3e9..c84318d 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -41,10 +41,6 @@
                        <summary>Remember passwords</summary>
                        <description>Whether to store and prefill passwords in websites.</description>
                </key>
-               <key type="b" name="managed-network">
-                       <default>true</default>
-                       <summary>Automatically manage offline status with NetworkManager</summary>
-               </key>
                <key type="b" name="warn-on-close-unsubmitted-data">
                        <default>true</default>
                </key>
@@ -89,16 +85,6 @@
                </key>
        </schema>
        <schema path="/org/gnome/epiphany/ui/" id="org.gnome.Epiphany.ui">
-               <key type="b" name="always-show-tabs-bar">
-                       <default>false</default>
-                       <summary>[Deprecated]</summary>
-                       <description>[Deprecated] This setting is deprecated, use 
'tabs-bar-visibility-policy' instead.</description>
-               </key>
-               <key type="b" name="downloads-hidden">
-                       <default>false</default>
-                       <summary>Visibility of the downloads window</summary>
-                       <description>Hide or show the downloads window. When hidden, a notification will be 
shown when new downloads are started.</description>
-               </key>
                <key type="b" name="expand-tabs-bar">
                        <default>true</default>
                        <summary>Expand tabs size to fill the available space on the tabs bar.</summary>
@@ -140,16 +126,6 @@
                        <summary>Custom monospace font</summary>
                        <description>A value to be used to override monospace desktop font when 
use-gnome-fonts is set.</description>
                </key>
-               <key type="b" name="use-own-colors">
-                       <default>false</default>
-                       <summary>Use own colors</summary>
-                       <description>Use your own colors instead of the colors the page 
requests.</description>
-               </key>
-               <key type="b" name="use-own-fonts">
-                       <default>false</default>
-                       <summary>Use own fonts</summary>
-                       <description>Use your own fonts instead of the fonts the page requests.</description>
-               </key>
                <key type="b" name="enable-user-css">
                        <default>false</default>
                        <summary>Use a custom CSS</summary>
@@ -175,11 +151,6 @@
                        <summary>Cookie accept</summary>
                        <description>Where to accept cookies from. Possible values are "always", 
"no-third-party" and "never".</description>
                </key>
-               <key type="s" name="image-animation-mode">
-                       <default>'normal'</default>
-                       <summary>Image animation mode</summary>
-                       <description>How to present animated images. Possible values are "normal", "once" and 
"disabled".</description>
-               </key>
                <key type="b" name="enable-popups">
                        <default>true</default>
                        <summary>Allow popups</summary>
@@ -207,18 +178,6 @@
                </key>
        </schema>
        <schema path="/org/gnome/epiphany/state/" id="org.gnome.Epiphany.state">
-               <key type="s" name="open-dir">
-                       <default>'~'</default>
-               </key>
-               <key type="s" name="save-dir">
-                       <default>'~'</default>
-               </key>
-               <key type="s" name="save-image-dir">
-                       <default>'~'</default>
-               </key>
-               <key type="s" name="upload-dir">
-                       <default>'~'</default>
-               </key>
                <key type="s" name="download-dir">
                        <default>'Downloads'</default>
                        <summary>The downloads folder</summary>
@@ -227,14 +186,6 @@
                <key type="as" name="recent-encodings">
                        <default>['' ]</default>
                </key>
-               <key type="b" name="bookmarks-view-title">
-                       <default>true</default>
-                       <summary>Whether to show the title column in the bookmarks window.</summary>
-               </key>
-               <key type="b" name="bookmarks-view-address">
-                       <default>false</default>
-                       <summary>Whether to show the address column in the bookmarks window.</summary>
-               </key>
        </schema>
        <schema path="/org/gnome/epiphany/lockdown/" id="org.gnome.Epiphany.lockdown">
                <key type="b" name="disable-fullscreen">
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 14449c7..2283e28 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -59,38 +59,27 @@ typedef enum
 } EphyPrefsProcessModel;
 
 #define EPHY_PREFS_UI_SCHEMA                     "org.gnome.Epiphany.ui"
-#define EPHY_PREFS_UI_ALWAYS_SHOW_TABS_BAR       "always-show-tabs-bar"
-#define EPHY_PREFS_UI_DOWNLOADS_HIDDEN           "downloads-hidden"
 #define EPHY_PREFS_UI_EXPAND_TABS_BAR            "expand-tabs-bar"
 #define EPHY_PREFS_UI_TABS_BAR_POSITION          "tabs-bar-position"
 #define EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY "tabs-bar-visibility-policy"
 
 #define EPHY_PREFS_STATE_SCHEMA                 "org.gnome.Epiphany.state"
-#define EPHY_PREFS_STATE_SAVE_DIR               "save-dir"
-#define EPHY_PREFS_STATE_SAVE_IMAGE_DIR         "save-image-dir"
-#define EPHY_PREFS_STATE_OPEN_DIR               "open-dir"
 #define EPHY_PREFS_STATE_DOWNLOAD_DIR           "download-dir"
-#define EPHY_PREFS_STATE_UPLOAD_DIR             "upload-dir"
 #define EPHY_PREFS_STATE_RECENT_ENCODINGS       "recent-encodings"
-#define EPHY_PREFS_STATE_BOOKMARKS_VIEW_TITLE   "bookmarks-view-title"
-#define EPHY_PREFS_STATE_BOOKMARKS_VIEW_ADDRESS "bookmarks-view-address"
 
 #define EPHY_PREFS_WEB_SCHEMA                "org.gnome.Epiphany.web"
 #define EPHY_PREFS_WEB_FONT_MIN_SIZE         "min-font-size"
 #define EPHY_PREFS_WEB_LANGUAGE              "language"
-#define EPHY_PREFS_WEB_USE_OWN_FONTS         "use-own-fonts"
 #define EPHY_PREFS_WEB_USE_GNOME_FONTS       "use-gnome-fonts"
 #define EPHY_PREFS_WEB_SANS_SERIF_FONT       "sans-serif-font"
 #define EPHY_PREFS_WEB_SERIF_FONT            "serif-font"
 #define EPHY_PREFS_WEB_MONOSPACE_FONT        "monospace-font"
-#define EPHY_PREFS_WEB_USE_OWN_COLORS        "use-own-colors"
 #define EPHY_PREFS_WEB_ENABLE_USER_CSS       "enable-user-css"
 #define EPHY_PREFS_WEB_ENABLE_POPUPS         "enable-popups"
 #define EPHY_PREFS_WEB_ENABLE_SPELL_CHECKING "enable-spell-checking"
 #define EPHY_PREFS_WEB_ENABLE_WEBGL          "enable-webgl"
 #define EPHY_PREFS_WEB_ENABLE_WEBAUDIO       "enable-webaudio"
 #define EPHY_PREFS_WEB_COOKIES_POLICY        "cookies-policy"
-#define EPHY_PREFS_WEB_IMAGE_ANIMATION_MODE  "image-animation-mode"
 #define EPHY_PREFS_WEB_DEFAULT_ENCODING      "default-encoding"
 #define EPHY_PREFS_WEB_DO_NOT_TRACK          "do-not-track"
 #define EPHY_PREFS_WEB_ENABLE_ADBLOCK        "enable-adblock"
@@ -102,7 +91,6 @@ typedef enum
 #define EPHY_PREFS_WARN_ON_CLOSE_UNSUBMITTED_DATA "warn-on-close-unsubmitted-data"
 #define EPHY_PREFS_REMEMBER_PASSWORDS             "remember-passwords"
 #define EPHY_PREFS_KEYWORD_SEARCH_URL             "keyword-search-url"
-#define EPHY_PREFS_MANAGED_NETWORK                "managed-network"
 #define EPHY_PREFS_ENABLE_SMOOTH_SCROLLING        "enable-smooth-scrolling"
 #define EPHY_PREFS_ENABLE_CARET_BROWSING          "enable-caret-browsing"
 #define EPHY_PREFS_INTERNAL_VIEW_SOURCE           "internal-view-source"
diff --git a/src/profile-migrator/ephy-profile-migrator.c b/src/profile-migrator/ephy-profile-migrator.c
index f32dd51..36e8ccd 100644
--- a/src/profile-migrator/ephy-profile-migrator.c
+++ b/src/profile-migrator/ephy-profile-migrator.c
@@ -72,20 +72,6 @@ profile_dir_exists (void)
 }
 
 static void
-migrate_tabs_visibility (void)
-{
-  gboolean always_show_tabs;
-
-  always_show_tabs = g_settings_get_boolean (EPHY_SETTINGS_UI,
-                                             EPHY_PREFS_UI_ALWAYS_SHOW_TABS_BAR);
-
-  if (always_show_tabs)
-    g_settings_set_enum (EPHY_SETTINGS_UI,
-                         EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY,
-                         EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_ALWAYS);
-}
-
-static void
 migrate_profile (const char *old_dir,
                  const char *new_dir)
 {
@@ -630,7 +616,7 @@ const EphyProfileMigrator migrators[] = {
   migrate_nothing,
   migrate_nothing,
   migrate_nothing,
-  migrate_tabs_visibility,
+  migrate_nothing,
   migrate_web_app_links,
   migrate_new_urls_table,
   migrate_form_passwords_to_libsecret,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]