Fix a bug in `evolution_shell_client_user_select_folder()' that could

cause the function to return without assigning any value to the "out"
parameters.

svn path=/trunk/; revision=7190

shell/ChangeLog

@@ -1,3 +1,9 @@
+2000-12-28  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* evolution-shell-client.c (user_select_folder): Make sure the
+	`*uri_return' and `*physical_uri_return' are always initialized on
+	return, as that's what the caller expects.
+
 2000-12-23  Jason Leach  <jasonleach@usa.net>
 
 	* e-shell-view-menu.c (command_run_bugbuddy): Fix a crash when the

shell/evolution-shell-client.c

@@ -176,6 +176,11 @@ user_select_folder (EvolutionShellClient *shell_client,
 
 	result = NULL;
 
+	if (uri_return != NULL)
+		*uri_return = NULL;
+	if (physical_uri_return != NULL)
+		*physical_uri_return = NULL;
+
 	listener_interface = create_folder_selection_listener_interface (&result, uri_return, 
 									 physical_uri_return);
 	if (listener_interface == CORBA_OBJECT_NIL)
@@ -192,17 +197,11 @@ user_select_folder (EvolutionShellClient *shell_client,
 	corba_type_list._buffer  = (CORBA_char **) possible_types;
 
 	GNOME_Evolution_Shell_selectUserFolder (corba_shell, listener_interface,
-					    title, default_folder, &corba_type_list,
-					    &ev);
+						title, default_folder, &corba_type_list,
+						&ev);
 
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
-
-		if (uri_return != NULL)
-			*uri_return = NULL;
-		if (physical_uri_return != NULL)
-			*physical_uri_return = NULL;
-
 		return;
 	}