diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-24 05:05:08 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-30 22:35:27 +0800 |
commit | f19241d136043d5cfffbfbaf5b2d6d1affc70682 (patch) | |
tree | 6abc10286b092dfc9b046bde599f24767ad0c177 /plugins/save-calendar/rdf-format.c | |
parent | e583928e0401a4baea4432c5b7e12a1b1eff8c2e (diff) | |
download | gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.gz gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.bz2 gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.lz gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.xz gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.tar.zst gsoc2013-evolution-f19241d136043d5cfffbfbaf5b2d6d1affc70682.zip |
Use e_cal_client_connect().
Instead of e_client_utils_open_new() or e_cal_client_new().
Diffstat (limited to 'plugins/save-calendar/rdf-format.c')
-rw-r--r-- | plugins/save-calendar/rdf-format.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 28e0b4c35f..391f60cfa7 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -71,13 +71,13 @@ enum { /* XML helper enum */ static void display_error_message (GtkWidget *parent, - GError *error) + const gchar *error_message) { GtkWidget *dialog; dialog = gtk_message_dialog_new ( GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - "%s", error->message); + "%s", error_message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -187,7 +187,7 @@ do_save_calendar_rdf (FormatHandler *handler, */ ESource *primary_source; - ECalClient *source_client; + EClient *source_client; GError *error = NULL; GSList *objects = NULL; gchar *temp = NULL; @@ -198,20 +198,26 @@ do_save_calendar_rdf (FormatHandler *handler, /* open source client */ primary_source = e_source_selector_ref_primary_selection (selector); - source_client = e_cal_client_new (primary_source, type, &error); + source_client = e_cal_client_connect_sync ( + primary_source, type, NULL, &error); g_object_unref (primary_source); - if (!source_client || !e_client_open_sync (E_CLIENT (source_client), TRUE, NULL, &error)) { - display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (selector)), error); - if (source_client) - g_object_unref (source_client); + /* Sanity check. */ + g_return_if_fail ( + ((source_client != NULL) && (error == NULL)) || + ((source_client == NULL) && (error != NULL))); + + if (source_client == NULL) { + display_error_message ( + gtk_widget_get_toplevel (GTK_WIDGET (selector)), + error->message); g_error_free (error); return; } stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (selector))), dest_uri, &error); - if (stream && e_cal_client_get_object_list_as_comps_sync (source_client, "#t", &objects, NULL, NULL)) { + if (stream && e_cal_client_get_object_list_as_comps_sync (E_CAL_CLIENT (source_client), "#t", &objects, NULL, NULL)) { GSList *iter; xmlBufferPtr buffer = xmlBufferCreate (); @@ -363,7 +369,9 @@ do_save_calendar_rdf (FormatHandler *handler, g_object_unref (source_client); if (error) { - display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (selector)), error); + display_error_message ( + gtk_widget_get_toplevel (GTK_WIDGET (selector)), + error->message); g_error_free (error); } |