evolution r36939 - trunk/shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Sun Dec 28 14:47:11 2008
New Revision: 36939
URL: http://svn.gnome.org/viewvc/evolution?rev=36939&view=rev

Log:
2008-12-28  Matthew Barnes  <mbarnes redhat com>

	** Related to bug #562155

	* shell/main.c (idle_cb):
	Only call e_shell_set_crash_recovery() if the EShell Bonobo object
	was constructed successfully, otherwise it will be NULL.  This fixes
	a warning shown in the terminal output of bug #562155, but the bug
	is not reproducible so it's not clear whether this fixes the bug.



Modified:
   trunk/shell/ChangeLog
   trunk/shell/main.c

Modified: trunk/shell/main.c
==============================================================================
--- trunk/shell/main.c	(original)
+++ trunk/shell/main.c	Sun Dec 28 14:47:11 2008
@@ -335,10 +335,10 @@
 		startup_line_mode = E_SHELL_STARTUP_LINE_MODE_OFFLINE;
 
 	shell = e_shell_new (startup_line_mode, &result);
-	e_shell_set_crash_recovery (shell, e_file_lock_exists ());
 
 	switch (result) {
 	case E_SHELL_CONSTRUCT_RESULT_OK:
+		e_shell_set_crash_recovery (shell, e_file_lock_exists ());
 		g_signal_connect (shell, "no_windows_left", G_CALLBACK (no_windows_left_cb), NULL);
 		g_object_weak_ref (G_OBJECT (shell), shell_weak_notify, NULL);
 		corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell));