diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-03 23:20:09 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
commit | 95a0ae4afb72b534c991fbcd774733a93f256514 (patch) | |
tree | 32293990fecd6a4a6401370e2a5aa355c6454022 /modules/calendar/e-cal-shell-view-private.c | |
parent | 23b89997658a8eb8bd2e1d9d20234a6978880aae (diff) | |
download | gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.tar gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.tar.gz gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.tar.bz2 gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.tar.lz gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.tar.xz gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.tar.zst gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.zip |
Remove ECalShellSettings.
EShellSettings predates GSettings and is no longer necessary.
GSettings allows binding GObject properties to GSettings keys,
with optional mapping functions. That fulfills the purpose of
EShellSettings.
Diffstat (limited to 'modules/calendar/e-cal-shell-view-private.c')
-rw-r--r-- | modules/calendar/e-cal-shell-view-private.c | 55 |
1 files changed, 16 insertions, 39 deletions
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 4561ad35dd..144245514d 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -503,15 +503,7 @@ system_timezone_monitor_changed (GFileMonitor *handle, GFileMonitorEvent event, gpointer user_data) { - ECalShellView *view = E_CAL_SHELL_VIEW (user_data); - ECalShellViewPrivate *priv = view->priv; - ECalShellContent *cal_shell_content; - icaltimezone *timezone = NULL, *current_zone = NULL; - EShellSettings *settings; - EShellBackend *shell_backend; - EShell *shell; - ECalModel *model; - const gchar *location; + GSettings *settings; if (event != G_FILE_MONITOR_EVENT_CHANGED && event != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT && @@ -519,25 +511,9 @@ system_timezone_monitor_changed (GFileMonitor *handle, event != G_FILE_MONITOR_EVENT_CREATED) return; - cal_shell_content = priv->cal_shell_content; - model = e_cal_shell_content_get_model (cal_shell_content); - current_zone = e_cal_model_get_timezone (model); - timezone = e_cal_util_get_system_timezone (); - - if (!g_strcmp0 ( - icaltimezone_get_tzid (timezone), - icaltimezone_get_tzid (current_zone))) - return; - - shell_backend = e_shell_view_get_shell_backend ((EShellView *) view); - shell = e_shell_backend_get_shell (shell_backend); - settings = e_shell_get_shell_settings (shell); - location = icaltimezone_get_location (timezone); - if (location == NULL) - location = "UTC"; - - g_object_set (settings, "cal-timezone-string", location, NULL); - g_object_set (settings, "cal-timezone", timezone, NULL); + settings = g_settings_new ("org.gnome.evolution.calendar"); + g_signal_emit_by_name (settings, "changed::timezone", "timezone"); + g_object_unref (settings); } static void @@ -555,10 +531,10 @@ init_timezone_monitors (ECalShellView *view) g_object_unref (file); if (priv->monitors[i]) - g_signal_connect_object ( + g_signal_connect ( priv->monitors[i], "changed", G_CALLBACK (system_timezone_monitor_changed), - view, 0); + NULL); } } @@ -1211,18 +1187,19 @@ e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view) static gint cal_searching_get_search_range_years (ECalShellView *cal_shell_view) { - EShellBackend *backend; - EShellSettings *shell_settings; - gint value; + GSettings *settings; + gint search_range_years; + + settings = g_settings_new ("org.gnome.evolution.calendar"); - backend = e_shell_view_get_shell_backend (E_SHELL_VIEW (cal_shell_view)); - shell_settings = e_shell_get_shell_settings (e_shell_backend_get_shell (backend)); + search_range_years = + g_settings_get_int (settings, "search-range-years"); + if (search_range_years <= 0) + search_range_years = 10; - value = e_shell_settings_get_int (shell_settings, "cal-search-range-years"); - if (value <= 0) - value = 10; + g_object_unref (settings); - return value; + return search_range_years; } static gint |