2008-04-15 Dan Williams <dcbw@redhat.com>

	Remove exposure of wireless-tools mode types in the API.

	* include/NetworkManager.h
		- Define NM80211Mode enum

	* introspection/generic-types.xml
		- Describe NM_802_11_MODE enum
		- Remove IW_MODE_* enum

	* introspection/nm-access-point.xml
	  libnm-glib/nm-access-point.c
	  libnm-glib/nm-access-point.h
		- 'mode' is now of type NM80211Mode, a DBUS_TYPE_UINT

	* introspection/nm-device-802-11-wireless.xml
	  libnm-glib/nm-device-802-11-wireless.c
	  libnm-glib/nm-device-802-11-wireless.h
		- 'mode' is now of type NM80211Mode, a DBUS_TYPE_UINT

	* libnm-util/nm-setting-wireless.c
	  src/NetworkManagerAP.c
	  src/NetworkManagerAP.h
	  src/nm-device-802-11-wireless.c
	  src/nm-device-802-11-wireless.h
	  test/nm-tool.c
		- Use NM80211Mode not IW_MODE_*



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3562 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

3 files changed, 7 insertions, 19 deletions

diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml
index 9a9cf904e8..1a9e316959 100644
--- a/introspection/generic-types.xml
+++ b/introspection/generic-types.xml
@@ -20,28 +20,16 @@
       <tp:member type="a{sv}" name="Value" tp:type="String_Variant_Map"/>
   </tp:mapping>
 
-  <tp:enum name="IW_MODE" type="i">
+  <tp:enum name="NM_802_11_MODE" type="u">
     <tp:docstring></tp:docstring>
-    <tp:enumvalue suffix="AUTO" value="0">
-      <tp:docstring>Automatic mode controlled by the driver.</tp:docstring>
+    <tp:enumvalue suffix="UNKNOWN" value="0">
+      <tp:docstring>Mode is unknown.</tp:docstring>
     </tp:enumvalue>
     <tp:enumvalue suffix="ADHOC" value="1">
-      <tp:docstring>Single cell network.</tp:docstring>
+      <tp:docstring>Uncoordinated network without central infrastructure.</tp:docstring>
     </tp:enumvalue>
     <tp:enumvalue suffix="INFRA" value="2">
-      <tp:docstring>Multi cell network, roaming.</tp:docstring>
-    </tp:enumvalue>
-    <tp:enumvalue suffix="MASTER" value="3">
-      <tp:docstring>Synchronisation master or Access Point.</tp:docstring>
-    </tp:enumvalue>
-    <tp:enumvalue suffix="REPEAT" value="4">
-      <tp:docstring>Wireless Repeater (forwarder).</tp:docstring>
-    </tp:enumvalue>
-    <tp:enumvalue suffix="SECOND" value="5">
-      <tp:docstring>Secondary master/repeater (backup).</tp:docstring>
-    </tp:enumvalue>
-    <tp:enumvalue suffix="MONITOR" value="6">
-      <tp:docstring>Passive monitor (listen only).</tp:docstring>
+      <tp:docstring>Coordinated network with one or more central controllers.</tp:docstring>
     </tp:enumvalue>
   </tp:enum>
 </tp:generic-types>
diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml
index a10d1318aa..5a42f9552f 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/nm-access-point.xml
@@ -21,7 +21,7 @@
       <tp:docstring>The hardware address of the access point.</tp:docstring>
     </property>
 
-    <property name="Mode" type="i" access="read" tp:type="IW_MODE">
+    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
       <tp:docstring>Describes the operating mode of the access point.</tp:docstring>
     </property>
     <property name="MaxBitrate" type="u" access="read">
diff --git a/introspection/nm-device-802-11-wireless.xml b/introspection/nm-device-802-11-wireless.xml
index 0da3361382..6b31b3a83d 100644
--- a/introspection/nm-device-802-11-wireless.xml
+++ b/introspection/nm-device-802-11-wireless.xml
@@ -19,7 +19,7 @@
         The hardware address of the device.
       </tp:docstring>
     </property>
-    <property name="Mode" type="i" access="read" tp:type="IW_MODE">
+    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
       <tp:docstring>
         The operating mode of the wireless device.
       </tp:docstring>