diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-26 07:37:21 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-26 07:37:21 +0800 |
commit | d261d0b2e46d4793c2d54540782552846535eb60 (patch) | |
tree | 5e37dd30639f8ae27c298ccdbbe4cb18d79b0830 /calendar/modules/e-cal-shell-module-migrate.c | |
parent | dc7efb1311d23c32a76a9a8092f734223ce3207e (diff) | |
download | gsoc2013-evolution-d261d0b2e46d4793c2d54540782552846535eb60.tar gsoc2013-evolution-d261d0b2e46d4793c2d54540782552846535eb60.tar.gz gsoc2013-evolution-d261d0b2e46d4793c2d54540782552846535eb60.tar.bz2 gsoc2013-evolution-d261d0b2e46d4793c2d54540782552846535eb60.tar.lz gsoc2013-evolution-d261d0b2e46d4793c2d54540782552846535eb60.tar.xz gsoc2013-evolution-d261d0b2e46d4793c2d54540782552846535eb60.tar.zst gsoc2013-evolution-d261d0b2e46d4793c2d54540782552846535eb60.zip |
Begin migrating calendar settings to EShellSettings.
Begin dismantling calendar-config.c and migrating calendar settings to
EShellSettings. EShellSettings utilizes GObject properties instead of
separate get/set/notify functions for each setting.
Diffstat (limited to 'calendar/modules/e-cal-shell-module-migrate.c')
-rw-r--r-- | calendar/modules/e-cal-shell-module-migrate.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/calendar/modules/e-cal-shell-module-migrate.c b/calendar/modules/e-cal-shell-module-migrate.c index 0c5d02ce26..5ebb6af54f 100644 --- a/calendar/modules/e-cal-shell-module-migrate.c +++ b/calendar/modules/e-cal-shell-module-migrate.c @@ -42,6 +42,7 @@ #include "calendar/gui/calendar-config.h" #include "calendar/gui/calendar-config-keys.h" #include "calendar/gui/e-cal-event.h" +#include "shell/e-shell.h" #define WEBCAL_BASE_URI "webcal://" #define CONTACTS_BASE_URI "contacts://" @@ -498,6 +499,8 @@ create_calendar_sources (EShellModule *shell_module, ESourceGroup **on_the_web, ESourceGroup **contacts) { + EShell *shell; + EShellSettings *shell_settings; GSList *groups; ESourceGroup *group; char *base_uri, *base_uri_proto; @@ -508,6 +511,9 @@ create_calendar_sources (EShellModule *shell_module, *contacts = NULL; *personal_source = NULL; + shell = e_shell_module_get_shell (shell_module); + shell_settings = e_shell_get_shell_settings (shell); + base_dir = e_shell_module_get_config_dir (shell_module); base_uri = g_build_filename (base_dir, "local", NULL); @@ -563,16 +569,21 @@ create_calendar_sources (EShellModule *shell_module, } if (!*personal_source) { - char *primary_calendar = calendar_config_get_primary_calendar (); + char *primary_calendar; /* Create the default Person calendar */ ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); e_source_group_add_source (*on_this_computer, source, -1); + primary_calendar = e_shell_settings_get_string ( + shell_settings, "cal-primary-calendar"); + if (!primary_calendar && !calendar_config_get_calendars_selected ()) { GSList selected; - calendar_config_set_primary_calendar (e_source_peek_uid (source)); + e_shell_settings_set_string ( + shell_settings, "cal-primary-calendar", + e_source_peek_uid (source)); selected.data = (gpointer)e_source_peek_uid (source); selected.next = NULL; |