Remove folder-selector button initialization. (e_select_names_new):

	* gui/component/select-names/e-select-names.c
	(e_select_names_init): Remove folder-selector button
	initialization.
	(e_select_names_new): Initialize folder-selector button here,
	using the passed-in EvolutionShellClient rather than depending on
	a global variable.

	* gui/component/select-names/e-select-names-manager.c
	(e_select_names_manager_activate_dialog): take an
	EvolutionShellClient and pass it to e_select_names_new().

	* gui/component/select-names/e-select-names-bonobo.c
	(impl_SelectNames_activate_dialog): get a pointer to the shell
	from bonobo-activation, create a shell_client, and pass it to
	e_select_names_manager_activate_dialog.

svn path=/trunk/; revision=20597

1 files changed, 18 insertions, 1 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 c98af87683..0f18614c1a 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -27,13 +27,18 @@
 #include "e-select-names-bonobo.h"
 #include "e-simple-card-bonobo.h"
 
+#include <bonobo-activation/bonobo-activation-activate.h>
+
 #include <bonobo/bonobo-property-bag.h>
 #include <bonobo/bonobo-control.h>
+#include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-event-source.h>
 
 #include <gal/util/e-util.h>
 #include <gal/e-text/e-entry.h>
 
+#include "evolution-shell-client.h"
+
 #include "Evolution-Addressbook-SelectNames.h"
 
 #include "e-select-names-manager.h"
@@ -359,11 +364,23 @@ impl_SelectNames_activate_dialog (PortableServer_Servant servant,
 {
 	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;
 
-	e_select_names_manager_activate_dialog (priv->manager, section_id);
+	shell = bonobo_activation_activate_from_id  (
+		"OAFIID:GNOME_Evolution_Shell",
+		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);
 }