From 26afa6081c3d9826dbae78236dd712fad8b7c340 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Nov 2010 14:44:23 -0400 Subject: Utilize the new ESourceSelector:primary-selection property. --- calendar/importers/icalendar-importer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 45de793778..8e20e19bcf 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -206,7 +206,7 @@ static void button_toggled_cb (GtkWidget *widget, struct _selector_data *sd) { g_datalist_set_data_full(&sd->target->data, "primary-source", - g_object_ref (e_source_selector_peek_primary_selection ((ESourceSelector *)sd->selector)), + g_object_ref (e_source_selector_get_primary_selection ((ESourceSelector *)sd->selector)), g_object_unref); g_datalist_set_data(&sd->target->data, "primary-type", GINT_TO_POINTER(import_type_map[sd->page])); gtk_notebook_set_current_page ((GtkNotebook *)sd->notebook, sd->page); @@ -216,7 +216,7 @@ static void primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target) { g_datalist_set_data_full(&target->data, "primary-source", - g_object_ref (e_source_selector_peek_primary_selection (selector)), + g_object_ref (e_source_selector_get_primary_selection (selector)), g_object_unref); } -- cgit v1.2.3 From dbc22f9de50142b8339fa843575a5e15bd3fe8ff Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 30 Jan 2011 11:32:55 -0500 Subject: More whitespace cleanup. --- calendar/importers/icalendar-importer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 8e20e19bcf..ea7f7d5015 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -129,7 +129,7 @@ prepare_events (icalcomponent *icalcomp, GList **vtodos) if (child_kind == ICAL_VTODO_COMPONENT && vtodos) *vtodos = g_list_prepend (*vtodos, subcomp); else - icalcomponent_free (subcomp); + icalcomponent_free (subcomp); } else { icalcompiter_next (&iter); } -- cgit v1.2.3 From 54da4fc09cf226fdb59b9f0c70555e2e57dc1f91 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 8 May 2011 13:24:42 -0400 Subject: Coding style cleanups. --- calendar/importers/icalendar-importer.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index ea7f7d5015..38c1fc8251 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -206,10 +206,10 @@ static void button_toggled_cb (GtkWidget *widget, struct _selector_data *sd) { g_datalist_set_data_full(&sd->target->data, "primary-source", - g_object_ref (e_source_selector_get_primary_selection ((ESourceSelector *)sd->selector)), + g_object_ref (e_source_selector_get_primary_selection ((ESourceSelector *) sd->selector)), g_object_unref); g_datalist_set_data(&sd->target->data, "primary-type", GINT_TO_POINTER(import_type_map[sd->page])); - gtk_notebook_set_current_page ((GtkNotebook *)sd->notebook, sd->page); + gtk_notebook_set_current_page ((GtkNotebook *) sd->notebook, sd->page); } static void @@ -252,8 +252,8 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) selector = e_source_selector_new (source_list); e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE); scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_container_add ((GtkContainer *)scrolled, selector); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + gtk_container_add ((GtkContainer *) scrolled, selector); gtk_notebook_append_page (GTK_NOTEBOOK (nb), scrolled, NULL); /* FIXME What if no sources? */ @@ -283,7 +283,7 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) g_object_unref (source_list); } if (first) - gtk_toggle_button_set_active ((GtkToggleButton *)first, TRUE); + gtk_toggle_button_set_active ((GtkToggleButton *) first, TRUE); gtk_widget_show_all (vbox); @@ -382,7 +382,7 @@ ical_supported (EImport *ei, EImportTarget *target, EImportImporter *im) if (target->type != E_IMPORT_TARGET_URI) return FALSE; - s = (EImportTargetURI *)target; + s = (EImportTargetURI *) target; if (s->uri_src == NULL) return TRUE; @@ -419,7 +419,7 @@ ical_import (EImport *ei, EImportTarget *target, EImportImporter *im) gchar *filename; gchar *contents; icalcomponent *icalcomp; - EImportTargetURI *s = (EImportTargetURI *)target; + EImportTargetURI *s = (EImportTargetURI *) target; filename = g_filename_from_uri (s->uri_src, NULL, NULL); if (!filename) { @@ -447,7 +447,7 @@ static GtkWidget * ivcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im) { GtkWidget *preview; - EImportTargetURI *s = (EImportTargetURI *)target; + EImportTargetURI *s = (EImportTargetURI *) target; gchar *filename; icalcomponent *icalcomp; gchar *contents; @@ -512,7 +512,7 @@ vcal_supported (EImport *ei, EImportTarget *target, EImportImporter *im) if (target->type != E_IMPORT_TARGET_URI) return FALSE; - s = (EImportTargetURI *)target; + s = (EImportTargetURI *) target; if (s->uri_src == NULL) return TRUE; @@ -603,7 +603,7 @@ vcal_import (EImport *ei, EImportTarget *target, EImportImporter *im) { gchar *filename; icalcomponent *icalcomp; - EImportTargetURI *s = (EImportTargetURI *)target; + EImportTargetURI *s = (EImportTargetURI *) target; filename = g_filename_from_uri (s->uri_src, NULL, NULL); if (!filename) { @@ -623,7 +623,7 @@ static GtkWidget * vcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im) { GtkWidget *preview; - EImportTargetURI *s = (EImportTargetURI *)target; + EImportTargetURI *s = (EImportTargetURI *) target; gchar *filename; icalcomponent *icalcomp; @@ -821,12 +821,12 @@ gnome_calendar_getwidget (EImport *ei, EImportTarget *target, EImportImporter *i hbox = gtk_hbox_new (FALSE, 2); w = gtk_check_button_new_with_label (_("Calendar Events")); - gtk_toggle_button_set_active ((GtkToggleButton *)w, !done_cal); + gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_cal); g_signal_connect (w, "toggled", G_CALLBACK (calendar_toggle_cb), target); gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); w = gtk_check_button_new_with_label (_("Tasks")); - gtk_toggle_button_set_active ((GtkToggleButton *)w, !done_tasks); + gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_tasks); g_signal_connect (w, "toggled", G_CALLBACK (tasks_toggle_cb), target); gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0); -- cgit v1.2.3 From 84339b3be5a771406fcd5898bbd21dc1c5b98c82 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 08:54:20 +0200 Subject: Do not use deprecated EBook/ECal API --- calendar/importers/icalendar-importer.c | 385 ++++++++++++++++++++++---------- 1 file changed, 264 insertions(+), 121 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 38c1fc8251..c523e57e39 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -35,13 +35,13 @@ #include -#include +#include #include +#include #include #include #include "evolution-calendar-importer.h" #include "shell/e-shell.h" -#include "common/authentication.h" #include "gui/calendar-config-keys.h" #include "e-util/e-import.h" @@ -58,21 +58,25 @@ typedef struct { guint idle_id; - ECal *client; - ECalSourceType source_type; + ECalClient *cal_client; + EClientSourceType source_type; icalcomponent *icalcomp; - guint cancelled:1; + GCancellable *cancellable; } ICalImporter; typedef struct { - guint cancelled:1; + EImport *ei; + EImportTarget *target; + GList *tasks; + icalcomponent *icalcomp; + GCancellable *cancellable; } ICalIntelligentImporter; static const gint import_type_map[] = { - E_CAL_SOURCE_TYPE_EVENT, - E_CAL_SOURCE_TYPE_TODO, + E_CLIENT_SOURCE_TYPE_EVENTS, + E_CLIENT_SOURCE_TYPE_TASKS, -1 }; @@ -99,11 +103,13 @@ is_icalcomp_usable (icalcomponent *icalcomp) static void ivcal_import_done (ICalImporter *ici) { - g_object_unref (ici->client); + if (ici->cal_client) + g_object_unref (ici->cal_client); icalcomponent_free (ici->icalcomp); e_import_complete (ici->import, ici->target); g_object_unref (ici->import); + g_object_unref (ici->cancellable); g_free (ici); } @@ -165,12 +171,39 @@ prepare_tasks (icalcomponent *icalcomp, GList *vtodos) g_list_free (vtodos); } -static gboolean -update_objects (ECal *client, icalcomponent *icalcomp) +struct UpdateObjectsData +{ + void (*done_cb) (gpointer user_data); + gpointer user_data; +}; + +static void +receive_objects_ready_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) +{ + ECalClient *cal_client = E_CAL_CLIENT (source_object); + struct UpdateObjectsData *uod = user_data; + GError *error = NULL; + + g_return_if_fail (uod != NULL); + + e_cal_client_receive_objects_finish (cal_client, result, &error); + + if (error) { + g_debug ("%s: Failed to receive objects: %s", G_STRFUNC, error->message); + g_error_free (error); + } + + if (uod->done_cb) + uod->done_cb (uod->user_data); + g_free (uod); +} + +static void +update_objects (ECalClient *cal_client, icalcomponent *icalcomp, GCancellable *cancellable, void (*done_cb)(gpointer user_data), gpointer user_data) { icalcomponent_kind kind; icalcomponent *vcal; - gboolean success = TRUE; + struct UpdateObjectsData *uod; kind = icalcomponent_isa (icalcomp); if (kind == ICAL_VTODO_COMPONENT || kind == ICAL_VEVENT_COMPONENT) { @@ -184,15 +217,21 @@ update_objects (ECal *client, icalcomponent *icalcomp) vcal = icalcomponent_new_clone (icalcomp); if (!icalcomponent_get_first_property (vcal, ICAL_METHOD_PROPERTY)) icalcomponent_set_method (vcal, ICAL_METHOD_PUBLISH); - } else - return FALSE; + } else { + if (done_cb) + done_cb (user_data); + return; + } - if (!e_cal_receive_objects (client, vcal, NULL)) - success = FALSE; + uod = g_new0 (struct UpdateObjectsData, 1); + uod->done_cb = done_cb; + uod->user_data = user_data; + + e_cal_client_receive_objects (cal_client, vcal, cancellable, receive_objects_ready_cb, uod); icalcomponent_free (vcal); - return success; + return; } struct _selector_data { @@ -246,7 +285,7 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) struct _selector_data *sd; /* FIXME Better error handling */ - if (!e_cal_get_sources (&source_list, import_type_map[i], NULL)) + if (!e_cal_client_get_sources (&source_list, import_type_map[i], NULL)) continue; selector = e_source_selector_new (source_list); @@ -290,71 +329,86 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) return vbox; } +static void +ivcal_call_import_done (gpointer user_data) +{ + ivcal_import_done (user_data); +} + static gboolean ivcal_import_items (gpointer d) { ICalImporter *ici = d; switch (ici->source_type) { - case E_CAL_SOURCE_TYPE_EVENT: + case E_CLIENT_SOURCE_TYPE_EVENTS: prepare_events (ici->icalcomp, NULL); - if (!update_objects (ici->client, ici->icalcomp)) { - /* FIXME: e_alert ... */; - } + update_objects (ici->cal_client, ici->icalcomp, ici->cancellable, ivcal_call_import_done, ici); break; - case E_CAL_SOURCE_TYPE_TODO: + case E_CLIENT_SOURCE_TYPE_TASKS: prepare_tasks (ici->icalcomp, NULL); - if (!update_objects (ici->client, ici->icalcomp)) { - /* FIXME: e_alert ... */; - } + update_objects (ici->cal_client, ici->icalcomp, ici->cancellable, ivcal_call_import_done, ici); break; default: - g_return_val_if_reached (FALSE); + g_warn_if_reached (); + + ici->idle_id = 0; + ivcal_import_done (ici); + return FALSE; } - ivcal_import_done (ici); ici->idle_id = 0; return FALSE; } static void -ivcal_opened (ECal *ecal, const GError *error, ICalImporter *ici) +ivcal_opened (GObject *source_object, GAsyncResult *result, gpointer user_data) { - if (!ici->cancelled && !error) { + EClient *client = NULL; + ICalImporter *ici = user_data; + GError *error = NULL; + + g_return_if_fail (ici != NULL); + + if (!e_client_utils_open_new_finish (E_SOURCE (source_object), result, &client, &error)) + client = NULL; + + ici->cal_client = client ? E_CAL_CLIENT (client) : NULL; + + if (!g_cancellable_is_cancelled (ici->cancellable) && !error) { e_import_status(ici->import, ici->target, _("Importing..."), 0); ici->idle_id = g_idle_add (ivcal_import_items, ici); } else ivcal_import_done (ici); + + if (error) { + g_debug ("%s: Failed to open calendar: %s", G_STRFUNC, error->message); + g_error_free (error); + } } static void ivcal_import (EImport *ei, EImportTarget *target, icalcomponent *icalcomp) { - ECal *client; - ECalSourceType type; + EClientSourceType type; + ICalImporter *ici = g_malloc0 (sizeof (*ici)); type = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "primary-type")); - client = e_auth_new_cal_from_source (g_datalist_get_data(&target->data, "primary-source"), type); - if (client) { - ICalImporter *ici = g_malloc0 (sizeof (*ici)); - - ici->import = ei; - g_datalist_set_data(&target->data, "ivcal-data", ici); - g_object_ref (ei); - ici->target = target; - ici->icalcomp = icalcomp; - ici->client = client; - ici->source_type = type; - e_import_status(ei, target, _("Opening calendar"), 0); - g_signal_connect(client, "cal-opened-ex", G_CALLBACK(ivcal_opened), ici); - e_cal_open_async (client, TRUE); - return; - } else { - icalcomponent_free (icalcomp); - e_import_complete (ei, target); - } + ici->import = ei; + g_datalist_set_data(&target->data, "ivcal-data", ici); + g_object_ref (ei); + ici->target = target; + ici->icalcomp = icalcomp; + ici->cal_client = NULL; + ici->source_type = type; + ici->cancellable = g_cancellable_new (); + e_import_status (ei, target, _("Opening calendar"), 0); + + e_client_utils_open_new (g_datalist_get_data(&target->data, "primary-source"), type, FALSE, ici->cancellable, + e_client_utils_authenticate_handler, NULL, + ivcal_opened, ici); } static void @@ -363,7 +417,7 @@ ivcal_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) ICalImporter *ici = g_datalist_get_data(&target->data, "ivcal-data"); if (ici) - ici->cancelled = 1; + g_cancellable_cancel (ici->cancellable); } /* ********************************************************************** */ @@ -683,14 +737,153 @@ gnome_calendar_supported (EImport *ei, EImportTarget *target, EImportImporter *i return res; } +static void +free_ici (gpointer ptr) +{ + ICalIntelligentImporter *ici = ptr; + + if (!ici) + return; + + if (ici->icalcomp) + icalcomponent_free (ici->icalcomp); + + g_object_unref (ici->cancellable); + g_free (ici); +} + +struct OpenDefaultSourceData +{ + ICalIntelligentImporter *ici; + void (* opened_cb) (ECalClient *cal_client, const GError *error, ICalIntelligentImporter *ici); +}; + +static void +default_source_opened_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) +{ + EClient *client = NULL; + struct OpenDefaultSourceData *odsd = user_data; + GError *error = NULL; + + g_return_if_fail (odsd != NULL); + g_return_if_fail (odsd->ici != NULL); + g_return_if_fail (odsd->opened_cb != NULL); + + if (!e_client_utils_open_new_finish (E_SOURCE (source_object), result, &client, &error)) + client = NULL; + + odsd->opened_cb (client ? E_CAL_CLIENT (client) : NULL, error, odsd->ici); + + if (client) + g_object_unref (client); + if (error) + g_error_free (error); + + g_free (odsd); +} + +static void +open_default_source (ICalIntelligentImporter *ici, ECalClientSourceType source_type, void (* opened_cb) (ECalClient *cal_client, const GError *error, ICalIntelligentImporter *ici)) +{ + ESource *source; + ECalClient *cal_client; + GError *error = NULL; + struct OpenDefaultSourceData *odsd; + + g_return_if_fail (ici != NULL); + g_return_if_fail (opened_cb != NULL); + + cal_client = e_cal_client_new_default (source_type, NULL); + if (!cal_client) + cal_client = e_cal_client_new_system (source_type, &error); + + if (!cal_client) { + opened_cb (NULL, error, ici); + if (error) + g_error_free (error); + return; + } + + source = e_client_get_source (E_CLIENT (cal_client)); + g_return_if_fail (source != NULL); + + source = g_object_ref (source); + g_object_unref (cal_client); + + odsd = g_new0 (struct OpenDefaultSourceData, 1); + odsd->ici = ici; + odsd->opened_cb = opened_cb; + + e_import_status (ici->ei, ici->target, _("Opening calendar"), 0); + + e_client_utils_open_new (source, source_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS ? E_CLIENT_SOURCE_TYPE_EVENTS : E_CLIENT_SOURCE_TYPE_TASKS, FALSE, ici->cancellable, + e_client_utils_authenticate_handler, NULL, + default_source_opened_cb, odsd); + + g_object_unref (source); +} + +static void +continue_done_cb (gpointer user_data) +{ + ICalIntelligentImporter *ici = user_data; + + g_return_if_fail (ici != NULL); + + e_import_complete (ici->ei, ici->target); +} + +static void +gc_import_tasks (ECalClient *cal_client, const GError *error, ICalIntelligentImporter *ici) +{ + g_return_if_fail (ici != NULL); + + if (!cal_client) { + g_debug ("%s: Failed to open tasks: %s", G_STRFUNC, error ? error->message : "Unknown error"); + e_import_complete (ici->ei, ici->target); + return; + } + + e_import_status (ici->ei, ici->target, _("Importing..."), 0); + + prepare_tasks (ici->icalcomp, ici->tasks); + update_objects (cal_client, ici->icalcomp, ici->cancellable, continue_done_cb, ici); +} + +static void +continue_tasks_cb (gpointer user_data) +{ + ICalIntelligentImporter *ici = user_data; + + g_return_if_fail (ici != NULL); + + open_default_source (ici, E_CAL_CLIENT_SOURCE_TYPE_TASKS, gc_import_tasks); +} + +static void +gc_import_events (ECalClient *cal_client, const GError *error, ICalIntelligentImporter *ici) +{ + g_return_if_fail (ici != NULL); + + if (!cal_client) { + g_debug ("%s: Failed to open events calendar: %s", G_STRFUNC, error ? error->message : "Unknown error"); + if (ici->tasks) + open_default_source (ici, E_CAL_CLIENT_SOURCE_TYPE_TASKS, gc_import_tasks); + else + e_import_complete (ici->ei, ici->target); + return; + } + + e_import_status (ici->ei, ici->target, _("Importing..."), 0); + + update_objects (cal_client, ici->icalcomp, ici->cancellable, ici->tasks ? continue_tasks_cb : continue_done_cb, ici); +} + static void gnome_calendar_import (EImport *ei, EImportTarget *target, EImportImporter *im) { icalcomponent *icalcomp = NULL; gchar *filename; - GList *vtodos; - ECal *calendar_client = NULL, *tasks_client = NULL; - gint t; gint do_calendar, do_tasks; ICalIntelligentImporter *ici; @@ -704,21 +897,6 @@ gnome_calendar_import (EImport *ei, EImportTarget *target, EImportImporter *im) if (!do_calendar && !do_tasks) return; - e_import_status(ei, target, _("Opening calendar"), 0); - - /* Try to open the default calendar & tasks folders. */ - if (do_calendar) { - calendar_client = e_auth_new_cal_from_default (E_CAL_SOURCE_TYPE_EVENT); - if (!calendar_client) - goto out; - } - - if (do_tasks) { - tasks_client = e_auth_new_cal_from_default (E_CAL_SOURCE_TYPE_TODO); - if (!tasks_client) - goto out; - } - /* Load the Gnome Calendar file and convert to iCalendar. */ filename = g_build_filename(g_get_home_dir (), "user-cal.vcf", NULL); icalcomp = load_vcalendar_file (filename); @@ -729,64 +907,29 @@ gnome_calendar_import (EImport *ei, EImportTarget *target, EImportImporter *im) goto out; ici = g_malloc0 (sizeof (*ici)); - g_datalist_set_data_full(&target->data, "gnomecal-data", ici, g_free); + ici->ei = ei; + ici->target = target; + ici->cancellable = g_cancellable_new (); + ici->icalcomp = icalcomp; + icalcomp = NULL; - /* Wait for client to finish opening the calendar & tasks folders. */ - for (t = 0; t < IMPORTER_TIMEOUT_SECONDS; t++) { - ECalLoadState calendar_state, tasks_state; + g_datalist_set_data_full(&target->data, "gnomecal-data", ici, free_ici); - calendar_state = tasks_state = E_CAL_LOAD_LOADED; - - /* We need this so the ECal gets notified that the - folder is opened, via Corba. */ - while (gtk_events_pending ()) - gtk_main_iteration (); - - if (do_calendar) - calendar_state = e_cal_get_load_state (calendar_client); - - if (do_tasks) - tasks_state = e_cal_get_load_state (tasks_client); - - if (calendar_state == E_CAL_LOAD_LOADED - && tasks_state == E_CAL_LOAD_LOADED) - break; - - g_usleep (1000000); - if (ici->cancelled) - goto out; + prepare_events (ici->icalcomp, &ici->tasks); + if (do_calendar) { + open_default_source (ici, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, gc_import_events); + return; } - /* If we timed out, just return. */ - if (t == IMPORTER_TIMEOUT_SECONDS) - goto out; - - e_import_status(ei, target, _("Importing..."), 0); - - /* - * Import the calendar events into the default calendar folder. - */ - prepare_events (icalcomp, &vtodos); - if (do_calendar) - update_objects (calendar_client, icalcomp); - - if (ici->cancelled) - goto out; - - /* - * Import the tasks into the default tasks folder. - */ - prepare_tasks (icalcomp, vtodos); - if (do_tasks) - update_objects (tasks_client, icalcomp); + prepare_tasks (ici->icalcomp, ici->tasks); + if (do_tasks) { + open_default_source (ici, E_CAL_CLIENT_SOURCE_TYPE_TASKS, gc_import_tasks); + return; + } out: if (icalcomp) icalcomponent_free (icalcomp); - if (calendar_client) - g_object_unref (calendar_client); - if (tasks_client) - g_object_unref (tasks_client); e_import_complete (ei, target); } @@ -841,7 +984,7 @@ gnome_calendar_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) ICalIntelligentImporter *ici = g_datalist_get_data(&target->data, "gnomecal-data"); if (ici) - ici->cancelled = 1; + g_cancellable_cancel (ici->cancellable); } static EImportImporter gnome_calendar_importer = { -- cgit v1.2.3 From 4444572c399ef1b89d52eaa04c81cf1d45ddbf00 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 Jul 2011 14:45:34 +0200 Subject: Bug #654261 - Importing ics files into Evolution fails silently --- calendar/importers/icalendar-importer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index c523e57e39..01b5d8349c 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -283,10 +283,14 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) ESource *primary; GtkWidget *scrolled; struct _selector_data *sd; + GError *error = NULL; /* FIXME Better error handling */ - if (!e_cal_client_get_sources (&source_list, import_type_map[i], NULL)) + if (!e_client_utils_get_sources (&source_list, import_type_map[i], &error)) { + g_debug ("%s: Failed to get source of '%s' (%d): %s", G_STRFUNC, import_type_strings[i], i, error ? error->message : "Unknown error"); + g_clear_error (&error); continue; + } selector = e_source_selector_new (source_list); e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE); -- cgit v1.2.3 From 86f37c46dd2f61e86a82938c956490c37ed6f2ce Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Tue, 2 Aug 2011 11:29:12 +0200 Subject: Replace alarm by reminder for UI consistency. Fixes bug #340614 --- calendar/importers/icalendar-importer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 01b5d8349c..6f3b2d9a98 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -1095,7 +1095,7 @@ preview_comp (EWebViewPreview *preview, ECalComponent *comp) } if (e_cal_component_has_alarms (comp)) { - e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "has alarms")); + e_web_view_preview_add_section (preview, have ? NULL : str, C_("iCalImp", "has reminders")); have = TRUE; } -- cgit v1.2.3 From ae9db3ed236b0c734fd12c8dc8c99764626bf0b8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 1 Jul 2011 00:07:26 -0400 Subject: Coding style and whitespace cleanup. --- calendar/importers/icalendar-importer.c | 86 ++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 29 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 6f3b2d9a98..585d423921 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -178,7 +178,9 @@ struct UpdateObjectsData }; static void -receive_objects_ready_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) +receive_objects_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { ECalClient *cal_client = E_CAL_CLIENT (source_object); struct UpdateObjectsData *uod = user_data; @@ -188,8 +190,10 @@ receive_objects_ready_cb (GObject *source_object, GAsyncResult *result, gpointer e_cal_client_receive_objects_finish (cal_client, result, &error); - if (error) { - g_debug ("%s: Failed to receive objects: %s", G_STRFUNC, error->message); + if (error != NULL) { + g_warning ( + "%s: Failed to receive objects: %s", + G_STRFUNC, error->message); g_error_free (error); } @@ -367,29 +371,35 @@ ivcal_import_items (gpointer d) } static void -ivcal_opened (GObject *source_object, GAsyncResult *result, gpointer user_data) +ivcal_opened (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { + ESource *source = E_SOURCE (source_object); EClient *client = NULL; ICalImporter *ici = user_data; GError *error = NULL; g_return_if_fail (ici != NULL); - if (!e_client_utils_open_new_finish (E_SOURCE (source_object), result, &client, &error)) - client = NULL; + e_client_utils_open_new_finish (source, result, &client, &error); - ici->cal_client = client ? E_CAL_CLIENT (client) : NULL; - - if (!g_cancellable_is_cancelled (ici->cancellable) && !error) { - e_import_status(ici->import, ici->target, _("Importing..."), 0); - ici->idle_id = g_idle_add (ivcal_import_items, ici); - } else - ivcal_import_done (ici); - - if (error) { - g_debug ("%s: Failed to open calendar: %s", G_STRFUNC, error->message); + if (error != NULL) { + g_warn_if_fail (client == NULL); + g_warning ( + "%s: Failed to open calendar: %s", + G_STRFUNC, error->message); g_error_free (error); + ivcal_import_done (ici); + return; } + + g_return_if_fail (E_IS_CLIENT (client)); + + ici->cal_client = E_CAL_CLIENT (client); + + e_import_status(ici->import, ici->target, _("Importing..."), 0); + ici->idle_id = g_idle_add (ivcal_import_items, ici); } static void @@ -763,8 +773,11 @@ struct OpenDefaultSourceData }; static void -default_source_opened_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) +default_source_opened_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { + ESource *source = E_SOURCE (source_object); EClient *client = NULL; struct OpenDefaultSourceData *odsd = user_data; GError *error = NULL; @@ -773,10 +786,10 @@ default_source_opened_cb (GObject *source_object, GAsyncResult *result, gpointer g_return_if_fail (odsd->ici != NULL); g_return_if_fail (odsd->opened_cb != NULL); - if (!e_client_utils_open_new_finish (E_SOURCE (source_object), result, &client, &error)) - client = NULL; + e_client_utils_open_new_finish (source, result, &client, &error); - odsd->opened_cb (client ? E_CAL_CLIENT (client) : NULL, error, odsd->ici); + /* Client may be NULL; don't use a type cast macro. */ + odsd->opened_cb ((ECalClient *) client, error, odsd->ici); if (client) g_object_unref (client); @@ -838,12 +851,16 @@ continue_done_cb (gpointer user_data) } static void -gc_import_tasks (ECalClient *cal_client, const GError *error, ICalIntelligentImporter *ici) +gc_import_tasks (ECalClient *cal_client, + const GError *error, + ICalIntelligentImporter *ici) { g_return_if_fail (ici != NULL); - if (!cal_client) { - g_debug ("%s: Failed to open tasks: %s", G_STRFUNC, error ? error->message : "Unknown error"); + if (error != NULL) { + g_warning ( + "%s: Failed to open tasks: %s", + G_STRFUNC, error->message); e_import_complete (ici->ei, ici->target); return; } @@ -851,7 +868,10 @@ gc_import_tasks (ECalClient *cal_client, const GError *error, ICalIntelligentImp e_import_status (ici->ei, ici->target, _("Importing..."), 0); prepare_tasks (ici->icalcomp, ici->tasks); - update_objects (cal_client, ici->icalcomp, ici->cancellable, continue_done_cb, ici); + + update_objects ( + cal_client, ici->icalcomp, + ici->cancellable, continue_done_cb, ici); } static void @@ -865,14 +885,20 @@ continue_tasks_cb (gpointer user_data) } static void -gc_import_events (ECalClient *cal_client, const GError *error, ICalIntelligentImporter *ici) +gc_import_events (ECalClient *cal_client, + const GError *error, + ICalIntelligentImporter *ici) { g_return_if_fail (ici != NULL); - if (!cal_client) { - g_debug ("%s: Failed to open events calendar: %s", G_STRFUNC, error ? error->message : "Unknown error"); + if (error != NULL) { + g_warning ( + "%s: Failed to open events calendar: %s", + G_STRFUNC, error->message); if (ici->tasks) - open_default_source (ici, E_CAL_CLIENT_SOURCE_TYPE_TASKS, gc_import_tasks); + open_default_source ( + ici, E_CAL_CLIENT_SOURCE_TYPE_TASKS, + gc_import_tasks); else e_import_complete (ici->ei, ici->target); return; @@ -880,7 +906,9 @@ gc_import_events (ECalClient *cal_client, const GError *error, ICalIntelligentIm e_import_status (ici->ei, ici->target, _("Importing..."), 0); - update_objects (cal_client, ici->icalcomp, ici->cancellable, ici->tasks ? continue_tasks_cb : continue_done_cb, ici); + update_objects ( + cal_client, ici->icalcomp, ici->cancellable, + ici->tasks ? continue_tasks_cb : continue_done_cb, ici); } static void -- cgit v1.2.3 From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- calendar/importers/icalendar-importer.c | 110 ++++++++++++++++++++++---------- 1 file changed, 78 insertions(+), 32 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 585d423921..739a23cf1d 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -115,7 +115,8 @@ ivcal_import_done (ICalImporter *ici) /* This removes all components except VEVENTs and VTIMEZONEs from the toplevel */ static void -prepare_events (icalcomponent *icalcomp, GList **vtodos) +prepare_events (icalcomponent *icalcomp, + GList **vtodos) { icalcomponent *subcomp; icalcompiter iter; @@ -143,10 +144,11 @@ prepare_events (icalcomponent *icalcomp, GList **vtodos) } /* This removes all components except VTODOs and VTIMEZONEs from the toplevel - icalcomponent, and adds the given list of VTODO components. The list is - freed afterwards. */ + * icalcomponent, and adds the given list of VTODO components. The list is + * freed afterwards. */ static void -prepare_tasks (icalcomponent *icalcomp, GList *vtodos) +prepare_tasks (icalcomponent *icalcomp, + GList *vtodos) { icalcomponent *subcomp; GList *elem; @@ -203,7 +205,11 @@ receive_objects_ready_cb (GObject *source_object, } static void -update_objects (ECalClient *cal_client, icalcomponent *icalcomp, GCancellable *cancellable, void (*done_cb)(gpointer user_data), gpointer user_data) +update_objects (ECalClient *cal_client, + icalcomponent *icalcomp, + GCancellable *cancellable, + void (*done_cb) (gpointer user_data), + gpointer user_data) { icalcomponent_kind kind; icalcomponent *vcal; @@ -246,7 +252,8 @@ struct _selector_data { }; static void -button_toggled_cb (GtkWidget *widget, struct _selector_data *sd) +button_toggled_cb (GtkWidget *widget, + struct _selector_data *sd) { g_datalist_set_data_full(&sd->target->data, "primary-source", g_object_ref (e_source_selector_get_primary_selection ((ESourceSelector *) sd->selector)), @@ -256,7 +263,8 @@ button_toggled_cb (GtkWidget *widget, struct _selector_data *sd) } static void -primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target) +primary_selection_changed_cb (ESourceSelector *selector, + EImportTarget *target) { g_datalist_set_data_full(&target->data, "primary-source", g_object_ref (e_source_selector_get_primary_selection (selector)), @@ -264,7 +272,9 @@ primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target) } static GtkWidget * -ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) +ivcal_getwidget (EImport *ei, + EImportTarget *target, + EImportImporter *im) { GtkWidget *vbox, *hbox, *first = NULL; GSList *group = NULL; @@ -318,7 +328,9 @@ ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) sd->notebook = nb; sd->page = i; g_object_set_data_full((GObject *)rb, "selector-data", sd, g_free); - g_signal_connect(G_OBJECT (rb), "toggled", G_CALLBACK (button_toggled_cb), sd); + g_signal_connect ( + rb, "toggled", + G_CALLBACK (button_toggled_cb), sd); if (!group) group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb)); @@ -403,7 +415,9 @@ ivcal_opened (GObject *source_object, } static void -ivcal_import (EImport *ei, EImportTarget *target, icalcomponent *icalcomp) +ivcal_import (EImport *ei, + EImportTarget *target, + icalcomponent *icalcomp) { EClientSourceType type; ICalImporter *ici = g_malloc0 (sizeof (*ici)); @@ -426,7 +440,9 @@ ivcal_import (EImport *ei, EImportTarget *target, icalcomponent *icalcomp) } static void -ivcal_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) +ivcal_cancel (EImport *ei, + EImportTarget *target, + EImportImporter *im) { ICalImporter *ici = g_datalist_get_data(&target->data, "ivcal-data"); @@ -440,7 +456,9 @@ ivcal_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) */ static gboolean -ical_supported (EImport *ei, EImportTarget *target, EImportImporter *im) +ical_supported (EImport *ei, + EImportTarget *target, + EImportImporter *im) { gchar *filename; gchar *contents; @@ -482,7 +500,9 @@ ical_supported (EImport *ei, EImportTarget *target, EImportImporter *im) } static void -ical_import (EImport *ei, EImportTarget *target, EImportImporter *im) +ical_import (EImport *ei, + EImportTarget *target, + EImportImporter *im) { gchar *filename; gchar *contents; @@ -512,7 +532,9 @@ ical_import (EImport *ei, EImportTarget *target, EImportImporter *im) } static GtkWidget * -ivcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im) +ivcal_get_preview (EImport *ei, + EImportTarget *target, + EImportImporter *im) { GtkWidget *preview; EImportTargetURI *s = (EImportTargetURI *) target; @@ -570,7 +592,9 @@ ical_importer_peek (void) */ static gboolean -vcal_supported (EImport *ei, EImportTarget *target, EImportImporter *im) +vcal_supported (EImport *ei, + EImportTarget *target, + EImportImporter *im) { gchar *filename; gchar *contents; @@ -601,8 +625,8 @@ vcal_supported (EImport *ei, EImportTarget *target, EImportImporter *im) if (icalcomp && is_icalcomp_usable (icalcomp)) { /* If we can create proper iCalendar from the file, then - rather use ics importer, because it knows to read more - information than older version, the vCalendar. */ + * rather use ics importer, because it knows to read more + * information than older version, the vCalendar. */ ret = FALSE; g_free (contents); } else { @@ -631,8 +655,8 @@ vcal_supported (EImport *ei, EImportTarget *target, EImportImporter *im) } /* This tries to load in a vCalendar file and convert it to an icalcomponent. - It returns NULL on failure. */ -static icalcomponent* + * It returns NULL on failure. */ +static icalcomponent * load_vcalendar_file (const gchar *filename) { icalvcal_defaults defaults = { NULL }; @@ -667,7 +691,9 @@ load_vcalendar_file (const gchar *filename) } static void -vcal_import (EImport *ei, EImportTarget *target, EImportImporter *im) +vcal_import (EImport *ei, + EImportTarget *target, + EImportImporter *im) { gchar *filename; icalcomponent *icalcomp; @@ -688,7 +714,9 @@ vcal_import (EImport *ei, EImportTarget *target, EImportImporter *im) } static GtkWidget * -vcal_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im) +vcal_get_preview (EImport *ei, + EImportTarget *target, + EImportImporter *im) { GtkWidget *preview; EImportTargetURI *s = (EImportTargetURI *) target; @@ -736,7 +764,9 @@ vcal_importer_peek (void) /* ********************************************************************** */ static gboolean -gnome_calendar_supported (EImport *ei, EImportTarget *target, EImportImporter *im) +gnome_calendar_supported (EImport *ei, + EImportTarget *target, + EImportImporter *im) { gchar *filename; gboolean res; @@ -800,7 +830,11 @@ default_source_opened_cb (GObject *source_object, } static void -open_default_source (ICalIntelligentImporter *ici, ECalClientSourceType source_type, void (* opened_cb) (ECalClient *cal_client, const GError *error, ICalIntelligentImporter *ici)) +open_default_source (ICalIntelligentImporter *ici, + ECalClientSourceType source_type, + void (* opened_cb) (ECalClient *cal_client, + const GError *error, + ICalIntelligentImporter *ici)) { ESource *source; ECalClient *cal_client; @@ -912,7 +946,9 @@ gc_import_events (ECalClient *cal_client, } static void -gnome_calendar_import (EImport *ei, EImportTarget *target, EImportImporter *im) +gnome_calendar_import (EImport *ei, + EImportTarget *target, + EImportImporter *im) { icalcomponent *icalcomp = NULL; gchar *filename; @@ -920,7 +956,7 @@ gnome_calendar_import (EImport *ei, EImportTarget *target, EImportImporter *im) ICalIntelligentImporter *ici; /* This is pretty shitty, everything runs in the gui thread and can block - for quite some time */ + * for quite some time */ do_calendar = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "gnomecal-do-cal")); do_tasks = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "gnomecal-do-tasks")); @@ -967,19 +1003,23 @@ gnome_calendar_import (EImport *ei, EImportTarget *target, EImportImporter *im) } static void -calendar_toggle_cb (GtkToggleButton *tb, EImportTarget *target) +calendar_toggle_cb (GtkToggleButton *tb, + EImportTarget *target) { g_datalist_set_data(&target->data, "gnomecal-do-cal", GINT_TO_POINTER(gtk_toggle_button_get_active(tb))); } static void -tasks_toggle_cb (GtkToggleButton *tb, EImportTarget *target) +tasks_toggle_cb (GtkToggleButton *tb, + EImportTarget *target) { g_datalist_set_data(&target->data, "gnomecal-do-tasks", GINT_TO_POINTER(gtk_toggle_button_get_active(tb))); } static GtkWidget * -gnome_calendar_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) +gnome_calendar_getwidget (EImport *ei, + EImportTarget *target, + EImportImporter *im) { GtkWidget *hbox, *w; GConfClient *gconf; @@ -1011,7 +1051,9 @@ gnome_calendar_getwidget (EImport *ei, EImportTarget *target, EImportImporter *i } static void -gnome_calendar_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) +gnome_calendar_cancel (EImport *ei, + EImportTarget *target, + EImportImporter *im) { ICalIntelligentImporter *ici = g_datalist_get_data(&target->data, "gnomecal-data"); @@ -1041,7 +1083,9 @@ gnome_calendar_importer_peek (void) /* ********************************************************************** */ static gchar * -format_dt (const ECalComponentDateTime *dt, GHashTable *timezones, icaltimezone *users_zone) +format_dt (const ECalComponentDateTime *dt, + GHashTable *timezones, + icaltimezone *users_zone) { struct tm tm; @@ -1076,7 +1120,8 @@ strip_mailto (const gchar *str) } static void -preview_comp (EWebViewPreview *preview, ECalComponent *comp) +preview_comp (EWebViewPreview *preview, + ECalComponent *comp) { ECalComponentText text = { 0 }; ECalComponentDateTime dt; @@ -1293,7 +1338,8 @@ preview_comp (EWebViewPreview *preview, ECalComponent *comp) } static void -preview_selection_changed_cb (GtkTreeSelection *selection, EWebViewPreview *preview) +preview_selection_changed_cb (GtkTreeSelection *selection, + EWebViewPreview *preview) { GtkTreeIter iter; GtkTreeModel *model = NULL; -- cgit v1.2.3 From bba8d7cb91249cac440ca0a5ce3e9f380ac3a76d Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 21 Sep 2011 16:12:55 +0200 Subject: Use GSettings where possible in calendar importer --- calendar/importers/icalendar-importer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 739a23cf1d..6083460683 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -1379,11 +1379,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", NULL); - g_object_unref (client); + g_object_unref (settings); } if (location) { -- cgit v1.2.3 From 8fd93c9042bb30e53ce88303f8a0789a6ca688eb Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 5 Oct 2011 18:19:33 +0200 Subject: First successful build --- calendar/importers/icalendar-importer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 4a7b942ba6..96fce86260 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -1382,7 +1382,7 @@ get_users_timezone (void) } else { GSettings *settings = g_settings_new ("org.gnome.evolution.calendar"); - location = g_settings_get_string (settings, "timezone", NULL); + location = g_settings_get_string (settings, "timezone"); g_object_unref (settings); } -- cgit v1.2.3 From 2f62d91630f58325820712e9c21439b7fae055ce Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 10 Oct 2011 17:13:18 +0200 Subject: Port calendar importer to GSettings --- calendar/importers/icalendar-importer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'calendar/importers/icalendar-importer.c') diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 96fce86260..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)); -- cgit v1.2.3