[totem] main: Move some app init code to totem_object_init()



commit 64af8b16c7c3c5fb461895061baf040487eaf060
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Oct 20 12:28:56 2014 +0200

    main: Move some app init code to totem_object_init()

 src/totem-object.c |   10 +++++++++-
 src/totem.c        |    9 ---------
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index c1d23c1..89a0084 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -429,7 +429,15 @@ totem_object_class_init (TotemObjectClass *klass)
 static void
 totem_object_init (TotemObject *totem)
 {
-       //FIXME nothing yet
+       GtkSettings *gtk_settings;
+
+       if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
+               g_warning ("gtk-clutter failed to initialise, expect problems from here on.");
+
+       gtk_settings = gtk_settings_get_default ();
+       g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
+
+       totem->settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
 }
 
 static void
diff --git a/src/totem.c b/src/totem.c
index db8bd52..7fb9b73 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -54,14 +54,6 @@ static gboolean startup_called = FALSE;
 static void
 app_init (Totem *totem, char **argv)
 {
-       GtkSettings *gtk_settings;
-
-       if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
-               g_warning ("gtk-clutter failed to initialise, expect problems from here on.");
-
-       gtk_settings = gtk_settings_get_default ();
-       g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
-
        /* Main window */
        totem->xml = totem_interface_load ("totem.ui", TRUE, NULL, totem);
        if (totem->xml == NULL)
@@ -236,7 +228,6 @@ main (int argc, char **argv)
                              "application-id", "org.gnome.Totem",
                              "flags", G_APPLICATION_HANDLES_COMMAND_LINE | G_APPLICATION_HANDLES_OPEN,
                              NULL);
-       totem->settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
 
        g_signal_connect (G_OBJECT (totem), "startup",
                          G_CALLBACK (app_startup), totem);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]