diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-12-07 01:29:59 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-12-07 01:29:59 +0800 |
commit | 37751b5ece11dfa79a4175ec87f72670579d18ea (patch) | |
tree | 1d7d3b708990ef068e65a86c7c4250893b9b2577 /addressbook/gui/component/addressbook.c | |
parent | 1889b79a4a6d292c15b009d04be1f4147dc515dd (diff) | |
download | gsoc2013-evolution-37751b5ece11dfa79a4175ec87f72670579d18ea.tar gsoc2013-evolution-37751b5ece11dfa79a4175ec87f72670579d18ea.tar.gz gsoc2013-evolution-37751b5ece11dfa79a4175ec87f72670579d18ea.tar.bz2 gsoc2013-evolution-37751b5ece11dfa79a4175ec87f72670579d18ea.tar.lz gsoc2013-evolution-37751b5ece11dfa79a4175ec87f72670579d18ea.tar.xz gsoc2013-evolution-37751b5ece11dfa79a4175ec87f72670579d18ea.tar.zst gsoc2013-evolution-37751b5ece11dfa79a4175ec87f72670579d18ea.zip |
#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
Diffstat (limited to 'addressbook/gui/component/addressbook.c')
-rw-r--r-- | addressbook/gui/component/addressbook.c | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 19c7b9c91a..03f4e432cb 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -1,11 +1,23 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * addressbook.c: +/* addressbook.c * - * Author: - * Chris Lahey (clahey@ximian.com) + * Copyright (C) 2000, 2001, 2002 Ximian, Inc. * - * (C) 2000 Ximian, Inc. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Chris Lahey (clahey@ximian.com) */ #include <config.h> @@ -1089,7 +1101,7 @@ connect_master_list_changed (AddressbookView *view) } BonoboControl * -addressbook_factory_new_control (void) +addressbook_new_control (void) { AddressbookView *view; GtkWidget *frame; @@ -1174,29 +1186,3 @@ addressbook_factory_new_control (void) return view->control; } - -static BonoboObject * -addressbook_factory (BonoboGenericFactory *Factory, - const char *component_id, - void *closure) -{ - return BONOBO_OBJECT (addressbook_factory_new_control ()); -} - -void -addressbook_factory_init (void) -{ - static BonoboGenericFactory *addressbook_control_factory = NULL; - - if (addressbook_control_factory != NULL) - return; - - addressbook_control_factory = bonobo_generic_factory_new ( - "OAFIID:GNOME_Evolution_Addressbook_ControlFactory", - addressbook_factory, NULL); - - if (addressbook_control_factory == NULL) { - g_error ("I could not register a Addressbook factory."); - } -} - |