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

1 files changed, 6 insertions, 8 deletions

diff --git a/shell/e-shell.h b/shell/e-shell.h
index 818ba0233f..ef4bd8d709 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -108,14 +108,12 @@ EShell                *e_shell_new        (const char            *local_director
 					   EShellStartupLineMode  startup_line_mode,
 					   EShellConstructResult *construct_result_return);
 
-EShellView *e_shell_create_view                (EShell     *shell,
-						const char *uri,
-						EShellView *template_view);
-EShellView *e_shell_create_view_from_settings  (EShell     *shell,
-						const char *uri,
-						EShellView  *template_view,
-						int         view_num,
-						gboolean   *settings_found);
+EShellView *e_shell_create_view                        (EShell          *shell,
+							const char      *uri,
+							EShellView      *template_view);
+EShellView *e_shell_create_view_from_uri_and_settings  (EShell          *shell,
+							const char      *uri,
+							int              view_num);
 
 const char          *e_shell_get_local_directory       (EShell          *shell);
 EShortcuts          *e_shell_get_shortcuts             (EShell          *shell);