[devhelp] DhSettings: same schema IDs order as in the *.gschema.xml file

[Sébastien Wilmet <swilmet src gnome org>]

commit edc501702ae9f25babf549b8321e68f505a7f906
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Apr 28 16:53:24 2017 +0200

    DhSettings: same schema IDs order as in the *.gschema.xml file
    
    It's now easier to check that all schemas are used.

 src/dh-settings.c |   94 +++++++++++++++++++++++++++--------------------------
 src/dh-settings.h |   16 ++++----
 2 files changed, 56 insertions(+), 54 deletions(-)
---
diff --git a/src/dh-settings.c b/src/dh-settings.c
index 7bb7f35..2ce89cd 100644
--- a/src/dh-settings.c
+++ b/src/dh-settings.c
@@ -20,21 +20,23 @@
 #include "config.h"
 #include "dh-settings.h"
 
-/* schema-ids for settings we need */
-#define SETTINGS_SCHEMA_ID_DESKTOP_INTERFACE "org.gnome.desktop.interface"
-#define SETTINGS_SCHEMA_ID_FONTS "org.gnome.devhelp.fonts"
-#define SETTINGS_SCHEMA_ID_WINDOW "org.gnome.devhelp.state.main.window"
-#define SETTINGS_SCHEMA_ID_CONTENTS "org.gnome.devhelp.state.main.contents"
-#define SETTINGS_SCHEMA_ID_PANED "org.gnome.devhelp.state.main.paned"
-#define SETTINGS_SCHEMA_ID_ASSISTANT "org.gnome.devhelp.state.assistant.window"
+/* Devhelp GSettings schema IDs */
+#define SETTINGS_SCHEMA_ID_WINDOW               "org.gnome.devhelp.state.main.window"
+#define SETTINGS_SCHEMA_ID_PANED                "org.gnome.devhelp.state.main.paned"
+#define SETTINGS_SCHEMA_ID_CONTENTS             "org.gnome.devhelp.state.main.contents"
+#define SETTINGS_SCHEMA_ID_ASSISTANT            "org.gnome.devhelp.state.assistant.window"
+#define SETTINGS_SCHEMA_ID_FONTS                "org.gnome.devhelp.fonts"
+
+/* Provided by the gsettings-desktop-schemas module. */
+#define SETTINGS_SCHEMA_ID_DESKTOP_INTERFACE    "org.gnome.desktop.interface"
 
 struct _DhSettingsPrivate {
-        GSettings *settings_desktop_interface;
-        GSettings *settings_fonts;
         GSettings *settings_window;
-        GSettings *settings_contents;
         GSettings *settings_paned;
+        GSettings *settings_contents;
         GSettings *settings_assistant;
+        GSettings *settings_fonts;
+        GSettings *settings_desktop_interface;
 };
 
 enum {
@@ -54,12 +56,12 @@ dh_settings_dispose (GObject *object)
 {
         DhSettings *self = DH_SETTINGS (object);
 
-        g_clear_object (&self->priv->settings_desktop_interface);
-        g_clear_object (&self->priv->settings_fonts);
         g_clear_object (&self->priv->settings_window);
-        g_clear_object (&self->priv->settings_contents);
         g_clear_object (&self->priv->settings_paned);
+        g_clear_object (&self->priv->settings_contents);
         g_clear_object (&self->priv->settings_assistant);
+        g_clear_object (&self->priv->settings_fonts);
+        g_clear_object (&self->priv->settings_desktop_interface);
 
         G_OBJECT_CLASS (dh_settings_parent_class)->dispose (object);
 }
@@ -115,12 +117,12 @@ dh_settings_init (DhSettings *self)
 {
         self->priv = dh_settings_get_instance_private (self);
 
-        self->priv->settings_desktop_interface = g_settings_new (SETTINGS_SCHEMA_ID_DESKTOP_INTERFACE);
-        self->priv->settings_fonts = g_settings_new (SETTINGS_SCHEMA_ID_FONTS);
         self->priv->settings_window = g_settings_new (SETTINGS_SCHEMA_ID_WINDOW);
-        self->priv->settings_contents = g_settings_new (SETTINGS_SCHEMA_ID_CONTENTS);
         self->priv->settings_paned = g_settings_new (SETTINGS_SCHEMA_ID_PANED);
+        self->priv->settings_contents = g_settings_new (SETTINGS_SCHEMA_ID_CONTENTS);
         self->priv->settings_assistant = g_settings_new (SETTINGS_SCHEMA_ID_ASSISTANT);
+        self->priv->settings_fonts = g_settings_new (SETTINGS_SCHEMA_ID_FONTS);
+        self->priv->settings_desktop_interface = g_settings_new (SETTINGS_SCHEMA_ID_DESKTOP_INTERFACE);
 
         g_signal_connect_object (self->priv->settings_fonts,
                                  "changed",
@@ -145,6 +147,36 @@ dh_settings_free_singleton (void)
                 g_object_unref (singleton);
 }
 
+GSettings *
+dh_settings_peek_window_settings (DhSettings *self)
+{
+        return self->priv->settings_window;
+}
+
+GSettings *
+dh_settings_peek_paned_settings (DhSettings *self)
+{
+        return self->priv->settings_paned;
+}
+
+GSettings *
+dh_settings_peek_contents_settings (DhSettings *self)
+{
+        return self->priv->settings_contents;
+}
+
+GSettings *
+dh_settings_peek_assistant_settings (DhSettings *self)
+{
+        return self->priv->settings_assistant;
+}
+
+GSettings *
+dh_settings_peek_fonts_settings (DhSettings *self)
+{
+        return self->priv->settings_fonts;
+}
+
 void
 dh_settings_get_selected_fonts (DhSettings  *self,
                                 gchar      **font_name_fixed,
@@ -169,33 +201,3 @@ dh_settings_get_selected_fonts (DhSettings  *self,
                                                              "variable-font");
         }
 }
-
-GSettings *
-dh_settings_peek_fonts_settings (DhSettings *self)
-{
-        return self->priv->settings_fonts;
-}
-
-GSettings *
-dh_settings_peek_window_settings (DhSettings *self)
-{
-        return self->priv->settings_window;
-}
-
-GSettings *
-dh_settings_peek_contents_settings (DhSettings *self)
-{
-        return self->priv->settings_contents;
-}
-
-GSettings *
-dh_settings_peek_paned_settings (DhSettings *self)
-{
-        return self->priv->settings_paned;
-}
-
-GSettings *
-dh_settings_peek_assistant_settings (DhSettings *self)
-{
-        return self->priv->settings_assistant;
-}
diff --git a/src/dh-settings.h b/src/dh-settings.h
index fd1081f..92a488d 100644
--- a/src/dh-settings.h
+++ b/src/dh-settings.h
@@ -55,20 +55,20 @@ DhSettings *    dh_settings_get_singleton               (void);
 
 void            dh_settings_free_singleton              (void);
 
-void            dh_settings_get_selected_fonts          (DhSettings  *self,
-                                                         gchar      **font_name_fixed,
-                                                         gchar      **font_name_variable);
-
-GSettings *     dh_settings_peek_fonts_settings         (DhSettings *self);
-
 GSettings *     dh_settings_peek_window_settings        (DhSettings *self);
 
-GSettings *     dh_settings_peek_contents_settings      (DhSettings *self);
-
 GSettings *     dh_settings_peek_paned_settings         (DhSettings *self);
 
+GSettings *     dh_settings_peek_contents_settings      (DhSettings *self);
+
 GSettings *     dh_settings_peek_assistant_settings     (DhSettings *self);
 
+GSettings *     dh_settings_peek_fonts_settings         (DhSettings *self);
+
+void            dh_settings_get_selected_fonts          (DhSettings  *self,
+                                                         gchar      **font_name_fixed,
+                                                         gchar      **font_name_variable);
+
 G_END_DECLS
 
 #endif /* __DH_SETTINGS_H__ */