no more custom widget for the selection of the search source

2003-12-05  JP Rosevear <jpr@ximian.com>

	* gui/component/select-names/select-names.glade: no more custom
	widget for the selection of the search source

	* gui/component/select-names/e-select-names.h: add member

	* gui/component/select-names/e-select-names.etspec: update model
	column

	* gui/component/select-names/e-select-names.c (find_first_source):
	find the first source in the list
	(addressbook_model_set_source): we have the source to set directly
	now
	(source_selected): listen for the source item to change
	(e_select_names_init): create a source option menu and hook it up
	(e_select_names_dispose): destroy the source list
	(e_select_names_new): do away with the config setup here

	* gui/component/select-names/e-select-names-manager.h: update
	members

	* gui/component/select-names/e-select-names-manager.c
	(update_completion_books): add books based on source uid
	(config_completion_books_changed_cb): handle the completion list
	changing
	(config_min_query_length_changed_cb): handle minimum query length
	changing
	(e_select_names_manager_new): we don't do the settings stuff here
	any more
	(e_select_names_manager_init): do the initial set up here for the
	book loaded and listen for changes
	(e_select_names_manager_dispose): destroy the new stuff

	* gui/component/select-names/e-select-names-config.[hc]: config
	information

	* gui/component/select-names/e-select-names-config-keys.h: the
	config keys

	* gui/component/select-names/e-select-names-bonobo.c
	(impl_SelectNames_activate_dialog): do away with the shell client
	stuff

	* gui/component/select-names/Makefile.am: build new files

svn path=/trunk/; revision=23654

1 files changed, 1 insertions, 15 deletions

diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index c4fe9d257d..1977abe95f 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -489,27 +489,13 @@ impl_SelectNames_activate_dialog (PortableServer_Servant servant,
 				  const CORBA_char *section_id,
 				  CORBA_Environment *ev)
 {
-#if 0				/* FIXME */
 	ESelectNamesBonobo *select_names;
 	ESelectNamesBonoboPrivate *priv;
-	EvolutionShellClient *shell_client;
-	GNOME_Evolution_Shell shell;
 
 	select_names = E_SELECT_NAMES_BONOBO (bonobo_object (servant));
 	priv = select_names->priv;
 
-	shell = bonobo_activation_activate_from_id  (
-		"OAFIID:GNOME_Evolution_Shell:" BASE_VERSION,
-		Bonobo_ACTIVATION_FLAG_EXISTING_ONLY,
-		NULL, ev);
-	if (BONOBO_EX (ev))
-		return;
-
-	shell_client = evolution_shell_client_new (shell);
-	e_select_names_manager_activate_dialog (priv->manager, shell_client,
-						section_id);
-	g_object_unref (shell_client);
-#endif
+	e_select_names_manager_activate_dialog (priv->manager, section_id);
 }