network-manager-applet r675 - in trunk: . src src/utils

[dcbw svn gnome org]

Author: dcbw
Date: Tue Apr 15 21:41:39 2008
New Revision: 675
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=675&view=rev

Log:
2008-04-15  Dan Williams  <dcbw redhat com>

	* src/ap-menu-item.c
	  src/applet-device-wireless.c
	  src/utils/utils.c
		- Replace IW_MODE_* with NM_802_11_MODE



Modified:
   trunk/ChangeLog
   trunk/src/ap-menu-item.c
   trunk/src/applet-device-wireless.c
   trunk/src/utils/utils.c

Modified: trunk/src/ap-menu-item.c
==============================================================================
--- trunk/src/ap-menu-item.c	(original)
+++ trunk/src/ap-menu-item.c	Tue Apr 15 21:41:39 2008
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <glib/gi18n.h>
 #include <string.h>
-#include "wireless-helper.h"
 
 #include <nm-utils.h>
 #include "ap-menu-item.h"
@@ -203,7 +202,7 @@
 	    || (rsn_flags != NM_802_11_AP_SEC_NONE))
 		encrypted = TRUE;
 
-	if (nm_access_point_get_mode (ap) == IW_MODE_ADHOC)
+	if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC)
 		adhoc = TRUE;
 
 	if (adhoc) {

Modified: trunk/src/applet-device-wireless.c
==============================================================================
--- trunk/src/applet-device-wireless.c	(original)
+++ trunk/src/applet-device-wireless.c	Tue Apr 15 21:41:39 2008
@@ -208,7 +208,7 @@
                      NMSetting8021x **s_8021x)
 {
 	NMSettingWirelessSecurity *sec;
-	int mode;
+	NM80211Mode mode;
 	guint32 flags;
 	guint32 wpa_flags;
 	guint32 rsn_flags;
@@ -242,7 +242,7 @@
 	}
 
 	/* Stuff after this point requires infrastructure */
-	if (mode != IW_MODE_INFRA) {
+	if (mode != NM_802_11_MODE_INFRA) {
 		*supported = FALSE;
 		goto none;
 	}
@@ -316,7 +316,7 @@
 	const GByteArray *ap_ssid;
 	char buf[33];
 	int buf_len;
-	int mode;
+	NM80211Mode mode;
 	guint32 dev_caps;
 	gboolean supported = TRUE;
 
@@ -332,9 +332,9 @@
 	g_byte_array_append (s_wireless->ssid, ap_ssid->data, ap_ssid->len);
 
 	mode = nm_access_point_get_mode (info->ap);
-	if (mode == IW_MODE_ADHOC)
+	if (mode == NM_802_11_MODE_ADHOC)
 		s_wireless->mode = g_strdup ("adhoc");
-	else if (mode == IW_MODE_INFRA)
+	else if (mode == NM_802_11_MODE_INFRA)
 		s_wireless->mode = g_strdup ("infrastructure");
 	else
 		g_assert_not_reached ();
@@ -582,7 +582,8 @@
 	NMAccessPoint * b = NM_ACCESS_POINT (tmpb);
 	const GByteArray * a_ssid;
 	const GByteArray * b_ssid;
-	int a_mode, b_mode, i;
+	NM80211Mode a_mode, b_mode;
+	int i;
 
 	if (a && !b)
 		return 1;
@@ -617,7 +618,7 @@
 	a_mode = nm_access_point_get_mode (a);
 	b_mode = nm_access_point_get_mode (b);
 	if (a_mode != b_mode) {
-		if (a_mode == IW_MODE_INFRA)
+		if (a_mode == NM_802_11_MODE_INFRA)
 			return 1;
 		return -1;
 	}
@@ -804,7 +805,7 @@
 	unsigned char md5_data[66];
 	unsigned char input[33];
 	const GByteArray * ssid;
-	int mode;
+	NM80211Mode mode;
 	guint32 flags, wpa_flags, rsn_flags;
 
 	g_return_val_if_fail (ap, NULL);
@@ -820,9 +821,9 @@
 	if (ssid)
 		memcpy (input, ssid->data, ssid->len);
 
-	if (mode == IW_MODE_INFRA)
+	if (mode == NM_802_11_MODE_INFRA)
 		input[32] |= (1 << 0);
-	else if (mode == IW_MODE_ADHOC)
+	else if (mode == NM_802_11_MODE_ADHOC)
 		input[32] |= (1 << 1);
 	else
 		input[32] |= (1 << 2);

Modified: trunk/src/utils/utils.c
==============================================================================
--- trunk/src/utils/utils.c	(original)
+++ trunk/src/utils/utils.c	Tue Apr 15 21:41:39 2008
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <netinet/ether.h>
 #include <glib.h>
-#include "wireless-helper.h"
 
 #include <nm-device-802-3-ethernet.h>
 #include <nm-device-802-11-wireless.h>
@@ -471,7 +470,7 @@
 	NMSettingWireless *s_wireless;
 	NMSettingWirelessSecurity *s_wireless_sec;
 	const GByteArray *ssid;
-	int mode;
+	NM80211Mode mode;
 	guint32 freq;
 
 	g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), FALSE);
@@ -497,10 +496,10 @@
 	mode = nm_access_point_get_mode (ap);
 	if (s_wireless->mode) {
 		if (   !strcmp (s_wireless->mode, "infrastructure")
-		    && (mode != IW_MODE_INFRA))
+		    && (mode != NM_802_11_MODE_INFRA))
 			return FALSE;
 		if (   !strcmp (s_wireless->mode, "adhoc")
-		    && (mode != IW_MODE_ADHOC))
+		    && (mode != NM_802_11_MODE_ADHOC))
 			return FALSE;
 	}