From 38790d8478e906a5c59d0c4a5216f297f305bfeb 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 --- plugins/publish-calendar/publish-format-fb.c | 61 +++++++++++++++++--------- plugins/publish-calendar/publish-format-ical.c | 44 ++++++++++--------- 2 files changed, 63 insertions(+), 42 deletions(-) (limited to 'plugins/publish-calendar') diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index 2f9b0626cf..65762e0c8a 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -30,23 +30,38 @@ #include #include #include -#include +#include +#include #include #include -#include #include "publish-format-fb.h" +static void +free_busy_data_cb (ECalClient *client, const GSList *free_busy_ecalcomps, GSList **pobjects) +{ + const GSList *iter; + + g_return_if_fail (pobjects != NULL); + + for (iter = free_busy_ecalcomps; iter != NULL; iter = iter->next) { + ECalComponent *comp = iter->data; + + if (comp) + *pobjects = g_slist_prepend (*pobjects, g_object_ref (comp)); + } +} + static gboolean -write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, gint dur_type, gint dur_value, GError **error) +write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *stream, gint dur_type, gint dur_value, GError **error) { ESource *source; - ECal *client = NULL; - GList *objects; + ECalClient *client = NULL; + GSList *objects = NULL; icaltimezone *utc; time_t start = time (NULL), end; icalcomponent *top_level; gchar *email = NULL; - GList *users = NULL; + GSList *users = NULL; gboolean res = FALSE; utc = icaltimezone_get_utc_timezone (); @@ -67,46 +82,52 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, gin source = e_source_list_peek_source_by_uid (source_list, uid); if (source) - client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); + client = e_cal_client_new (source, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error); if (!client) { - if (error) - *error = g_error_new (e_calendar_error_quark (), E_CALENDAR_STATUS_NO_SUCH_CALENDAR, _("Could not publish calendar: Calendar backend no longer exists")); + if (error && !*error) + *error = g_error_new (E_CAL_CLIENT_ERROR, E_CAL_CLIENT_ERROR_NO_SUCH_CALENDAR, _("Could not publish calendar: Calendar backend no longer exists")); return FALSE; } - if (!e_cal_open (client, TRUE, error)) { + g_signal_connect (client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL); + + if (!e_client_open_sync (E_CLIENT (client), TRUE, NULL, error)) { g_object_unref (client); return FALSE; } - if (e_cal_get_cal_address (client, &email, NULL)) { + if (e_client_get_backend_property_sync (E_CLIENT (client), CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS, &email, NULL, NULL)) { if (email && *email) - users = g_list_append (users, email); + users = g_slist_append (users, email); } top_level = e_cal_util_new_top_level (); - if (e_cal_get_free_busy (client, users, start, end, &objects, error)) { + g_signal_connect (client, "free-busy-data", G_CALLBACK (free_busy_data_cb), &objects); + + if (e_cal_client_get_free_busy_sync (client, start, end, users, NULL, error)) { gchar *ical_string; + GSList *iter; - while (objects) { + for (iter = objects; iter; iter = iter->next) { ECalComponent *comp = objects->data; icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp); icalcomponent_add_component (top_level, icalcomp); - objects = g_list_remove (objects, comp); } ical_string = icalcomponent_as_ical_string_r (top_level); res = g_output_stream_write_all (stream, ical_string, strlen (ical_string), NULL, NULL, error); + e_cal_client_free_ecalcomp_slist (objects); g_free (ical_string); } if (users) - g_list_free (users); + g_slist_free (users); g_free (email); g_object_unref (client); + icalcomponent_free (top_level); return res; } @@ -116,12 +137,11 @@ publish_calendar_as_fb (GOutputStream *stream, EPublishUri *uri, GError **error) { GSList *l; ESourceList *source_list; - GConfClient *gconf_client; - gconf_client = gconf_client_get_default (); + if (!e_cal_client_get_sources (&source_list, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error)) + return; /* events */ - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources"); l = uri->events; while (l) { gchar *uid = l->data; @@ -129,7 +149,6 @@ publish_calendar_as_fb (GOutputStream *stream, EPublishUri *uri, GError **error) break; l = g_slist_next (l); } - g_object_unref (source_list); - g_object_unref (gconf_client); + g_object_unref (source_list); } diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index b4b5451a2f..de6b342c3d 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -29,14 +29,14 @@ #include #include #include -#include +#include +#include #include -#include #include "publish-format-ical.h" typedef struct { GHashTable *zones; - ECal *ecal; + ECalClient *client; } CompTzData; static void @@ -53,7 +53,7 @@ insert_tz_comps (icalparameter *param, gpointer cb_data) if (g_hash_table_lookup (tdata->zones, tzid)) return; - if (!e_cal_get_timezone (tdata->ecal, tzid, &zone, &error)) { + if (!e_cal_client_get_timezone_sync (tdata->client, tzid, &zone, NULL, &error)) { g_warning ("Could not get the timezone information for %s : %s \n", tzid, error->message); g_error_free (error); return; @@ -70,42 +70,44 @@ append_tz_to_comp (gpointer key, gpointer value, icalcomponent *toplevel) } static gboolean -write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, GError **error) +write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *stream, GError **error) { ESource *source; - ECal *client = NULL; - GList *objects; + ECalClient *client = NULL; + GSList *objects; icalcomponent *top_level; gboolean res = FALSE; source = e_source_list_peek_source_by_uid (source_list, uid); if (source) - client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); + client = e_cal_client_new (source, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error); if (!client) { - if (error) - *error = g_error_new (e_calendar_error_quark (), E_CALENDAR_STATUS_NO_SUCH_CALENDAR, _("Could not publish calendar: Calendar backend no longer exists")); + if (error && !error) + *error = g_error_new (E_CAL_CLIENT_ERROR, E_CAL_CLIENT_ERROR_NO_SUCH_CALENDAR, _("Could not publish calendar: Calendar backend no longer exists")); return FALSE; } - if (!e_cal_open (client, TRUE, error)) { + g_signal_connect (client, "authenticate", G_CALLBACK (e_client_utils_authenticate_handler), NULL); + + if (!e_client_open_sync (E_CLIENT (client), TRUE, NULL, error)) { g_object_unref (client); return FALSE; } top_level = e_cal_util_new_top_level (); - if (e_cal_get_object_list (client, "#t", &objects, error)) { + if (e_cal_client_get_object_list_sync (client, "#t", &objects, NULL, error)) { + GSList *iter; gchar *ical_string; CompTzData tdata; tdata.zones = g_hash_table_new (g_str_hash, g_str_equal); - tdata.ecal = client; + tdata.client = client; - while (objects) { + for (iter = objects; iter; iter = iter->next) { icalcomponent *icalcomp = objects->data; icalcomponent_foreach_tzid (icalcomp, insert_tz_comps, &tdata); icalcomponent_add_component (top_level, icalcomp); - objects = g_list_remove (objects, icalcomp); } g_hash_table_foreach (tdata.zones, (GHFunc) append_tz_to_comp, top_level); @@ -116,9 +118,11 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, GEr ical_string = icalcomponent_as_ical_string_r (top_level); res = g_output_stream_write_all (stream, ical_string, strlen (ical_string), NULL, NULL, error); g_free (ical_string); + e_cal_client_free_icalcomp_slist (objects); } g_object_unref (client); + icalcomponent_free (top_level); return res; } @@ -128,12 +132,11 @@ publish_calendar_as_ical (GOutputStream *stream, EPublishUri *uri, GError **erro { GSList *l; ESourceList *source_list; - GConfClient *gconf_client; - - gconf_client = gconf_client_get_default (); /* events */ - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources"); + if (!e_cal_client_get_sources (&source_list, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, error)) + return; + l = uri->events; while (l) { gchar *uid = l->data; @@ -141,7 +144,6 @@ publish_calendar_as_ical (GOutputStream *stream, EPublishUri *uri, GError **erro break; l = g_slist_next (l); } - g_object_unref (source_list); - g_object_unref (gconf_client); + g_object_unref (source_list); } -- cgit v1.2.3