[devhelp] DhSettings: code cleanup and coding style improvements

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

commit b70b628aa82ab98edc1fa4c75274342bbcf41078
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Apr 28 13:12:43 2017 +0200

    DhSettings: code cleanup and coding style improvements

 src/dh-settings.c |   91 +++++++++++++++++++++++++---------------------------
 src/dh-settings.h |   58 +++++++++++++++------------------
 2 files changed, 70 insertions(+), 79 deletions(-)
---
diff --git a/src/dh-settings.c b/src/dh-settings.c
index d7453e3..f9f158b 100644
--- a/src/dh-settings.c
+++ b/src/dh-settings.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2012 Thomas Bechtold <toabctl gnome org>
+ * Copyright (C) 2017 Sébastien Wilmet <swilmet gnome org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -12,17 +13,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 #include "dh-settings.h"
 
-G_DEFINE_TYPE (DhSettings, dh_settings, G_TYPE_OBJECT);
-
-#define DH_SETTINGS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DH_TYPE_SETTINGS, DhSettingsPrivate))
-
 /* 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"
@@ -31,13 +28,6 @@ G_DEFINE_TYPE (DhSettings, dh_settings, G_TYPE_OBJECT);
 #define SETTINGS_SCHEMA_ID_PANED "org.gnome.devhelp.state.main.paned"
 #define SETTINGS_SCHEMA_ID_ASSISTANT "org.gnome.devhelp.state.assistant.window"
 
-/* singleton object - all consumers of DhSettings get the same object (refcounted) */
-static DhSettings *singleton = NULL;
-
-/* Prototypes */
-static void fonts_changed_cb (GSettings *settings, gchar *key, gpointer user_data);
-
-
 struct _DhSettingsPrivate {
         GSettings *settings_desktop_interface;
         GSettings *settings_fonts;
@@ -49,16 +39,25 @@ struct _DhSettingsPrivate {
 
 enum {
         FONTS_CHANGED,
-        LAST_SIGNAL
+        N_SIGNALS
 };
 
-static gint signals[LAST_SIGNAL] = { 0 };
+static guint signals[N_SIGNALS] = { 0 };
 
+/* DhSettings is a singleton. */
+static DhSettings *singleton = NULL;
+
+G_DEFINE_TYPE_WITH_PRIVATE (DhSettings, dh_settings, G_TYPE_OBJECT);
+
+/* Prototypes */
+static void fonts_changed_cb (GSettings *settings,
+                              gchar     *key,
+                              gpointer   user_data);
 
 static void
 dh_settings_init (DhSettings *self)
 {
-        self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, DH_TYPE_SETTINGS, DhSettingsPrivate);
+        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);
@@ -67,17 +66,17 @@ dh_settings_init (DhSettings *self)
         self->priv->settings_paned = g_settings_new (SETTINGS_SCHEMA_ID_PANED);
         self->priv->settings_assistant = g_settings_new (SETTINGS_SCHEMA_ID_ASSISTANT);
 
-        /* setup GSettings notifications */
         g_signal_connect (self->priv->settings_fonts,
                           "changed",
-                          G_CALLBACK (fonts_changed_cb), self);
+                          G_CALLBACK (fonts_changed_cb),
+                          self);
 }
 
-
 static void
-dispose (GObject *object)
+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);
@@ -88,25 +87,21 @@ dispose (GObject *object)
         G_OBJECT_CLASS (dh_settings_parent_class)->dispose (object);
 }
 
-
 static void
-finalize (GObject *object)
+dh_settings_finalize (GObject *object)
 {
         singleton = NULL;
 
-        /* Chain up to the parent class */
-        G_OBJECT_CLASS (dh_settings_parent_class)->finalize(object);
+        G_OBJECT_CLASS (dh_settings_parent_class)->finalize (object);
 }
 
-
 static void
 dh_settings_class_init (DhSettingsClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-        g_type_class_add_private (object_class, sizeof (DhSettingsPrivate));
-        object_class->dispose = dispose;
-        object_class->finalize = finalize;
+        object_class->dispose = dh_settings_dispose;
+        object_class->finalize = dh_settings_finalize;
 
         signals[FONTS_CHANGED] =
                 g_signal_new ("fonts-changed",
@@ -122,35 +117,39 @@ dh_settings_class_init (DhSettingsClass *klass)
 }
 
 static void
-fonts_changed_cb (GSettings *settings, gchar *key, gpointer user_data)
+fonts_changed_cb (GSettings *settings,
+                  gchar     *key,
+                  gpointer   user_data)
 {
         DhSettings *self = DH_SETTINGS (user_data);
         gchar *fixed_font = NULL;
         gchar *variable_font = NULL;
+
         dh_settings_get_selected_fonts (self, &fixed_font, &variable_font);
-        //emit signal - font changed
+
         g_signal_emit (self, signals[FONTS_CHANGED], 0, fixed_font, variable_font);
+
         g_free (fixed_font);
         g_free (variable_font);
 }
 
-/*******************************************************************************
- * Public Methods
- ******************************************************************************/
 DhSettings *
 dh_settings_get (void)
 {
-        if (!singleton) {
-                singleton = DH_SETTINGS (g_object_new (DH_TYPE_SETTINGS, NULL));
+        if (singleton == NULL) {
+                singleton = g_object_new (DH_TYPE_SETTINGS, NULL);
         } else {
                 g_object_ref (singleton);
         }
-        g_assert (singleton);
+
+        g_return_val_if_fail (DH_IS_SETTINGS (singleton), NULL);
         return singleton;
 }
 
 void
-dh_settings_get_selected_fonts (DhSettings *self, gchar **font_name_fixed, gchar **font_name_variable)
+dh_settings_get_selected_fonts (DhSettings  *self,
+                                gchar      **font_name_fixed,
+                                gchar      **font_name_variable)
 {
         gboolean use_system_font;
 
@@ -160,17 +159,15 @@ dh_settings_get_selected_fonts (DhSettings *self, gchar **font_name_fixed, gchar
         use_system_font = g_settings_get_boolean (self->priv->settings_fonts, "use-system-fonts");
 
         if (use_system_font) {
-                *font_name_fixed = g_settings_get_string (
-                        self->priv->settings_desktop_interface,
-                        "monospace-font-name");
-                *font_name_variable = g_settings_get_string (
-                        self->priv->settings_desktop_interface,
-                        "font-name");
+                *font_name_fixed = g_settings_get_string (self->priv->settings_desktop_interface,
+                                                          "monospace-font-name");
+                *font_name_variable = g_settings_get_string (self->priv->settings_desktop_interface,
+                                                             "font-name");
         } else {
-                *font_name_fixed = g_settings_get_string (
-                        self->priv->settings_fonts, "fixed-font");
-                *font_name_variable = g_settings_get_string (
-                        self->priv->settings_fonts, "variable-font");
+                *font_name_fixed = g_settings_get_string (self->priv->settings_fonts,
+                                                          "fixed-font");
+                *font_name_variable = g_settings_get_string (self->priv->settings_fonts,
+                                                             "variable-font");
         }
 }
 
diff --git a/src/dh-settings.h b/src/dh-settings.h
index 35d41e0..8285791 100644
--- a/src/dh-settings.h
+++ b/src/dh-settings.h
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2012 Thomas Bechtold <toabctl gnome org>
+ * Copyright (C) 2017 Sébastien Wilmet <swilmet gnome org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -12,66 +13,59 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __DH_SETTINGS_H__
 #define __DH_SETTINGS_H__
 
 #include <gio/gio.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define DH_TYPE_SETTINGS (dh_settings_get_type ())
-#define DH_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DH_TYPE_SETTINGS, DhSettings))
-#define DH_IS_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DH_TYPE_SETTINGS))
-#define DH_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DH_TYPE_SETTINGS, DhSettingsClass))
-#define DH_IS_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DH_TYPE_SETTINGS))
-#define DH_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DH_TYPE_SETTINGS, DhSettingsClass))
+#define DH_TYPE_SETTINGS                (dh_settings_get_type ())
+#define DH_SETTINGS(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), DH_TYPE_SETTINGS, DhSettings))
+#define DH_IS_SETTINGS(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DH_TYPE_SETTINGS))
+#define DH_SETTINGS_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), DH_TYPE_SETTINGS, 
DhSettingsClass))
+#define DH_IS_SETTINGS_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), DH_TYPE_SETTINGS))
+#define DH_SETTINGS_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), DH_TYPE_SETTINGS, 
DhSettingsClass))
 
-
-typedef struct _DhSettings DhSettings;
-typedef struct _DhSettingsClass DhSettingsClass;
+typedef struct _DhSettings        DhSettings;
+typedef struct _DhSettingsClass   DhSettingsClass;
 typedef struct _DhSettingsPrivate DhSettingsPrivate;
 
-
-struct _DhSettings{
+struct _DhSettings {
         GObject parent;
-        /*<private>*/
         DhSettingsPrivate *priv;
 };
 
-/**
- * DhSettingsClass:
- * @parent: The parent class
- * @fonts_changed: Class handler for the #DhSettings::fonts-changed signal
- */
-struct _DhSettingsClass{
+struct _DhSettingsClass {
         GObjectClass parent;
+
         /* Signals */
-        void (*fonts_changed) (DhSettings *settings,
+        void (*fonts_changed) (DhSettings  *settings,
                                const gchar *font_name_fixed,
                                const gchar *font_name_variable);
-} ;
-
-GType dh_settings_get_type (void) G_GNUC_CONST;
+};
 
-DhSettings * dh_settings_get (void);
+GType           dh_settings_get_type                    (void) G_GNUC_CONST;
 
-void dh_settings_get_selected_fonts (DhSettings *self, gchar **font_name_fixed, gchar **font_name_variable);
+DhSettings *    dh_settings_get                         (void);
 
-GSettings * dh_settings_peek_fonts_settings (DhSettings *self);
+void            dh_settings_get_selected_fonts          (DhSettings  *self,
+                                                         gchar      **font_name_fixed,
+                                                         gchar      **font_name_variable);
 
-GSettings * dh_settings_peek_window_settings (DhSettings *self);
+GSettings *     dh_settings_peek_fonts_settings         (DhSettings *self);
 
-GSettings * dh_settings_peek_contents_settings (DhSettings *self);
+GSettings *     dh_settings_peek_window_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_paned_settings         (DhSettings *self);
 
+GSettings *     dh_settings_peek_assistant_settings     (DhSettings *self);
 
 G_END_DECLS