diff options
30 files changed, 57 insertions, 53 deletions
diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am index 342a9b6df5..5a6c18f417 100644 --- a/calendar/common/Makefile.am +++ b/calendar/common/Makefile.am @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libevolution-calendarprivate.la +ecalendarcommonincludedir = $(privincludedir)/calendar/common +ecalendarcommoninclude_HEADERS = \ + authentication.h + libevolution_calendarprivate_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"calendar-gui\" \ diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c index 7b0b2e7972..baacc1ead4 100644 --- a/calendar/common/authentication.c +++ b/calendar/common/authentication.c @@ -73,7 +73,7 @@ build_pass_key (ECal *ecal) } void -auth_cal_forget_password (ECal *ecal) +e_auth_cal_forget_password (ECal *ecal) { ESource *source = NULL; const gchar *auth_domain = NULL, *component_name = NULL, *auth_type = NULL; @@ -95,7 +95,7 @@ auth_cal_forget_password (ECal *ecal) } ECal * -auth_new_cal_from_default (ECalSourceType type) +e_auth_new_cal_from_default (ECalSourceType type) { ECal *ecal = NULL; @@ -106,7 +106,7 @@ auth_new_cal_from_default (ECalSourceType type) } ECal * -auth_new_cal_from_source (ESource *source, ECalSourceType type) +e_auth_new_cal_from_source (ESource *source, ECalSourceType type) { ECal *cal; @@ -118,7 +118,7 @@ auth_new_cal_from_source (ESource *source, ECalSourceType type) } ECal * -auth_new_cal_from_uri (const gchar *uri, ECalSourceType type) +e_auth_new_cal_from_uri (const gchar *uri, ECalSourceType type) { ESourceGroup *group = NULL; ESource *source = NULL; @@ -172,7 +172,7 @@ auth_new_cal_from_uri (const gchar *uri, ECalSourceType type) } } - cal = auth_new_cal_from_source (source, type); + cal = e_auth_new_cal_from_source (source, type); g_object_unref (source); if (group) diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h index 7d9d7f5fa7..e4e0599878 100644 --- a/calendar/common/authentication.h +++ b/calendar/common/authentication.h @@ -27,9 +27,9 @@ #include <libedataserver/e-source.h> #include <libecal/e-cal.h> -ECal *auth_new_cal_from_default (ECalSourceType type); -ECal *auth_new_cal_from_source (ESource *source, ECalSourceType type); -ECal *auth_new_cal_from_uri (const gchar *uri, ECalSourceType type); -void auth_cal_forget_password (ECal *ecal); +ECal *e_auth_new_cal_from_default (ECalSourceType type); +ECal *e_auth_new_cal_from_source (ESource *source, ECalSourceType type); +ECal *e_auth_new_cal_from_uri (const gchar *uri, ECalSourceType type); +void e_auth_cal_forget_password (ECal *ecal); #endif diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 5651a61182..7ad414c61c 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -384,7 +384,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource } } - client = auth_new_cal_from_source (source, source_type); + client = e_auth_new_cal_from_source (source, source_type); if (client) { d (printf("%s:%d (alarm_notify_add_calendar) %s - Calendar Open Async... %p\n", __FILE__, __LINE__, str_uri, client)); diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index c5254a427f..a8fa9aef72 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -749,7 +749,7 @@ cal_comp_process_source_list_drop (ECal *destination, icalcomponent *comp, GdkDr source_source = e_source_list_peek_source_by_uid (source_list, source_uid); if (source_source && !E_IS_SOURCE_GROUP (source_source) && !e_source_get_readonly (source_source)) { - source_client = auth_new_cal_from_source (source_source, e_cal_get_source_type (destination)); + source_client = e_auth_new_cal_from_source (source_source, e_cal_get_source_type (destination)); if (source_client) { gboolean read_only = TRUE; diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 095d10131d..aafe66a90f 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -86,7 +86,7 @@ copy_source (CopySourceDialogData *csdd) return FALSE; /* open the source */ - source_client = auth_new_cal_from_source (csdd->orig_source, csdd->obj_type); + source_client = e_auth_new_cal_from_source (csdd->orig_source, csdd->obj_type); if (!e_cal_open (source_client, TRUE, NULL)) { show_error (NULL, _("Could not open source")); g_object_unref (source_client); @@ -94,7 +94,7 @@ copy_source (CopySourceDialogData *csdd) } /* open the destination */ - dest_client = auth_new_cal_from_source (csdd->selected_source, csdd->obj_type); + dest_client = e_auth_new_cal_from_source (csdd->selected_source, csdd->obj_type); if (!e_cal_open (dest_client, FALSE, NULL)) { show_error (NULL, _("Could not open destination")); g_object_unref (dest_client); diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index b10932d0ad..bef407c8dd 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -2564,7 +2564,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage)); source = e_source_combo_box_get_active (source_combo_box); - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); if (client) { icaltimezone *zone; diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 949836a330..f5c6a26400 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -855,7 +855,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, flags = comp_editor_get_flags (editor); source = e_source_combo_box_get_active (source_combo_box); - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL); if (!client || !e_cal_open (client, FALSE, NULL)) { GtkWidget *dialog; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 5bff292b37..33413250ad 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1675,7 +1675,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tpage))) return; - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO); if (client) { icaltimezone *zone; diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c index d46b4dad18..14c635b698 100644 --- a/calendar/gui/e-calendar-selector.c +++ b/calendar/gui/e-calendar-selector.c @@ -131,7 +131,7 @@ calendar_selector_data_dropped (ESourceSelector *selector, icalcomponent_set_uid (icalcomp, uid); } - client = auth_new_cal_from_source ( + client = e_auth_new_cal_from_source ( destination, E_CAL_SOURCE_TYPE_EVENT); if (client != NULL) { diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index d1fe75a32d..c941310a2e 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -184,7 +184,7 @@ start_calendar_server (EItipControl *itip, ESource *source, ECalSourceType type, return ecal; } - ecal = auth_new_cal_from_source (source, type); + ecal = e_auth_new_cal_from_source (source, type); zone = calendar_config_get_icaltimezone (); e_cal_set_default_timezone (ecal, zone, NULL); diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c index e31a9d4b6e..d84a70b3b3 100644 --- a/calendar/gui/e-memo-list-selector.c +++ b/calendar/gui/e-memo-list-selector.c @@ -156,7 +156,7 @@ memo_list_selector_process_data (ESourceSelector *selector, if (!E_IS_SOURCE (source) || e_source_get_readonly (source)) goto exit; - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL); if (client == NULL) { g_message ("Cannot create source client to remove old memo"); goto exit; @@ -187,7 +187,7 @@ memo_list_selector_data_dropped (ESourceSelector *selector, GSList *list, *iter; gboolean success = FALSE; - client = auth_new_cal_from_source ( + client = e_auth_new_cal_from_source ( destination, E_CAL_SOURCE_TYPE_JOURNAL); if (client == NULL || !e_cal_open (client, TRUE, NULL)) diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c index fa6bd328d9..34432b0ed4 100644 --- a/calendar/gui/e-task-list-selector.c +++ b/calendar/gui/e-task-list-selector.c @@ -157,7 +157,7 @@ task_list_selector_process_data (ESourceSelector *selector, if (!E_IS_SOURCE (source) || e_source_get_readonly (source)) goto exit; - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO); if (client == NULL) { g_message ("Cannot create source client to remove old task"); goto exit; @@ -188,7 +188,7 @@ task_list_selector_data_dropped (ESourceSelector *selector, GSList *list, *iter; gboolean success = FALSE; - client = auth_new_cal_from_source ( + client = e_auth_new_cal_from_source ( destination, E_CAL_SOURCE_TYPE_TODO); if (client == NULL || !e_cal_open (client, TRUE, NULL)) diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 6521d8d5d5..ea87a840f6 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1876,7 +1876,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) state = e_cal_get_load_state (ecal); if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) - auth_cal_forget_password (ecal); + e_auth_cal_forget_password (ecal); switch (status) { case E_CALENDAR_STATUS_OK: @@ -1967,7 +1967,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar state = e_cal_get_load_state (ecal); if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) - auth_cal_forget_password (ecal); + e_auth_cal_forget_password (ecal); switch (status) { case E_CALENDAR_STATUS_OK: @@ -2277,7 +2277,7 @@ gnome_calendar_set_default_source (GnomeCalendar *gcal, ESource *source) if (client) { priv->default_client = g_object_ref (client); } else { - priv->default_client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); + priv->default_client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); if (!priv->default_client) return FALSE; } diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index b7b2b515ad..1f7da5e421 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -321,7 +321,7 @@ ivcal_import(EImport *ei, EImportTarget *target, icalcomponent *icalcomp) type = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "primary-type")); - client = auth_new_cal_from_source (g_datalist_get_data(&target->data, "primary-source"), 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)); @@ -629,13 +629,13 @@ gnome_calendar_import(EImport *ei, EImportTarget *target, EImportImporter *im) /* Try to open the default calendar & tasks folders. */ if (do_calendar) { - calendar_client = auth_new_cal_from_default (E_CAL_SOURCE_TYPE_EVENT); + calendar_client = e_auth_new_cal_from_default (E_CAL_SOURCE_TYPE_EVENT); if (!calendar_client) goto out; } if (do_tasks) { - tasks_client = auth_new_cal_from_default (E_CAL_SOURCE_TYPE_TODO); + tasks_client = e_auth_new_cal_from_default (E_CAL_SOURCE_TYPE_TODO); if (!tasks_client) goto out; } diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index 6453f14be2..b532af85e5 100644 --- a/modules/calendar/e-cal-attachment-handler.c +++ b/modules/calendar/e-cal-attachment-handler.c @@ -298,7 +298,7 @@ attachment_handler_run_dialog (GtkWindow *parent, if (source == NULL) goto exit; - client = auth_new_cal_from_source (source, source_type); + client = e_auth_new_cal_from_source (source, source_type); if (client == NULL) goto exit; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 232e8461c3..30bad0a4bf 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -402,12 +402,12 @@ action_event_new_cb (GtkAction *action, source = e_source_list_peek_source_by_uid (source_list, uid); if (source != NULL) - cal = auth_new_cal_from_source (source, source_type); + cal = e_auth_new_cal_from_source (source, source_type); g_free (uid); } if (cal == NULL) - cal = auth_new_cal_from_default (source_type); + cal = e_auth_new_cal_from_default (source_type); g_return_if_fail (cal != NULL); @@ -598,7 +598,7 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend, goto exit; } - client = auth_new_cal_from_source (source, source_type); + client = e_auth_new_cal_from_source (source, source_type); if (client == NULL || !e_cal_open (client, TRUE, &error)) { if (error != NULL) { g_printerr ("%s\n", error->message); diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 62fc30202f..390be5e6da 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -173,7 +173,7 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar, if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) - auth_cal_forget_password (client); + e_auth_cal_forget_password (client); switch (status) { case E_CALENDAR_STATUS_OK: @@ -750,7 +750,7 @@ e_cal_shell_sidebar_add_source (ECalShellSidebar *cal_shell_sidebar, if (client != NULL) return; - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); g_return_if_fail (client != NULL); g_signal_connect_swapped ( diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index ca50b56cd9..19fc7e6c53 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -529,7 +529,7 @@ action_event_copy_cb (GtkAction *action, return; /* Open the destination calendar. */ - destination_client = auth_new_cal_from_source ( + destination_client = e_auth_new_cal_from_source ( destination_source, E_CAL_SOURCE_TYPE_EVENT); if (destination_client == NULL) goto exit; @@ -784,7 +784,7 @@ action_event_move_cb (GtkAction *action, return; /* Open the destination calendar. */ - destination_client = auth_new_cal_from_source ( + destination_client = e_auth_new_cal_from_source ( destination_source, E_CAL_SOURCE_TYPE_EVENT); if (destination_client == NULL) goto exit; diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index 10a1ea99e7..d86289d148 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -279,12 +279,12 @@ action_memo_new_cb (GtkAction *action, source = e_source_list_peek_source_by_uid (source_list, uid); if (source != NULL) - cal = auth_new_cal_from_source (source, source_type); + cal = e_auth_new_cal_from_source (source, source_type); g_free (uid); } if (cal == NULL) - cal = auth_new_cal_from_default (source_type); + cal = e_auth_new_cal_from_default (source_type); g_return_if_fail (cal != NULL); @@ -424,7 +424,7 @@ memo_shell_backend_handle_uri_cb (EShellBackend *shell_backend, goto exit; } - client = auth_new_cal_from_source (source, source_type); + client = e_auth_new_cal_from_source (source, source_type); if (client == NULL || !e_cal_open (client, TRUE, &error)) { if (error != NULL) { g_printerr ("%s\n", error->message); diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index 403e733d22..e76341c83a 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -170,7 +170,7 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar, if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) - auth_cal_forget_password (client); + e_auth_cal_forget_password (client); switch (status) { case E_CALENDAR_STATUS_OK: @@ -677,7 +677,7 @@ e_memo_shell_sidebar_add_source (EMemoShellSidebar *memo_shell_sidebar, if (client != NULL) return; - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL); g_return_if_fail (client != NULL); g_signal_connect_swapped ( diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 1a8bee5a03..1db691497c 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -283,12 +283,12 @@ action_task_new_cb (GtkAction *action, source = e_source_list_peek_source_by_uid (source_list, uid); if (source != NULL) - cal = auth_new_cal_from_source (source, source_type); + cal = e_auth_new_cal_from_source (source, source_type); g_free (uid); } if (cal == NULL) - cal = auth_new_cal_from_default (source_type); + cal = e_auth_new_cal_from_default (source_type); g_return_if_fail (cal != NULL); @@ -429,7 +429,7 @@ task_shell_backend_handle_uri_cb (EShellBackend *shell_backend, goto exit; } - client = auth_new_cal_from_source (source, source_type); + client = e_auth_new_cal_from_source (source, source_type); if (client == NULL || !e_cal_open (client, TRUE, &error)) { if (error != NULL) { g_printerr ("%s\n", error->message); diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index 992ccf8b91..7708f7234a 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -168,7 +168,7 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar, if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) - auth_cal_forget_password (client); + e_auth_cal_forget_password (client); switch (status) { case E_CALENDAR_STATUS_OK: @@ -675,7 +675,7 @@ e_task_shell_sidebar_add_source (ETaskShellSidebar *task_shell_sidebar, if (client != NULL) return; - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO); g_return_if_fail (client != NULL); g_signal_connect_swapped ( diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 65f9b58b70..e900cce920 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -545,7 +545,7 @@ start_calendar_server (struct _itip_puri *pitip, ESource *source, ECalSourceType return ecal; } - ecal = auth_new_cal_from_source (source, type); + ecal = e_auth_new_cal_from_source (source, type); if (!ecal) return NULL; diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index fc62561a5e..17bc6a995b 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -988,7 +988,7 @@ mail_to_event (ECalSourceType source_type, AsyncData *data = NULL; GThread *thread = NULL; - client = auth_new_cal_from_source (source, source_type); + client = e_auth_new_cal_from_source (source, source_type); if (!client) { gchar *uri = e_source_get_uri (source); diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index 01b4e7a926..e75dc79b2d 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -63,7 +63,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, gin source = e_source_list_peek_source_by_uid (source_list, uid); if (source) - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); 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")); diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index f6e780daab..30312304e0 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -76,7 +76,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, GEr source = e_source_list_peek_source_by_uid (source_list, uid); if (source) - client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); + client = e_auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); 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")); diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 63798106f1..a5256c4c36 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -323,7 +323,7 @@ do_save_calendar_csv (FormatHandler *handler, ESourceSelector *selector, ECalSou primary_source = e_source_selector_peek_primary_selection (selector); /* open source client */ - source_client = auth_new_cal_from_source (primary_source, type); + source_client = e_auth_new_cal_from_source (primary_source, type); if (!e_cal_open (source_client, TRUE, &error)) { display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (selector)), error); g_object_unref (source_client); diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index 0c5a18f252..2458a14c1d 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -96,7 +96,7 @@ do_save_calendar_ical (FormatHandler *handler, ESourceSelector *selector, ECalSo return; /* open source client */ - source_client = (ECal*) auth_new_cal_from_source (primary_source, type); + source_client = (ECal*) e_auth_new_cal_from_source (primary_source, type); if (!e_cal_open (source_client, TRUE, &error)) { display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (selector)), error->message); g_object_unref (source_client); diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index fd6a263287..acbb6557c6 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -194,7 +194,7 @@ do_save_calendar_rdf (FormatHandler *handler, ESourceSelector *selector, ECalSou primary_source = e_source_selector_peek_primary_selection (selector); /* open source client */ - source_client = auth_new_cal_from_source (primary_source, type); + source_client = e_auth_new_cal_from_source (primary_source, type); if (!e_cal_open (source_client, TRUE, &error)) { display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (selector)), error); g_object_unref (source_client); |