evolution r35034 - trunk/shell

[sragavan svn gnome org]

Author: sragavan
Date: Sun Feb 17 20:25:38 2008
New Revision: 35034
URL: http://svn.gnome.org/viewvc/evolution?rev=35034&view=rev

Log:
2008-02-18  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bnc #159736. Patch from OpenSUSE.

	* e-shell-nm.c: (e_shell_network_monitor):




Modified:
   trunk/shell/ChangeLog
   trunk/shell/e-shell-nm.c

Modified: trunk/shell/e-shell-nm.c
==============================================================================
--- trunk/shell/e-shell-nm.c	(original)
+++ trunk/shell/e-shell-nm.c	Sun Feb 17 20:25:38 2008
@@ -64,11 +64,17 @@
 	DBusError error;
 	const char *object;
 	ShellLineStatus status;
-	EShellWindow *window = E_SHELL_WINDOW (user_data);
-	EShell *shell = e_shell_window_peek_shell ((EShellWindow *) user_data);
+	EShellWindow *window = NULL;
+	EShell *shell = NULL;
 	GNOME_Evolution_ShellState shell_state;
 	EShellLineStatus line_status;
 
+ 	if (!user_data || !E_IS_SHELL_WINDOW (user_data))
+ 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ 
+ 	window = E_SHELL_WINDOW (user_data);
+ 	shell = e_shell_window_peek_shell (window);
+
 	dbus_error_init (&error);
 	object = dbus_message_get_path (message);