[evolution/wip/gsettings: 23/25] Port calendar importer to GSettings

[Rodrigo Moya <rodrigo src gnome org>]

commit 2f62d91630f58325820712e9c21439b7fae055ce
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Mon Oct 10 17:13:18 2011 +0200

    Port calendar importer to GSettings

 calendar/importers/icalendar-importer.c          |   10 +++++-----
 data/Makefile.am                                 |    1 +
 data/evolution.convert                           |    4 ++++
 data/org.gnome.evolution.importer.gschema.xml.in |   14 ++++++++++++++
 4 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 96fce86..3887780 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));
diff --git a/data/Makefile.am b/data/Makefile.am
index 17b32ac..fb4c041 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,6 +14,7 @@ gsettings_SCHEMAS =							\
 	org.gnome.evolution.gschema.xml					\
 	org.gnome.evolution.addressbook.gschema.xml			\
 	org.gnome.evolution.calendar.gschema.xml			\
+	org.gnome.evolution.importer.gschema.xml			\
 	org.gnome.evolution.mail.gschema.xml				\
 	org.gnome.evolution.shell.gschema.xml.in			\
 	org.gnome.evolution.eplugin.attachment-reminder.gschema.xml	\
diff --git a/data/evolution.convert b/data/evolution.convert
index 21b71cb..8bcec69 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -66,6 +66,10 @@ use-24hour-format = /apps/evolution/calendar/display/use_24hour_format
 use-system-timezone = /apps/evolution/calendar/display/use_system_timezone
 working-days = /apps/evolution/calendar/display/working_days
 
+[org.gnome.evolution.importer]
+gnome-calendar-done-calendar = /apps/evolution/importer/gnome-calendar/calendar
+gnome-calendar-done-tasks = /apps/evolution/importer/gnome-calendar/tasks
+
 [org.gnome.evolution.mail]
 check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
 composer-charset = /apps/evolution/mail/composer/charset
diff --git a/data/org.gnome.evolution.importer.gschema.xml.in b/data/org.gnome.evolution.importer.gschema.xml.in
new file mode 100644
index 0000000..83b3de7
--- /dev/null
+++ b/data/org.gnome.evolution.importer.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.importer" path="/org/gnome/evolution/importer/">
+    <key name="gnome-calendar-done-calendar" type="b">
+      <default>false</default>
+      <_summary>Gnome Calendar's calendar import done</_summary>
+      <_description>Whether calendar from Gnome Calendar has been imported or not</_description>
+    </key>
+    <key name="gnome-calendar-done-tasks" type="b">
+      <default>false</default>
+      <_summary>Gnome Calendar's tasks import done</_summary>
+      <_description>Whether tasks from Gnome Calendar have been imported or not</_description>
+    </key>
+  </schema>
+</schemalist>