diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-21 04:50:38 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-21 04:50:38 +0800 |
commit | 23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf (patch) | |
tree | 0db872538c32650de59a4a617582344d72b23d80 /addressbook/gui/component | |
parent | 292aea67a7f3f1d194ef60214d482881f54ab083 (diff) | |
parent | 43f43118634d29618cea74d8950346640142e883 (diff) | |
download | gsoc2013-evolution-23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf.tar gsoc2013-evolution-23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf.tar.gz gsoc2013-evolution-23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf.tar.bz2 gsoc2013-evolution-23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf.tar.lz gsoc2013-evolution-23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf.tar.xz gsoc2013-evolution-23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf.tar.zst gsoc2013-evolution-23f58b3f17ce7ba08a8bd3f6066f62f0f454bacf.zip |
Merge branch 'vcard-inline'
Diffstat (limited to 'addressbook/gui/component')
-rw-r--r-- | addressbook/gui/component/component-factory.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index feea79d88f..52bc377115 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -31,7 +31,6 @@ #include "addressbook-view.h" #include "autocompletion-config.h" #include "eab-popup-control.h" -#include "eab-vcard-control.h" #ifdef ENABLE_SMIME #include "smime/gui/certificate-manager.h" #endif @@ -40,7 +39,6 @@ #define FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_Factory:" BASE_VERSION -#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION #define COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_Component:" BASE_VERSION #define ADDRESS_POPUP_ID "OAFIID:GNOME_Evolution_Addressbook_AddressPopup:" BASE_VERSION #define COMPLETION_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:" BASE_VERSION @@ -56,8 +54,6 @@ factory (BonoboGenericFactory *factory, { d(printf ("asked to activate component_id `%s'\n", component_id)); - if (strcmp (component_id, VCARD_CONTROL_ID) == 0) - return BONOBO_OBJECT (eab_vcard_control_new ()); if (strcmp (component_id, COMPONENT_ID) == 0) { BonoboObject *object = BONOBO_OBJECT (addressbook_component_peek ()); bonobo_object_ref (object); |