[devhelp] DhSettings: move init after class_init
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] DhSettings: move init after class_init
- Date: Fri, 28 Apr 2017 11:42:41 +0000 (UTC)
commit f0d9959720fc4b8739e5b440725ab6cb49003e48
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Apr 28 13:37:14 2017 +0200
DhSettings: move init after class_init
To have a more logical order, and to avoid the prototype.
src/dh-settings.c | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/src/dh-settings.c b/src/dh-settings.c
index f9f158b..fc89186 100644
--- a/src/dh-settings.c
+++ b/src/dh-settings.c
@@ -49,29 +49,6 @@ 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 = 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_assistant = g_settings_new (SETTINGS_SCHEMA_ID_ASSISTANT);
-
- g_signal_connect (self->priv->settings_fonts,
- "changed",
- G_CALLBACK (fonts_changed_cb),
- self);
-}
-
static void
dh_settings_dispose (GObject *object)
{
@@ -133,6 +110,24 @@ fonts_changed_cb (GSettings *settings,
g_free (variable_font);
}
+static void
+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_assistant = g_settings_new (SETTINGS_SCHEMA_ID_ASSISTANT);
+
+ g_signal_connect (self->priv->settings_fonts,
+ "changed",
+ G_CALLBACK (fonts_changed_cb),
+ self);
+}
+
DhSettings *
dh_settings_get (void)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]