[gedit] Change the name of the tabs-mode setting

[Paolo Borelli <pborelli src gnome org>]

commit c84253fc4007251f53a62e4da95daadc1a27a5a2
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Feb 16 11:59:52 2014 +0100

    Change the name of the tabs-mode setting
    
    This is unfortunate, but since we want a different default and since
    for some reason the old setting ended up being written for all the users
    (maybe due to to setting binding stuff?) we need to change the setting
    name or all user upgrading will not see the new default.

 data/org.gnome.gedit.gschema.xml.in |    2 +-
 gedit/gedit-settings.h              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/org.gnome.gedit.gschema.xml.in b/data/org.gnome.gedit.gschema.xml.in
index bf53033..0550259 100644
--- a/data/org.gnome.gedit.gschema.xml.in
+++ b/data/org.gnome.gedit.gschema.xml.in
@@ -148,7 +148,7 @@
       <summary>Toolbar is Visible</summary>
       <description>Whether the toolbar should be visible in editing windows.</description>
     </key>
-    <key name="notebook-show-tabs-mode" enum="org.gnome.gedit.GeditNotebookShowTabsModeType">
+    <key name="show-tabs-mode" enum="org.gnome.gedit.GeditNotebookShowTabsModeType">
       <default>'auto'</default>
       <summary>Notebook Show Tabs Mode</summary>
       <description>Specifies when to show the notebook tabs. Use "never" to never show the tabs, "always" to 
always show the tabs, and "auto" to show the tabs only when there is more than one tab. Note that the values 
are case-sensitive, so make sure they appear exactly as mentioned here.</description>
diff --git a/gedit/gedit-settings.h b/gedit/gedit-settings.h
index 3b2224c..706a5dc 100644
--- a/gedit/gedit-settings.h
+++ b/gedit/gedit-settings.h
@@ -112,7 +112,7 @@ void                         gedit_settings_set_list                        (GSettings    
 *settings,
 /* window state keys */
 #define GEDIT_SETTINGS_WINDOW_STATE                    "state"
 #define GEDIT_SETTINGS_WINDOW_SIZE                     "size"
-#define GEDIT_SETTINGS_SHOW_TABS_MODE                  "notebook-show-tabs-mode"
+#define GEDIT_SETTINGS_SHOW_TABS_MODE                  "show-tabs-mode"
 #define GEDIT_SETTINGS_SIDE_PANEL_SIZE                 "side-panel-size"
 #define GEDIT_SETTINGS_SIDE_PANEL_ACTIVE_PAGE          "side-panel-active-page"
 #define GEDIT_SETTINGS_BOTTOM_PANEL_SIZE               "bottom-panel-size"