callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix a crash if you start evolution with a bad URI.]

Browse Source 
2001-07-20  Jason Leach  <jleach@ximian.com>

	[Fix a crash if you start evolution with a bad URI.]

	* e-shell.c (e_shell_create_view): If we can't display the URI,
	display the default uri.  This is because it's necessary for
	e_shell_view_display_uri() to run all the way through so corba
	interfaces get setup.

	* e-shell-view.c (e_shell_view_display_uri): If we fail to create
	a new view for a URI (happens if you pass in an invalid URI), be
	sure to return FALSE.

svn path=/trunk/; revision=11290
This commit is contained in:
Jason Leach
2001-07-20 21:42:46 +00:00
committed by Jacob Leach
parent 5637adc2c0
commit dd6f646f8f
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
shell/ChangeLog
View File

@ -1,3 +1,16 @@
2001-07-20 Jason Leach <jleach@ximian.com>
[Fix a crash if you start evolution with a bad URI.]
* e-shell.c (e_shell_create_view): If we can't display the URI,
display the default uri. This is because it's necessary for
e_shell_view_display_uri() to run all the way through so corba
interfaces get setup.
* e-shell-view.c (e_shell_view_display_uri): If we fail to create
a new view for a URI (happens if you pass in an invalid URI), be
sure to return FALSE.
2001-07-20 Jason Leach <jleach@ximian.com>
[This is a better way to have "Local Folders" be shown as the

2
shell/e-shell-view.c
View File

@ -1875,7 +1875,7 @@ e_shell_view_display_uri (EShellView *shell_view,
if (control != NULL) {
g_assert (GTK_IS_WIDGET (control));
show_existing_view (shell_view, uri, control);
} else if (create_new_view_for_uri (shell_view, uri)) {
} else if (!create_new_view_for_uri (shell_view, uri)) {
cleanup_delayed_selection (shell_view);
priv->delayed_selection = g_strdup (uri);
gtk_signal_connect_after (GTK_OBJECT (e_shell_get_storage_set (priv->shell)), "new_folder",

3
shell/e-shell.c
View File

@ -938,7 +938,8 @@ e_shell_create_view (EShell *shell,
GTK_SIGNAL_FUNC (view_destroy_cb), shell);
if (uri != NULL)
e_shell_view_display_uri (E_SHELL_VIEW (view), uri);
if (!e_shell_view_display_uri (E_SHELL_VIEW (view), uri))
e_shell_view_display_uri (E_SHELL_VIEW (view), DEFAULT_URI);
shell->priv->views = g_list_prepend (shell->priv->views, view);