From ee467a65b12c7e063763b58157632e093dc86991 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 4 Sep 2002 19:33:15 +0000 Subject: 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 --- shell/e-shell-view.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shell/e-shell-view.h') diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 9df0089bfb..1b6697d558 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -87,7 +87,8 @@ EShellView *e_shell_view_new (EShell *shell); const GNOME_Evolution_ShellView e_shell_view_get_corba_interface (EShellView *view); gboolean e_shell_view_display_uri (EShellView *shell_view, - const char *uri); + const char *uri, + gboolean queue); void e_shell_view_show_shortcut_bar (EShellView *shell_view, gboolean show); -- cgit