[gnome-terminal/masters: 2/2] settings: Change settings path

[Christian Persch <chpe src gnome org>]

commit 9b3269b9b8cb34b6f990c0cde938ca35b44ad1ef
Author: Christian Persch <chpe gnome org>
Date:   Mon Jan 14 17:53:08 2013 +0100

    settings: Change settings path

 src/org.gnome.Terminal.gschema.xml.in |    6 +++---
 src/terminal-schemas.h                |    8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/org.gnome.Terminal.gschema.xml.in b/src/org.gnome.Terminal.gschema.xml.in
index b62b14d..9b6a187 100644
--- a/src/org.gnome.Terminal.gschema.xml.in
+++ b/src/org.gnome.Terminal.gschema.xml.in
@@ -455,7 +455,7 @@
 
   <!-- Global settings -->
 
-  <schema id="org.gnome.Terminal.Settings" path="/org/gnome/terminal/">
+  <schema id="org.gnome.Terminal.Legacy.Settings" path="/org/gnome/terminal/legacy/">
 
     <key name="mnemonics-enabled" type="b">
       <default>false</default>
@@ -506,11 +506,11 @@
       <_summary>Whether to show the menubar in new windows</_summary>
     </key>
 
-    <key name="legacy-profiles" type="as">
+    <key name="profiles" type="as">
       <default>['b1dcc9dd-5262-4d8d-a863-c897e6d979b9']</default>
     </key>
 
-    <key name="legacy-default-profile" type="s">
+    <key name="default-profile" type="s">
       <default>'b1dcc9dd-5262-4d8d-a863-c897e6d979b9'</default>
     </key>
 
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index cd2acbc..1135cc4 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
 
 #define TERMINAL_KEYBINDINGS_SCHEMA     "org.gnome.Terminal.Legacy.Keybindings"
 #define TERMINAL_PROFILE_SCHEMA         "org.gnome.Terminal.Legacy.Profile"
-#define TERMINAL_SETTING_SCHEMA         "org.gnome.Terminal.Settings"
+#define TERMINAL_SETTING_SCHEMA         "org.gnome.Terminal.Legacy.Settings"
 
 #define TERMINAL_PROFILE_ALLOW_BOLD_KEY                 "allow-bold"
 #define TERMINAL_PROFILE_AUDIBLE_BELL_KEY               "audible-bell"
@@ -66,17 +66,15 @@ G_BEGIN_DECLS
 #define TERMINAL_PROFILE_WORD_CHARS_KEY                 "word-chars"
 
 #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
-#define TERMINAL_SETTING_DEFAULT_PROFILE_KEY            "legacy-default-profile"
+#define TERMINAL_SETTING_DEFAULT_PROFILE_KEY            "default-profile"
 #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
 #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY      "menu-accelerator-enabled"
 #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY           "mnemonics-enabled"
-#define TERMINAL_SETTING_PROFILES_KEY                   "legacy-profiles"
+#define TERMINAL_SETTING_PROFILES_KEY                   "profiles"
 #define TERMINAL_SETTING_ENCODINGS_KEY                  "encodings"
 #define TERMINAL_SETTING_SCHEMA_VERSION                 "schema-version"
 
 #define TERMINAL_PROFILES_PATH_PREFIX   "/org/gnome/terminal/legacy/profiles:/"
-#define TERMINAL_DEFAULT_PROFILE_ID     ":profile0"
-#define TERMINAL_DEFAULT_PROFILE_PATH   TERMINAL_PROFILES_PATH_PREFIX TERMINAL_DEFAULT_PROFILE_ID "/"
 
 G_END_DECLS