[gitg/wip/simplify-arch: 6/7] Consistent preferences schema

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 4d56a7331dc8853ac0b118bacd77a3d74b301e4b
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Mon Jul 1 09:29:18 2013 +0200

    Consistent preferences schema

 data/org.gnome.gitg.gschema.xml.in.in |   10 ++++++----
 gitg/gitg-window.vala                 |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/data/org.gnome.gitg.gschema.xml.in.in b/data/org.gnome.gitg.gschema.xml.in.in
index 1b2c3a8..e0b2bef 100644
--- a/data/org.gnome.gitg.gschema.xml.in.in
+++ b/data/org.gnome.gitg.gschema.xml.in.in
@@ -5,14 +5,16 @@
   </enum>
 
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gitg.preferences" 
path="/org/gnome/gitg/preferences/">
-    <child name="view" schema="org.gnome.gitg.preferences.view" />
+    <child name="main" schema="org.gnome.gitg.preferences.main" />
     <child name="commit" schema="org.gnome.gitg.preferences.commit" />
     <child name="diff" schema="org.gnome.gitg.preferences.diff" />
     <child name="hidden" schema="org.gnome.gitg.preferences.hidden" />
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gitg.preferences.view" 
path="/org/gnome/gitg/preferences/view/">
-    <child name="history" schema="org.gnome.gitg.preferences.view.history" />
-    <child name="main" schema="org.gnome.gitg.preferences.view.main" />
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gitg.preferences.main" 
path="/org/gnome/gitg/preferences/main/">
+    <key name="clone-directory" type="s">
+      <default>""</default>
+      <!-- TODO: add _descriptions -->
+    </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gitg.preferences.view.history" 
path="/org/gnome/gitg/preferences/view/history/">
     <key name="search-filter" type="b">
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 6073f12..8115aaa 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -140,7 +140,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
        {
                add_action_entries(win_entries, this);
 
-               d_main_settings = new Settings("org.gnome.gitg.preferences.view.main");
+               d_main_settings = new Settings("org.gnome.gitg.preferences.main");
                d_interface_settings = new Settings("org.gnome.gitg.preferences.interface");
 
                string menuname;