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/settings/e-settings-calendar-view.c | |
parent | 23b89997658a8eb8bd2e1d9d20234a6978880aae (diff) | |
download | gsoc2013-evolution-95a0ae4afb72b534c991fbcd774733a93f256514.tar.gz 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/settings/e-settings-calendar-view.c')
-rw-r--r-- | modules/settings/e-settings-calendar-view.c | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/modules/settings/e-settings-calendar-view.c b/modules/settings/e-settings-calendar-view.c index 12614e6fd9..e35b5dd514 100644 --- a/modules/settings/e-settings-calendar-view.c +++ b/modules/settings/e-settings-calendar-view.c @@ -22,7 +22,6 @@ #include "e-settings-calendar-view.h" -#include <shell/e-shell.h> #include <calendar/gui/e-day-view.h> #include <calendar/gui/e-week-view.h> @@ -44,61 +43,60 @@ settings_calendar_view_constructed (GObject *object) { EExtension *extension; EExtensible *extensible; - EShellSettings *shell_settings; - EShell *shell; + GSettings *settings; extension = E_EXTENSION (object); extensible = e_extension_get_extensible (extension); - shell = e_shell_get_default (); - shell_settings = e_shell_get_shell_settings (shell); + settings = g_settings_new ("org.gnome.evolution.calendar"); - g_object_bind_property ( - shell_settings, "cal-time-divisions", + g_settings_bind ( + settings, "time-divisions", extensible, "time-divisions", - G_BINDING_BIDIRECTIONAL | - G_BINDING_SYNC_CREATE); + G_SETTINGS_BIND_DEFAULT); /*** EDayView ***/ if (E_IS_DAY_VIEW (extensible)) { - g_object_bind_property ( - shell_settings, "cal-show-week-numbers", + g_settings_bind ( + settings, "show-week-numbers", E_DAY_VIEW (extensible)->week_number_label, "visible", - G_BINDING_SYNC_CREATE); + G_SETTINGS_BIND_GET); - g_object_bind_property ( - shell_settings, "cal-marcus-bains-show-line", + g_settings_bind ( + settings, "marcus-bains-line", extensible, "marcus-bains-show-line", - G_BINDING_SYNC_CREATE); + G_SETTINGS_BIND_GET); - g_object_bind_property ( - shell_settings, "cal-marcus-bains-day-view-color", + g_settings_bind ( + settings, "marcus-bains-color-dayview", extensible, "marcus-bains-day-view-color", - G_BINDING_SYNC_CREATE); + G_SETTINGS_BIND_GET); - g_object_bind_property ( - shell_settings, "cal-marcus-bains-time-bar-color", + g_settings_bind ( + settings, "marcus-bains-color-timebar", extensible, "marcus-bains-time-bar-color", - G_BINDING_SYNC_CREATE); + G_SETTINGS_BIND_GET); } /*** EWeekView ***/ if (E_IS_WEEK_VIEW (extensible)) { - g_object_bind_property ( - shell_settings, "cal-compress-weekend", + g_settings_bind ( + settings, "compress-weekend", extensible, "compress-weekend", - G_BINDING_SYNC_CREATE); + G_SETTINGS_BIND_GET); - g_object_bind_property ( - shell_settings, "cal-show-event-end-times", + g_settings_bind ( + settings, "show-event-end", extensible, "show-event-end-times", - G_BINDING_SYNC_CREATE); + G_SETTINGS_BIND_GET); } + g_object_unref (settings); + /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (e_settings_calendar_view_parent_class)-> constructed (object); |