diff options
| author | Michael Zucci <zucchi@src.gnome.org> | 2005-07-12 12:04:14 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2005-07-12 12:04:14 +0800 |
| commit | 9f12922bd88bd7a83247cc7e0646c72773e2a013 (patch) | |
| tree | da9a3d002dfa58ff262ef25ca3effe426fbfcc3a /calendar/gui | |
| parent | cf563ecd524fd20fb3cc8ebade877ad442d85c43 (diff) | |
| download | gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.gz gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.zst gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.zip | |
Merge back eplugin-import-branch.
svn path=/trunk/; revision=29725
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | calendar/gui/main.c | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 92667f7038..512278d95c 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -221,6 +221,7 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ + $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ diff --git a/calendar/gui/main.c b/calendar/gui/main.c index b1b5cfdd77..e8bfbafca3 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -46,10 +46,12 @@ #include "tasks-component.h" #include <e-util/e-plugin.h> +#include <e-util/e-import.h> #include "e-cal-config.h" #include "e-cal-popup.h" #include "e-cal-menu.h" #include "e-cal-event.h" +#include "calendar/importers/evolution-calendar-importer.h" #define FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_Factory:" BASE_VERSION @@ -131,6 +133,8 @@ launch_alarm_daemon (void) static void initialize (void) { + EImportClass *klass; + comp_editor_registry = E_COMP_EDITOR_REGISTRY (e_comp_editor_registry_new ()); #if 0 @@ -148,8 +152,12 @@ initialize (void) e_plugin_hook_register_type (e_cal_menu_hook_get_type()); e_plugin_hook_register_type (e_cal_config_hook_get_type ()); e_plugin_hook_register_type (e_cal_event_hook_get_type ()); -} + klass = g_type_class_ref(e_import_get_type()); + e_import_class_add_importer(klass, gnome_calendar_importer_peek(), NULL, NULL); + e_import_class_add_importer(klass, ical_importer_peek(), NULL, NULL); + e_import_class_add_importer(klass, vcal_importer_peek(), NULL, NULL); +} static BonoboObject * factory (BonoboGenericFactory *factory, |