evolution r35420 - trunk/shell

[msuman svn gnome org]

Author: msuman
Date: Sat Apr 26 14:46:21 2008
New Revision: 35420
URL: http://svn.gnome.org/viewvc/evolution?rev=35420&view=rev

Log:
Patch from James Westby  <jw+debian jameswestby net>: Fix for bug #518103 (Check online status from NetworkManager at startup instead of using the last-used-state)

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

Modified: trunk/shell/e-shell-nm-glib.c
==============================================================================
--- trunk/shell/e-shell-nm-glib.c	(original)
+++ trunk/shell/e-shell-nm-glib.c	Sat Apr 26 14:46:21 2008
@@ -49,7 +49,7 @@
 	if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == LIBNM_NO_NETWORK_CONNECTION) {
 	   	 shell_state = GNOME_Evolution_FORCED_OFFLINE;
 		 e_shell_go_offline (shell, window, shell_state);
-	} else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) {
+	} else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) {
 	       	 shell_state = GNOME_Evolution_USER_ONLINE;
 		 e_shell_go_online (shell, window, shell_state);
 	}

Modified: trunk/shell/e-shell-nm.c
==============================================================================
--- trunk/shell/e-shell-nm.c	(original)
+++ trunk/shell/e-shell-nm.c	Sat Apr 26 14:46:21 2008
@@ -104,7 +104,7 @@
 	if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) {
 		  shell_state = GNOME_Evolution_FORCED_OFFLINE;
 		  e_shell_go_offline (shell, window, shell_state);
-	} else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && status == E_SHELL_LINE_UP) {
+	} else if (line_status == E_SHELL_LINE_STATUS_FORCED_OFFLINE && status == E_SHELL_LINE_UP) {
 		  shell_state = GNOME_Evolution_USER_ONLINE;
 		  e_shell_go_online (shell, window, shell_state);
 	}

Modified: trunk/shell/e-shell.c
==============================================================================
--- trunk/shell/e-shell.c	(original)
+++ trunk/shell/e-shell.c	Sat Apr 26 14:46:21 2008
@@ -717,7 +717,7 @@
 	if (start_online)
 		e_shell_go_online (shell, NULL, GNOME_Evolution_USER_ONLINE);
 	else
-		e_shell_go_online (shell, NULL, GNOME_Evolution_FORCED_OFFLINE);
+		e_shell_go_online (shell, NULL, GNOME_Evolution_USER_OFFLINE);
 
 	return E_SHELL_CONSTRUCT_RESULT_OK;
 }