From cb8fd3a3304144f2d6c6c9842d00af6ac9ec3910 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 31 Mar 2003 15:43:49 +0000 Subject: 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 --- addressbook/gui/component/select-names/e-select-names-manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/component/select-names/e-select-names-manager.c') diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c index 98e1ff5a2c..b53cf924f2 100644 --- a/addressbook/gui/component/select-names/e-select-names-manager.c +++ b/addressbook/gui/component/select-names/e-select-names-manager.c @@ -476,9 +476,8 @@ db_listener (EConfigListener *db, const char *key, /** * e_select_names_manager_new: - * @VCard: a string in vCard format * - * Returns: a new #ESelectNamesManager that wraps the @VCard. + * Returns: a new #ESelectNamesManager */ ESelectNamesManager * e_select_names_manager_new (void) @@ -605,6 +604,7 @@ clear_widget (gpointer data, GObject *where_object_was) void e_select_names_manager_activate_dialog (ESelectNamesManager *manager, + EvolutionShellClient *shell_client, const char *id) { g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager)); @@ -621,7 +621,7 @@ e_select_names_manager_activate_dialog (ESelectNamesManager *manager, GList *iter; - manager->names = E_SELECT_NAMES (e_select_names_new ()); + manager->names = E_SELECT_NAMES (e_select_names_new (shell_client)); for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) { ESelectNamesManagerSection *section = iter->data; -- cgit v1.2.3