#include <string.h>.

* gui/component/e-cardlist-model.c: #include <string.h>.

* gui/component/addressbook-storage.c: #include <string.h>,
<ctype.h>, <unistd.h>.

* gui/component/addressbook-factory.c: Removed.

* gui/component/addressbook-component.c: #include
<bonobo/bonobo-main.h>, <unistd.h> and <string.h>.
(create_view): addressbook_new_control() instead of
addressbook_factory_new_control().

* gui/component/select-names/e-select-names.c
(e_addressbook_create_ebook_table): Removed unused variable.
(e_select_names_add_section): Removed unused variable.

* gui/component/select-names/e-select-names-manager.c
(focus_in_cb): Use g_source_remove() here instead of
gtk_timeout_remove().

* gui/widgets/e-minicard-control.c
(e_minicard_control_factory_init): Removed.
(e_minicard_control_control_factory): Removed.
(e_minicard_control_new): New.

* gui/component/e-address-widget.c
(e_address_widget_factory_init): Removed.
(e_address_widget_new_control): Renamed from
e_address_widget_factory_new_control(), made public.
(e_address_widget_factory): Removed.

* gui/component/e-address-popup.c (e_address_popup_new_control):
New.
(e_address_popup_factory_new_control): Removed.
(e_address_popup_factory): Removed.
(e_address_popup_factory_init): Removed.

* gui/component/addressbook-config.c
(addressbook_config_register_factory): Removed.
(addressbook_config_create_control): New.

* gui/component/addressbook-component.c
(addressbook_component_factory_init): Removed.
(addressbook_component_get_object): New.
(owner_set_cb): Do not call addressbok_config_register_factory().

* gui/component/addressbook.c (addressbook_factory_init): Removed.
(addressbook_new_control): Renamed from
addressbook_factory_new_control().

svn path=/trunk/; revision=19041

1 files changed, 7 insertions, 35 deletions

diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 3cf0cd2a62..b30f400250 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -26,6 +26,7 @@
 #include <glade/glade.h>
 
 #include "addressbook.h"
+#include "addressbook-component.h"
 #include "addressbook-config.h"
 #include "addressbook-storage.h"
 
@@ -1673,45 +1674,16 @@ ldap_config_control_new (GNOME_Evolution_Shell shell)
 }
 
 
-/* Implementation of the factory for the configuration control.  */
-
-static BonoboGenericFactory *factory = NULL;
-
-static BonoboObject *
-config_control_factory_fn (BonoboGenericFactory *factory,
-			   const char *component_id,
-			   void *data)
+BonoboControl *
+addressbook_config_control_new (void)
 {
 	GNOME_Evolution_Shell shell;
-	EvolutionConfigControl *control;
-
-	shell = (GNOME_Evolution_Shell) data;
 
-	if (!strcmp (component_id, LDAP_CONFIG_CONTROL_ID)) {
-		control = ldap_config_control_new (shell);
-	} else {
-		control = NULL;
-		g_assert_not_reached ();
-	}
-
-	return BONOBO_OBJECT (control);
-}
-
-gboolean
-addressbook_config_register_factory (GNOME_Evolution_Shell shell)
-{
-	g_return_val_if_fail (shell != CORBA_OBJECT_NIL, FALSE);
-
-	factory = bonobo_generic_factory_new (CONFIG_CONTROL_FACTORY_ID,
-					      config_control_factory_fn,
-					      shell);
+	shell = BONOBO_OBJREF (addressbook_component_get_shell_client ());
+	if (! shell)
+		return NULL;
 
-	if (factory != NULL) {
-		return TRUE;
-	} else {
-		g_warning ("Cannot register factory %s", CONFIG_CONTROL_FACTORY_ID);
-		return FALSE;
-	}
+	return BONOBO_CONTROL (ldap_config_control_new (shell));
 }
 
 void