diff options
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/e-shell-nm.c | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index e21b43f39e..f4c0a938d3 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2008-02-18 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bnc #159736. Patch from OpenSUSE. + + * e-shell-nm.c: (e_shell_network_monitor): + 2008-02-13 Matthew Barnes <mbarnes@redhat.com> * main.c (kill_dataserver): diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index de06ed2d8a..d973a26b22 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -64,11 +64,17 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, 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); |