diff -r d9ec2b8c6bad -r 2fbd1d709fe7 wlanutilities/wlanqtutilities/traces/trace.properties
--- a/wlanutilities/wlanqtutilities/traces/trace.properties	Wed Jun 23 19:25:42 2010 +0300
+++ b/wlanutilities/wlanqtutilities/traces/trace.properties	Tue Jul 06 15:29:22 2010 +0300
@@ -1,30 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <trace_properties>
-    <enum name="ConfId">
-        <value id="0">ConfIdSsid</value>
-        <value id="1">ConfIdSignalStrength</value>
-        <value id="2">ConfIdConnectionMode</value>
-        <value id="3">ConfIdSecurityMode</value>
-        <value id="4">ConfIdWpaPskUse</value>
-        <value id="5">ConfIdWpaPsk</value>
-        <value id="6">ConfIdWepKey1</value>
-        <value id="7">ConfIdWepKey2</value>
-        <value id="8">ConfIdWepKey3</value>
-        <value id="9">ConfIdWepKey4</value>
-        <value id="10">ConfIdWepDefaultIndex</value>
-        <value id="11">ConfIdHidden</value>
-        <value id="12">ConfIdWpsSupported</value>
-
-        <value id="100">ConfIdIapId</value>
-        <value id="101">ConfIdName</value>
-        <value id="102">ConfIdNetworkId</value>
-    </enum>
     <enum name="ConnStatus">
         <value id="0">ConnStatusNone</value>
         <value id="1">ConnStatusConnecting</value>
         <value id="2">ConnStatusConnected</value>
         <value id="3">ConnStatusDisconnected</value>
     </enum>
+    <enum name="ScanStatus">
+        <value id="0">ScanStatusOk</value>
+        <value id="1">ScanStatusCancelled</value>
+        <value id="2">ScanStatusError</value>
+    </enum>
+    <enum name="IctStatus">
+    	<value id="0">IctPassed</value>
+    	<value id="1">IctHotspotPassed</value>
+    	<value id="2">IctCancelled</value>
+    	<value id="3">IctFailed</value>
+    </enum>
+    <!-- These come from cmmanagerdefines_shim.h -->
+    <enum name="WlanSecMode">
+        <value id="1">WlanSecModeOpen</value>
+        <value id="2">WlanSecModeWep</value>
+        <value id="4">WlanSecMode802_1x</value>
+        <value id="8">WlanSecModeWpa</value>
+        <value id="16">WlanSecModeWpa2</value>
+        <value id="32">WlanSecModeWapi</value>
+    </enum>
+    <!-- These come from cmmanagerdefines_shim.h -->
+    <enum name="WlanConnMode">
+        <value id="0">Adhoc</value>
+        <value id="1">Infra</value>
+    </enum>
     <!-- These come from rconnmon.h -->
     <enum name="ConnMonEvent">
 	    <value id="1">EConnMonCreateConnection</value>