#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, 0 insertions, 76 deletions

diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
deleted file mode 100644
index 506a7ebdc5..0000000000
--- a/addressbook/gui/component/addressbook-factory.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * sample-control-factory.c
- *
- * Copyright 1999, Ximian, Inc.
- * 
- * Author:
- *   Nat Friedman (nat@nat.org)
- *
- */
-
-#include <config.h>
-#include <glib.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <bonobo/bonobo-main.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-cursors.h>
-#include <e-util/e-passwords.h>
-
-#include <camel/camel.h>
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "e-address-widget.h"
-#include "e-address-popup.h"
-#include "addressbook/gui/widgets/e-minicard-control.h"
-#include "select-names/e-select-names-factory.h"
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	free (malloc (5));
-
-	gnome_program_init ("evolution-addressbook", VERSION,
-			    LIBGNOMEUI_MODULE, argc, argv,
-			    GNOME_PROGRAM_STANDARD_PROPERTIES,
-			    NULL);
-
-	/* FIXME: Messy names here.  This file should be `main.c'.  `addressbook.c' should
-           be `addressbook-control-factory.c' and the functions should be called
-           `addressbook_control_factory_something()'.  And `addressbook-component.c'
-           should be `addressbook-component-factory.c'.  */
-
-	addressbook_factory_init ();
-	addressbook_component_factory_init ();
-
-	e_select_names_factory_init ();
-	
-	e_minicard_control_factory_init ();
-
-	e_address_widget_factory_init ();
-	e_address_popup_factory_init ();
-
-	glade_gnome_init ();
-	e_cursors_init();
-
-	e_passwords_init("Addressbook");
-
-#if 0
-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-#endif
-
-	/*g_thread_init (NULL);*/
-	camel_type_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	g_print ("Evolution Addressbook up and running\n");
-
-	bonobo_main ();
-
-	return 0;
-}