diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-04-22 02:52:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-04-22 05:07:15 +0800 |
| commit | 7950d6a0c6efd6c4d48afd99c138f38952bdd1bb (patch) | |
| tree | 3a8fd7957dd29441120d2db18ccb1cc23f5935f2 /plugins/save-calendar | |
| parent | 397b15ff4aa5afd1d5c7e0a093a33616624401cf (diff) | |
| download | gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.gz gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.bz2 gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.lz gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.xz gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.zst gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.zip | |
Adapt to libedataserver[ui] changes.
Diffstat (limited to 'plugins/save-calendar')
| -rw-r--r-- | plugins/save-calendar/csv-format.c | 4 | ||||
| -rw-r--r-- | plugins/save-calendar/ical-format.c | 4 | ||||
| -rw-r--r-- | plugins/save-calendar/rdf-format.c | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index f9d97fcf68..021123d7fd 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -337,14 +337,14 @@ do_save_calendar_csv (FormatHandler *handler, if (!dest_uri) return; - primary_source = e_source_selector_get_primary_selection (selector); - /* open source client */ + primary_source = e_source_selector_ref_primary_selection (selector); source_client = e_cal_client_new (primary_source, type, &error); if (source_client) g_signal_connect ( source_client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL); + g_object_unref (primary_source); if (!source_client || !e_client_open_sync (E_CLIENT (source_client), TRUE, NULL, &error)) { display_error_message ( diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 77e5558e29..47cc15f9d7 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -97,17 +97,17 @@ do_save_calendar_ical (FormatHandler *handler, GSList *objects = NULL; icalcomponent *top_level = NULL; - primary_source = e_source_selector_get_primary_selection (selector); - if (!dest_uri) return; /* open source client */ + primary_source = e_source_selector_ref_primary_selection (selector); source_client = e_cal_client_new (primary_source, type, &error); if (source_client) g_signal_connect ( source_client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL); + 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->message); diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 11c29fa854..2e2e92e19a 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -26,6 +26,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> +#include <gconf/gconf-client.h> #include <libedataserver/e-source.h> #include <libedataserverui/e-client-utils.h> #include <libedataserverui/e-source-selector.h> @@ -201,14 +202,14 @@ do_save_calendar_rdf (FormatHandler *handler, if (!dest_uri) return; - primary_source = e_source_selector_get_primary_selection (selector); - /* open source client */ + primary_source = e_source_selector_ref_primary_selection (selector); source_client = e_cal_client_new (primary_source, type, &error); if (source_client) g_signal_connect ( source_client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL); + 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); @@ -249,9 +250,9 @@ do_save_calendar_rdf (FormatHandler *handler, xmlNewChild (fnode, NULL, (const guchar *)"method", (const guchar *)"PUBLISH"); - xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *)e_source_peek_uid (primary_source)); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:relcalid", (guchar *)e_source_get_uid (primary_source)); - xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *)e_source_peek_name (primary_source)); + xmlNewChild (fnode, NULL, (const guchar *)"x-wr:calname", (guchar *)e_source_get_display_name (primary_source)); /* Version of this RDF-format */ xmlNewChild (fnode, NULL, (const guchar *)"version", (const guchar *)"2.0"); |