From 37751b5ece11dfa79a4175ec87f72670579d18ea Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 6 Dec 2002 17:29:59 +0000 Subject: #include . * gui/component/e-cardlist-model.c: #include . * gui/component/addressbook-storage.c: #include , , . * gui/component/addressbook-factory.c: Removed. * gui/component/addressbook-component.c: #include , and . (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 --- addressbook/gui/component/e-address-popup.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'addressbook/gui/component/e-address-popup.c') diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c index a0581c6dcf..b913ef0c0a 100644 --- a/addressbook/gui/component/e-address-popup.c +++ b/addressbook/gui/component/e-address-popup.c @@ -1218,8 +1218,8 @@ get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environmen } } -static BonoboControl * -e_address_popup_factory_new_control (void) +BonoboControl * +e_address_popup_new_control (void) { BonoboControl *control; BonoboPropertyBag *bag; @@ -1254,26 +1254,3 @@ e_address_popup_factory_new_control (void) return control; } - -static BonoboObject * -e_address_popup_factory (BonoboGenericFactory *factory, - const char *component_id, - gpointer user_data) -{ - return BONOBO_OBJECT (e_address_popup_factory_new_control ()); -} - -void -e_address_popup_factory_init (void) -{ - static BonoboGenericFactory *factory = NULL; - - if (factory != NULL) - return; - - factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory", - e_address_popup_factory, NULL); - - if (factory == NULL) - g_error ("I could not register an AddressPopup factory."); -} -- cgit v1.2.3