network-manager-applet r654 - in trunk: . src

[tambeti svn gnome org]

Author: tambeti
Date: Tue Apr  8 12:34:41 2008
New Revision: 654
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=654&view=rev

Log:
2008-04-08  Tambet Ingo  <tambet gmail com>

	* src/applet-device-cdma.c (add_disconnect_item):
	* src/applet-device-gsm.c (add_disconnect_item): Update to check the new
	device states.


Modified:
   trunk/ChangeLog
   trunk/src/applet-device-cdma.c
   trunk/src/applet-device-gsm.c

Modified: trunk/src/applet-device-cdma.c
==============================================================================
--- trunk/src/applet-device-cdma.c	(original)
+++ trunk/src/applet-device-cdma.c	Tue Apr  8 12:34:41 2008
@@ -186,10 +186,11 @@
 	CdmaMenuItemInfo *info;
 
 	state = nm_device_get_state (device);
-	if (   state == NM_DEVICE_STATE_DOWN
-	    || state == NM_DEVICE_STATE_DISCONNECTED
-	    || state == NM_DEVICE_STATE_FAILED
-	    || state == NM_DEVICE_STATE_CANCELLED)
+	if (!(state == NM_DEVICE_STATE_ACTIVATED || /* activated */
+	      state == NM_DEVICE_STATE_PREPARE ||   /* or activating */
+	      state == NM_DEVICE_STATE_CONFIG ||
+	      state == NM_DEVICE_STATE_NEED_AUTH ||
+	      state == NM_DEVICE_STATE_IP_CONFIG))
 		return;
 
 	item = gtk_menu_item_new_with_label (_("Disconnect..."));

Modified: trunk/src/applet-device-gsm.c
==============================================================================
--- trunk/src/applet-device-gsm.c	(original)
+++ trunk/src/applet-device-gsm.c	Tue Apr  8 12:34:41 2008
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
 /* NetworkManager Wireless Applet -- Display wireless access points and allow user control
  *
  * Dan Williams <dcbw redhat com>
@@ -186,10 +187,11 @@
 	GSMMenuItemInfo *info;
 
 	state = nm_device_get_state (device);
-	if (   state == NM_DEVICE_STATE_DOWN
-	    || state == NM_DEVICE_STATE_DISCONNECTED
-	    || state == NM_DEVICE_STATE_FAILED
-	    || state == NM_DEVICE_STATE_CANCELLED)
+	if (!(state == NM_DEVICE_STATE_ACTIVATED || /* activated */
+	      state == NM_DEVICE_STATE_PREPARE ||   /* or activating */
+	      state == NM_DEVICE_STATE_CONFIG ||
+	      state == NM_DEVICE_STATE_NEED_AUTH ||
+	      state == NM_DEVICE_STATE_IP_CONFIG))
 		return;
 
 	item = gtk_menu_item_new_with_label (_("Disconnect..."));