callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** Fixes bug #572962

Browse Source 
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.


svn path=/trunk/; revision=37320
This commit is contained in:
Matthew Barnes
2009-02-24 23:46:11 +00:00
committed by Matthew Barnes
parent c97a24c4a5
commit cfe3be08ff
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shell/ChangeLog
View File

@ -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

2
shell/e-shell-nm.c
View File

@ -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) {

10
shell/e-shell-window.c
View File

@ -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