aboutsummaryrefslogtreecommitdiffstats
path: root/shell/main.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-04-08 23:30:02 +0800
committerDan Winship <danw@src.gnome.org>2002-04-08 23:30:02 +0800
commitc357c638049b6a83ec05fa95f236818e8d0528e5 (patch)
tree281935c79bbdb701d2a307d186dd7442701d69cb /shell/main.c
parent851c96fac4f9a670dc260fddc9aeaf675aeb2227 (diff)
downloadgsoc2013-evolution-c357c638049b6a83ec05fa95f236818e8d0528e5.tar.gz
gsoc2013-evolution-c357c638049b6a83ec05fa95f236818e8d0528e5.tar.zst
gsoc2013-evolution-c357c638049b6a83ec05fa95f236818e8d0528e5.zip
Fix "evolution evolution:/path/to/folder" to use default view
prefs. * e-shell.c (impl_Shell_createNewView): Use e_shell_create_view_from_uri_and_settings to create the new view based on saved view 0 instead of always using the initial evolution defaults. (e_shell_create_view_from_uri_and_settings): Renamed and simplified; the template_view argument was useless and settings_found would always be set to TRUE in the context it was being used it. (e_shell_restore_from_settings): Simplify for e_shell_create_view_from_uri_and_settings changes. * e-shell-view.c (e_shell_view_load_settings): Only load the DisplayedURI if the view isn't already displaying a URI. Also, pass an &ev to the first bonobo_config_get_long so we can tell if it failed and bail out. * e-shell-view.h: Remove a prototype for a non-existent function (e_shell_view_remove_control_for_uri). * main.c (idle_cb): Add some comments here and remove some dead code. svn path=/trunk/; revision=16389
Diffstat (limited to 'shell/main.c')
-rw-r--r--shell/main.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/shell/main.c b/shell/main.c
index 0775904fbf..48bce215d3 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -247,11 +247,19 @@ idle_cb (void *data)
}
if (shell == NULL) {
+ /* We're talking to a remote shell. If the user didn't
+ * ask us to open any particular URI, then open another
+ * view of the default URI
+ */
if (uri_list == NULL)
display_default = TRUE;
else
display_default = FALSE;
} else {
+ /* We're starting a new shell. If the user didn't specify
+ * any evolution: URIs to view, AND we can't load the
+ * user's previous settings, then show the default URI.
+ */
if (! have_evolution_uri) {
if (! e_shell_restore_from_settings (shell))
display_default = TRUE;
@@ -278,9 +286,6 @@ idle_cb (void *data)
GNOME_Evolution_Shell_handleURI (corba_shell, uri, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
g_warning ("CORBA exception %s when requesting URI -- %s", ev._repo_id, uri);
-
- if (strncmp (uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0)
- have_evolution_uri = TRUE;
}
g_slist_free (uri_list);