diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-23 09:48:44 +0800 |
commit | 9918361aef9ad1360a0ed3a240cc58d6cd9e30f8 (patch) | |
tree | 50bf24934b5ab3fefcc27913d1855a27c75e6d40 /calendar/importers/icalendar-importer.c | |
parent | fa1bb9a17e11cf12ce02d9b49bba2753f6020ea0 (diff) | |
parent | e64d6fe05c30c2cc1d7625a202afba3ba2da07cd (diff) | |
download | gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.gz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.bz2 gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.lz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.xz gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.tar.zst gsoc2013-evolution-9918361aef9ad1360a0ed3a240cc58d6cd9e30f8.zip |
Merge branch 'wip/gsettings'
Diffstat (limited to 'calendar/importers/icalendar-importer.c')
-rw-r--r-- | calendar/importers/icalendar-importer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 449cab0d24..3887780ed7 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -1023,13 +1023,13 @@ gnome_calendar_getwidget (EImport *ei, EImportImporter *im) { GtkWidget *hbox, *w; - GConfClient *gconf; + GSettings *settings; gboolean done_cal, done_tasks; - gconf = gconf_client_get_default (); - done_cal = gconf_client_get_bool (gconf, "/apps/evolution/importer/gnome-calendar/calendar", NULL); - done_tasks = gconf_client_get_bool (gconf, "/apps/evolution/importer/gnome-calendar/tasks", NULL); - g_object_unref (gconf); + settings = g_settings_new ("org.gnome.evolution.importer"); + done_cal = g_settings_get_boolean (settings, "gnome-calendar-done-calendar"); + done_tasks = g_settings_get_boolean (settings, "gnome-calendar-done-tasks"); + g_object_unref (settings); g_datalist_set_data(&target->data, "gnomecal-do-cal", GINT_TO_POINTER(!done_cal)); g_datalist_set_data(&target->data, "gnomecal-do-tasks", GINT_TO_POINTER(!done_tasks)); @@ -1380,11 +1380,11 @@ get_users_timezone (void) if (e_shell_settings_get_boolean (shell_settings, "cal-use-system-timezone")) { location = e_cal_util_get_system_timezone_location (); } else { - GConfClient *client = gconf_client_get_default (); + GSettings *settings = g_settings_new ("org.gnome.evolution.calendar"); - location = gconf_client_get_string (client, CALENDAR_CONFIG_TIMEZONE, NULL); + location = g_settings_get_string (settings, "timezone"); - g_object_unref (client); + g_object_unref (settings); } if (location) { |