aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/importers
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2003-12-22 23:57:30 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2003-12-22 23:57:30 +0800
commitf3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da (patch)
treed59fdcd68d5a9f2a6d1d1ccecf0f3784597b9e32 /calendar/importers
parent0dfb205f6ae400c996093098102e089f6140a09e (diff)
downloadgsoc2013-evolution-f3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da.tar
gsoc2013-evolution-f3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da.tar.gz
gsoc2013-evolution-f3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da.tar.bz2
gsoc2013-evolution-f3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da.tar.lz
gsoc2013-evolution-f3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da.tar.xz
gsoc2013-evolution-f3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da.tar.zst
gsoc2013-evolution-f3aed51eeb6e6ef1eaadbc3559d2a38c996ed7da.zip
new files for managing interactive authentication with backends.
2003-12-22 Rodrigo Moya <rodrigo@ximian.com> * common/authentication.[ch]: new files for managing interactive authentication with backends. * common/Makefile.am: build new private library. * gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): * gui/dialogs/event-page.c (source_changed_cb): * gui/dialogs/task-page.c (source_changed_cb): * gui/dialogs/copy-source-dialog.c (copy_source): * gui/calendar-component.c (setup_create_ecal): * gui/calendar-offline-handler.c (backend_go_offline, backend_go_online, calendar_offline_handler_init): * gui/comp-editor-factory.c (open_client): * gui/e-itip-control.c (start_calendar_server): * gui/e-tasks.c (e_tasks_add_todo_uri): * gui/gnome-cal.c (gnome_calendar_construct, gnome_calendar_add_event_uri): * gui/tasks-component.c (setup_create_ecal): * importers/icalendar-importer.c (load_file_fn, vcal_load_file_fn, gnome_calendar_import_data_fn): create the ECal's via the auth_new_cal_from* functions in the authentication module. * gui/alarm-notify/Makefile.am: * gui/Makefile.am: * importers/Makefile.am: link new private library. * Makefile.am: added new directory to the build. svn path=/trunk/; revision=23999
Diffstat (limited to 'calendar/importers')
-rw-r--r--calendar/importers/Makefile.am5
-rw-r--r--calendar/importers/icalendar-importer.c13
2 files changed, 10 insertions, 8 deletions
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index a36c7ef4a6..84867931a6 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -23,7 +23,8 @@ libevolution_calendar_importers_la_SOURCES = \
libevolution_calendar_importers_la_LDFLAGS = -avoid-version -module
libevolution_calendar_importers_la_LIBADD = \
- $(top_builddir)/shell/importer/libevolution-importer.la \
+ $(top_builddir)/shell/importer/libevolution-importer.la \
+ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
$(IMPORTERS_LIBS)
# evolution_calendar_importer_SOURCES = \
@@ -50,4 +51,4 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(server_in_files)
dist-hook:
- cd $(distdir); rm -f $(BUILT_SOURCES) \ No newline at end of file
+ cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index ba9478ac8f..c1b237e0d5 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -38,6 +38,7 @@
#include <importer/GNOME_Evolution_Importer.h>
#include <libical/icalvcal.h>
#include "evolution-calendar-importer.h"
+#include "common/authentication.h"
/* We timeout after 2 minutes, when opening the folders. */
#define IMPORTER_TIMEOUT_SECONDS 120
@@ -374,9 +375,9 @@ load_file_fn (EvolutionImporter *importer,
/* create ECal's */
if (!ici->client)
- ici->client = e_cal_new_from_uri (real_uri, E_CAL_SOURCE_TYPE_EVENT);
+ ici->client = auth_new_cal_from_uri (real_uri, E_CAL_SOURCE_TYPE_EVENT);
if (!ici->tasks_client)
- ici->tasks_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_TODO); /* FIXME */
+ ici->tasks_client = auth_new_cal_from_uri ("", E_CAL_SOURCE_TYPE_TODO); /* FIXME */
if (e_cal_open (ici->client, TRUE, NULL)
&& e_cal_open (ici->tasks_client, FALSE, NULL)) {
@@ -526,9 +527,9 @@ vcal_load_file_fn (EvolutionImporter *importer,
/* create ECal's */
if (!ici->client)
- ici->client = e_cal_new_from_uri (real_uri, E_CAL_SOURCE_TYPE_EVENT);
+ ici->client = auth_new_cal_from_uri (real_uri, E_CAL_SOURCE_TYPE_EVENT);
if (!ici->tasks_client)
- ici->tasks_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_TODO);
+ ici->tasks_client = auth_new_cal_from_uri ("", E_CAL_SOURCE_TYPE_TODO);
if (e_cal_open (ici->client, TRUE, NULL)
&& e_cal_open (ici->tasks_client, FALSE, NULL)) {
@@ -614,13 +615,13 @@ gnome_calendar_import_data_fn (EvolutionIntelligentImporter *ii,
/* Try to open the default calendar & tasks folders. */
if (ici->do_calendar) {
- calendar_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_EVENT); /* FIXME: use default folder */
+ calendar_client = auth_new_cal_from_uri ("", E_CAL_SOURCE_TYPE_EVENT); /* FIXME: use default folder */
if (!e_cal_open (calendar_client, FALSE, NULL))
goto out;
}
if (ici->do_tasks) {
- tasks_client = e_cal_new_from_uri ("", E_CAL_SOURCE_TYPE_TODO); /* FIXME: use default folder */
+ tasks_client = auth_new_cal_from_uri ("", E_CAL_SOURCE_TYPE_TODO); /* FIXME: use default folder */
if (!e_cal_open (tasks_client, FALSE, NULL))
goto out;
}