#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, 11 insertions, 63 deletions

diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index a859f22c9e..384f89b40d 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -1,21 +1,21 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-addressbook">
+<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Factory"
+            type="shlib"
+            location="@COMPONENTDIR@/libevolution-addressbook.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook Minicard control"/>
+                       _value="Factory for the controls exported by the Evolution Addressbook"/>
 
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory">
+            location="OAFIID:GNOME_Evolution_Addressbook_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/Control:1.0"/>
@@ -34,22 +34,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control"
             type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory">
+            location="OAFIID:GNOME_Evolution_Addressbook_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
@@ -62,8 +49,8 @@
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-addressbook">
+            type="factory"
+            location="OAFIID:GNOME_Evolution_Addressbook_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
@@ -79,22 +66,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Addressbook's address displayer"/>
-
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory">
+	    location="OAFIID:GNOME_Evolution_Addressbook_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:BonoboControl/address-widget:1.0"/>
@@ -106,22 +80,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory"
-	    type="exe"
-	    location="@LIBEXECDIR@/evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Addressbook's address popup"/>
-
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup"
 	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory">
+	    location="OAFIID:GNOME_Evolution_Addressbook_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:BonoboControl/address-widget:1.0"/>
@@ -133,22 +94,9 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory"
-            type="exe"
-            location="@LIBEXECDIR@/evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the configuration controls for the Evolution Addressbook."/>
-
-</oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl"
             type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory">
+	    location="OAFIID:GNOME_Evolution_Addressbook_Factory">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>