diff options
| -rw-r--r-- | shell/ChangeLog | 11 | ||||
| -rw-r--r-- | shell/e-shell-nm.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-window.c | 10 |
3 files changed, 16 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index f98b053b31..e83129facc 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,14 @@ +2009-02-24 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes bug #572962 + + * e-shell-window.c (setup_nm_support): + Pass e_shell_dbus_initialise() the right type of object, + and fix the incorrect function declaration. + + * e-shell-nm.c (e_shell_network_monitor): + Go offline when we see NM_STATE_ASLEEP from NetworkManager. + 2009-02-03 Tor Lillqvist <tml@novell.com> * Makefile.am (evolution_LDFLAGS): Use -mwindows on Windows to diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c index e1d962fe89..5162aa5fea 100644 --- a/shell/e-shell-nm.c +++ b/shell/e-shell-nm.c @@ -91,7 +91,7 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED, line_status = e_shell_get_line_status (shell); - if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == NM_STATE_DISCONNECTED) { + if (line_status == E_SHELL_LINE_STATUS_ONLINE && (state == NM_STATE_ASLEEP || state == NM_STATE_DISCONNECTED)) { shell_state = GNOME_Evolution_FORCED_OFFLINE; e_shell_set_line_status (shell, shell_state); } else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && state == NM_STATE_CONNECTED) { diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index c533967c77..5319acb3d2 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -54,7 +54,7 @@ #include <string.h> #if NM_SUPPORT -gboolean e_shell_dbus_initialise (EShellWindow *window); +gboolean e_shell_dbus_initialise (EShell *shell); #endif /* A view for each component. These are all created when EShellWindow is @@ -574,11 +574,9 @@ setup_statusbar_notebook (EShellWindow *window) static void setup_nm_support (EShellWindow *window) { - #ifdef NM_SUPPORT_GLIB - e_shell_nm_glib_initialise (window); - #elif NM_SUPPORT - e_shell_dbus_initialise (window); - #endif +#if NM_SUPPORT + e_shell_dbus_initialise (window->priv->shell.eshell); +#endif } static void |