evolution r37320 - trunk/shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue Feb 24 23:46:11 2009
New Revision: 37320
URL: http://svn.gnome.org/viewvc/evolution?rev=37320&view=rev

Log:
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.



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

Modified: trunk/shell/e-shell-nm.c
==============================================================================
--- trunk/shell/e-shell-nm.c	(original)
+++ trunk/shell/e-shell-nm.c	Tue Feb 24 23:46:11 2009
@@ -91,7 +91,7 @@
 
 	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) {

Modified: trunk/shell/e-shell-window.c
==============================================================================
--- trunk/shell/e-shell-window.c	(original)
+++ trunk/shell/e-shell-window.c	Tue Feb 24 23:46:11 2009
@@ -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 @@
 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