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 /addressbook/gui | |
| parent | cf563ecd524fd20fb3cc8ebade877ad442d85c43 (diff) | |
| download | gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.gz gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.bz2 gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.lz gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.xz gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.zst gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.zip | |
Merge back eplugin-import-branch.
svn path=/trunk/; revision=29725
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 89d7b26dad..41ba12b9a9 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -55,6 +55,7 @@ libevolution_addressbook_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la \ + $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS) diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 670e5de8ef..fef6f9b7f7 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -32,9 +32,11 @@ #include "addressbook/gui/contact-editor/eab-editor.h" #include "addressbook/gui/widgets/eab-gui-util.h" #include "e-util/e-plugin.h" +#include "e-util/e-import.h" #include "addressbook/gui/widgets/eab-popup.h" #include "addressbook/gui/widgets/eab-menu.h" #include "addressbook/gui/widgets/eab-config.h" +#include "addressbook/importers/evolution-addressbook-importers.h" #include "misc/e-task-bar.h" #include "misc/e-info-label.h" @@ -471,10 +473,16 @@ addressbook_component_init (AddressbookComponent *component) #endif if (first) { + EImportClass *klass; + first = FALSE; e_plugin_hook_register_type(eab_popup_hook_get_type()); e_plugin_hook_register_type(eab_menu_hook_get_type()); e_plugin_hook_register_type(eab_config_hook_get_type()); + + klass = g_type_class_ref(e_import_get_type()); + e_import_class_add_importer(klass, evolution_ldif_importer_peek(), NULL, NULL); + e_import_class_add_importer(klass, evolution_vcard_importer_peek(), NULL, NULL); } } |