application: do not access instance data on _new
The settings setup could be delayed to _init vfunc of the application.
This commit is contained in:
+8
-11
@@ -106,6 +106,10 @@ gcal_application_class_init (GcalApplicationClass *klass)
|
|||||||
static void
|
static void
|
||||||
gcal_application_init (GcalApplication *self)
|
gcal_application_init (GcalApplication *self)
|
||||||
{
|
{
|
||||||
|
GcalApplicationPrivate *priv;
|
||||||
|
|
||||||
|
priv = gcal_application_get_instance_private (self);
|
||||||
|
priv->settings = g_settings_new ("org.gnome.calendar");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -332,19 +336,12 @@ gcal_application_quit (GSimpleAction *simple,
|
|||||||
GcalApplication*
|
GcalApplication*
|
||||||
gcal_application_new (void)
|
gcal_application_new (void)
|
||||||
{
|
{
|
||||||
GcalApplication *app;
|
|
||||||
GcalApplicationPrivate *priv;
|
|
||||||
|
|
||||||
g_set_application_name ("Calendar");
|
g_set_application_name ("Calendar");
|
||||||
|
|
||||||
app = g_object_new (gcal_application_get_type (),
|
return g_object_new (gcal_application_get_type (),
|
||||||
"application-id", "org.gnome.Calendar",
|
"application-id", "org.gnome.Calendar",
|
||||||
"flags", G_APPLICATION_HANDLES_COMMAND_LINE,
|
"flags", G_APPLICATION_HANDLES_COMMAND_LINE,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
priv = gcal_application_get_instance_private (app);
|
|
||||||
priv->settings = g_settings_new ("org.gnome.calendar");
|
|
||||||
return app;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GcalManager*
|
GcalManager*
|
||||||
|
|||||||
Reference in New Issue
Block a user