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/addressbook-component.c | 29 +++++++---------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'addressbook/gui/component/addressbook-component.c') diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index d727e9ac8e..1d9371fdc8 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -33,8 +33,11 @@ #include #include #include +#include +#include #include +#include #include "evolution-shell-component.h" #include "evolution-shell-component-dnd.h" @@ -96,7 +99,7 @@ create_view (EvolutionShellComponent *shell_component, if (!IS_CONTACT_TYPE (type)) return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE; - control = addressbook_factory_new_control (); + control = addressbook_new_control (); bonobo_control_set_property (control, NULL, "folder_uri", TC_CORBA_string, physical_uri, NULL); *control_return = control; @@ -372,8 +375,6 @@ owner_set_cb (EvolutionShellComponent *shell_component, if (global_shell_client == NULL) global_shell_client = shell_client; - addressbook_config_register_factory (evolution_shell_client_corba_objref (shell_client)); - addressbook_storage_setup (shell_component, evolution_homedir); } @@ -620,24 +621,10 @@ ensure_completion_uris_exist() } -/* FIXME this should probably be renamed as we don't use factories anymore. */ -void -addressbook_component_factory_init (void) +/* FIXME this is wrong. */ +BonoboObject * +addressbook_component_init (void) { - BonoboObject *object; - int result; - - object = create_component (); - - /* FIXME: Handle errors better? */ - - result = bonobo_activation_active_server_register (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID, - bonobo_object_corba_objref (object)); - if (result == Bonobo_ACTIVATION_REG_ERROR) - g_error ("Cannot register -- %s", GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID); - - /* XXX this could probably go someplace else, but I'll leave - it here for now since it's a component init time - operation. */ ensure_completion_uris_exist (); + return create_component (); } -- cgit v1.2.3