diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-10-17 13:18:16 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-10-17 13:18:16 +0800 |
| commit | 5ce1bbbbc83a42532b43788839321f2fac831dd1 (patch) | |
| tree | 6ce21ed58818c88c5a99f1ac8a76a5b6166035ce /shell/e-shell-window.c | |
| parent | 0803e3551c2d5ee774addba722d5d287bf2c689d (diff) | |
| download | gsoc2013-evolution-5ce1bbbbc83a42532b43788839321f2fac831dd1.tar gsoc2013-evolution-5ce1bbbbc83a42532b43788839321f2fac831dd1.tar.gz gsoc2013-evolution-5ce1bbbbc83a42532b43788839321f2fac831dd1.tar.bz2 gsoc2013-evolution-5ce1bbbbc83a42532b43788839321f2fac831dd1.tar.lz gsoc2013-evolution-5ce1bbbbc83a42532b43788839321f2fac831dd1.tar.xz gsoc2013-evolution-5ce1bbbbc83a42532b43788839321f2fac831dd1.tar.zst gsoc2013-evolution-5ce1bbbbc83a42532b43788839321f2fac831dd1.zip | |
Matthew Barnes <mbarnes@redhat.com> ** Fix for bug #548469 (Drop support for deprecated libnm-glib).
svn path=/trunk/; revision=36631
Diffstat (limited to 'shell/e-shell-window.c')
| -rw-r--r-- | shell/e-shell-window.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index f857390070..f2eb6bf86d 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -53,12 +53,8 @@ #include <string.h> -#ifdef NM_SUPPORT_GLIB -gboolean e_shell_nm_glib_initialise (EShellWindow *window); -void e_shell_nm_glib_dispose (EShellWindow *window); -#elif NM_SUPPORT +#if NM_SUPPORT gboolean e_shell_dbus_initialise (EShellWindow *window); -void e_shell_dbus_dispose (EShellWindow *window); #endif /* A view for each component. These are all created when EShellWindow is @@ -477,19 +473,24 @@ sidebar_button_pressed_callback (ESidebar *sidebar, static void offline_toggle_clicked_cb (EShellWindow *window) { - EShellWindowPrivate *priv = window->priv; + EShell *shell; + GNOME_Evolution_ShellState shell_state; - switch (e_shell_get_line_status (priv->shell.eshell)) { + shell = window->priv->shell.eshell; + + switch (e_shell_get_line_status (shell)) { case E_SHELL_LINE_STATUS_ONLINE: - e_shell_go_offline (priv->shell.eshell, window, GNOME_Evolution_USER_OFFLINE); + shell_state = GNOME_Evolution_USER_OFFLINE; break; case E_SHELL_LINE_STATUS_OFFLINE: case E_SHELL_LINE_STATUS_FORCED_OFFLINE: - e_shell_go_online (priv->shell.eshell, window, GNOME_Evolution_USER_ONLINE); + shell_state = GNOME_Evolution_USER_ONLINE; break; default: g_return_if_reached(); } + + e_shell_set_line_status (shell, shell_state); } static void @@ -853,12 +854,6 @@ impl_dispose (GObject *object) store_window_size (GTK_WIDGET (self)); } - #ifdef NM_SUPPORT_GLIB - e_shell_nm_glib_dispose (E_SHELL_WINDOW (object)); - #elif NM_SUPPORT - e_shell_dbus_dispose (E_SHELL_WINDOW (object)); - #endif - (* G_OBJECT_CLASS (e_shell_window_parent_class)->dispose) (object); } |