Pass TRUE as @queue to e_shell_view_display_uri().

* e-shell.c (create_view): Pass TRUE as @queue to
e_shell_view_display_uri().

* e-shell-view-menu.c (command_activate_view): Pass TRUE as @queue
to e_shell_view_display_uri().
(goto_folder_dialog_folder_selected_cb): Likewise.

* e-shell-shared-folder-picker-dialog.c
(shared_folder_discovery_listener_callback): Pass TRUE as @queue
to e_shell_view_display_uri().

* e-shell-view.c
(display_uri): New arg @queue.  If true, it allows the
delayed_selection mechanism to happen transparently (returning
TRUE, while before it used to return FALSE).  Otherwise, refuse to
queue the URI and return FALSE.
(e_shell_view_display_uri): New arg @queue; pass it to
display_uri().
(handle_current_folder_removed): Pass TRUE as @queue to
e_shell_view_display_uri().
(set_folder_timeout): Likewise.
(switch_on_folder_tree_click): Likewise.
(activate_shortcut_cb): Likewise.
(corba_interface_change_current_view_cb): Likewise.
(socket_destroy_cb): Likewise.
(socket_destroy_cb): Likewise.
(e_shell_view_load_settings): Here, try displaying the old URI
with @queue set to FALSE; if this fails, display the default URI
and then invoke display again using @queue = TRUE so it gets
queued up.  This should fix #27721.

svn path=/trunk/; revision=17972

1 files changed, 1 insertions, 1 deletions

diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c
index e0ebf07345..830dbb3b9e 100644
--- a/shell/e-shell-shared-folder-picker-dialog.c
+++ b/shell/e-shell-shared-folder-picker-dialog.c
@@ -455,7 +455,7 @@ shared_folder_discovery_listener_callback (BonoboListener *listener,
 				   NULL);
 
 		if (discovery_data->parent != NULL)
-			e_shell_view_display_uri (parent, uri);
+			e_shell_view_display_uri (parent, uri, TRUE);
 		else
 			e_shell_create_view (shell, uri, NULL);
 	} else {