diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-12-14 05:05:32 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-03 11:00:40 +0800 |
commit | 68c35c4bedc4cd36cf2396121921f2e781b631fb (patch) | |
tree | 3a705b4c5776881d1d3899de674fdacea2440133 /calendar/gui/e-cal-source-config.c | |
parent | ebed1366e5d62a4fd0912abe2c725f31e8901444 (diff) | |
download | gsoc2013-evolution-68c35c4bedc4cd36cf2396121921f2e781b631fb.tar gsoc2013-evolution-68c35c4bedc4cd36cf2396121921f2e781b631fb.tar.gz gsoc2013-evolution-68c35c4bedc4cd36cf2396121921f2e781b631fb.tar.bz2 gsoc2013-evolution-68c35c4bedc4cd36cf2396121921f2e781b631fb.tar.lz gsoc2013-evolution-68c35c4bedc4cd36cf2396121921f2e781b631fb.tar.xz gsoc2013-evolution-68c35c4bedc4cd36cf2396121921f2e781b631fb.tar.zst gsoc2013-evolution-68c35c4bedc4cd36cf2396121921f2e781b631fb.zip |
Adapt calendar/gui to the new ESource API.
Diffstat (limited to 'calendar/gui/e-cal-source-config.c')
-rw-r--r-- | calendar/gui/e-cal-source-config.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/calendar/gui/e-cal-source-config.c b/calendar/gui/e-cal-source-config.c index 4710fa576e..4b462a7960 100644 --- a/calendar/gui/e-cal-source-config.c +++ b/calendar/gui/e-cal-source-config.c @@ -47,7 +47,7 @@ G_DEFINE_TYPE ( E_TYPE_SOURCE_CONFIG) static ESource * -cal_source_config_get_default (ESourceConfig *config) +cal_source_config_ref_default (ESourceConfig *config) { ECalSourceConfigPrivate *priv; ESourceRegistry *registry; @@ -56,11 +56,11 @@ cal_source_config_get_default (ESourceConfig *config) registry = e_source_config_get_registry (config); if (priv->source_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS) - return e_source_registry_get_default_calendar (registry); + return e_source_registry_ref_default_calendar (registry); else if (priv->source_type == E_CAL_CLIENT_SOURCE_TYPE_MEMOS) - return e_source_registry_get_default_memo_list (registry); + return e_source_registry_ref_default_memo_list (registry); else if (priv->source_type == E_CAL_CLIENT_SOURCE_TYPE_TASKS) - return e_source_registry_get_default_task_list (registry); + return e_source_registry_ref_default_task_list (registry); g_return_val_if_reached (NULL); } @@ -188,7 +188,7 @@ cal_source_config_constructed (GObject *object) priv->default_button = g_object_ref_sink (widget); gtk_widget_show (widget); - default_source = cal_source_config_get_default (config); + default_source = cal_source_config_ref_default (config); original_source = e_source_config_get_original_source (config); if (original_source != NULL) { @@ -198,6 +198,8 @@ cal_source_config_constructed (GObject *object) g_object_set (priv->default_button, "active", active, NULL); } + g_object_unref (default_source); + e_source_config_insert_widget ( config, NULL, _("Color:"), priv->color_button); @@ -274,7 +276,7 @@ cal_source_config_commit_changes (ESourceConfig *config, class = E_SOURCE_CONFIG_CLASS (e_cal_source_config_parent_class); class->commit_changes (config, scratch_source); - default_source = cal_source_config_get_default (config); + default_source = cal_source_config_ref_default (config); /* The default setting is a little tricky to get right. If * the toggle button is active, this ESource is now the default. @@ -286,6 +288,8 @@ cal_source_config_commit_changes (ESourceConfig *config, cal_source_config_set_default (config, scratch_source); else if (e_source_equal (scratch_source, default_source)) cal_source_config_set_default (config, NULL); + + g_object_unref (default_source); } static void |