[kismac] [binaervarianz] r102 - in KisMACng: . KisMAC.xcodeproj Sources/Controller Sources/Core Sources/Obsolete Sources/Preferences/PreferencePanes Sources/Views Sources/WaveDrivers Subprojects/BIGL Subprojects/BIGL/BIGL.xcodeproj Subprojects/BIGeneric Subprojects/BIGeneric/BIGeneric.xcodeproj Subprojects/KisMAC Installer Subprojects/KisMAC Installer/English.lproj/MainMenu.nib Subprojects/KisMAC Installer/KisMAC Installer.xcodeproj Subprojects/MACJack

  • From: svn@xxxxxxxxxxxxxxxx
  • To: kismac@xxxxxxxxxxxxx
  • Date: Tue, 14 Mar 2006 19:35:22 +0100

Author: mick
Date: 2006-03-14 19:35:22 +0100 (Tue, 14 Mar 2006)
New Revision: 102

Added:
   KisMACng/Subprojects/KisMAC Installer/airportExtreme.png
Modified:
   KisMACng/CHANGES
   KisMACng/KisMAC.xcodeproj/mick.mode1
   KisMACng/KisMAC.xcodeproj/mick.pbxuser
   KisMACng/Sources/Controller/GrowlController.h
   KisMACng/Sources/Controller/GrowlController.m
   KisMACng/Sources/Controller/ScanController.m
   KisMACng/Sources/Controller/ScanControllerMenus.m
   KisMACng/Sources/Controller/ScanControllerPrivate.h
   KisMACng/Sources/Controller/ScanControllerPrivate.m
   KisMACng/Sources/Core/WaveHelper.m
   KisMACng/Sources/Obsolete/ValuePair.m
   KisMACng/Sources/Preferences/PreferencePanes/PrefsDriver.m
   KisMACng/Sources/Views/MapView.m
   KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.h
   KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m
   KisMACng/Subprojects/BIGL/BIGL.h
   KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.mode1
   KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.pbxuser
   KisMACng/Subprojects/BIGL/BIGLView.h
   KisMACng/Subprojects/BIGL/BIGLView.m
   KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.mode1
   KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.pbxuser
   KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/project.pbxproj
   KisMACng/Subprojects/BIGeneric/BIZoomView.m
   KisMACng/Subprojects/KisMAC Installer/English.lproj/MainMenu.nib/classes.nib
   KisMACng/Subprojects/KisMAC Installer/English.lproj/MainMenu.nib/info.nib
   KisMACng/Subprojects/KisMAC 
Installer/English.lproj/MainMenu.nib/keyedobjects.nib
   KisMACng/Subprojects/KisMAC Installer/InstallController.h
   KisMACng/Subprojects/KisMAC Installer/InstallController.m
   KisMACng/Subprojects/KisMAC Installer/KisMAC Installer.xcodeproj/mick.mode1
   KisMACng/Subprojects/KisMAC Installer/KisMAC Installer.xcodeproj/mick.pbxuser
   KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/project.pbxproj
   KisMACng/Subprojects/MACJack/MACJackCard.cpp
   KisMACng/compile.command
Log:
- improved permanent airport extreme enabling & installing (even more, was a 
parallel dev with geoffs :/)
- including removal
- fixed serveral small bugs
- added new "build system"



Modified: KisMACng/CHANGES
===================================================================
--- KisMACng/CHANGES    2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/CHANGES    2006-03-14 18:35:22 UTC (rev 102)
@@ -1,3 +1,10 @@
+R102: - improved permanent airport extreme enabling & installing (even more)
+         - including removal
+         - fixed serveral small bugs
+         - added new "build system"
+
+R101: - changes in spanish translation
+
 R100:  This is a big commit, a present for R100.  
        -Added Client IP Address detection.  I need to think about ways to 
detect the ip of the ap if possible.
               --Fixed bug in existing sourceIPAsString() where we were adding 
sizeof(WLFrame) to the value instead of to the pointer.

Modified: KisMACng/KisMAC.xcodeproj/mick.mode1
===================================================================
--- KisMACng/KisMAC.xcodeproj/mick.mode1        2006-03-14 17:28:02 UTC (rev 
101)
+++ KisMACng/KisMAC.xcodeproj/mick.mode1        2006-03-14 18:35:22 UTC (rev 
102)
@@ -185,7 +185,48 @@
        <key>Notifications</key>
        <array/>
        <key>OpenEditors</key>
-       <array/>
+       <array>
+               <dict>
+                       <key>Content</key>
+                       <dict>
+                               <key>PBXProjectModuleGUID</key>
+                               <string>00D563E109C4948100FB787B</string>
+                               <key>PBXProjectModuleLabel</key>
+                               <string>WaveHelper.m</string>
+                               <key>PBXSplitModuleInNavigatorKey</key>
+                               <dict>
+                                       <key>Split0</key>
+                                       <dict>
+                                               <key>PBXProjectModuleGUID</key>
+                                               
<string>00D563E209C4948100FB787B</string>
+                                               <key>PBXProjectModuleLabel</key>
+                                               <string>WaveHelper.m</string>
+                                               <key>_historyCapacity</key>
+                                               <integer>20</integer>
+                                               <key>bookmark</key>
+                                               
<string>00D5669009C73D6300FB787B</string>
+                                               <key>history</key>
+                                               <array>
+                                                       
<string>00D563E309C4948100FB787B</string>
+                                               </array>
+                                       </dict>
+                                       <key>SplitCount</key>
+                                       <string>1</string>
+                               </dict>
+                               <key>StatusBarVisibility</key>
+                               <true/>
+                       </dict>
+                       <key>Geometry</key>
+                       <dict>
+                               <key>Frame</key>
+                               <string>{{0, 20}, {750, 698}}</string>
+                               <key>PBXModuleWindowStatusBarHidden2</key>
+                               <false/>
+                               <key>RubberWindowFrame</key>
+                               <string>15 88 750 739 0 0 1280 832 </string>
+                       </dict>
+               </dict>
+       </array>
        <key>PerspectiveWidths</key>
        <array>
                <integer>-1</integer>
@@ -258,7 +299,8 @@
                                                        <array>
                                                                
<string>29B97314FDCFA39411CA2CEA</string>
                                                                
<string>080E96DDFE201D6D7F000001</string>
-                                                               
<string>003533A406A5DD8500AB4577</string>
+                                                               
<string>003533DA06A5DD8500AB4577</string>
+                                                               
<string>003533DB06A5DD8500AB4577</string>
                                                                
<string>003533FE06A5DD8500AB4577</string>
                                                                
<string>29B97317FDCFA39411CA2CEA</string>
                                                                
<string>1C37FBAC04509CD000000102</string>
@@ -266,8 +308,9 @@
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       
<integer>32</integer>
-                                                                       
<integer>27</integer>
+                                                                       
<integer>16</integer>
+                                                                       
<integer>12</integer>
+                                                                       
<integer>11</integer>
                                                                        
<integer>3</integer>
                                                                        
<integer>0</integer>
                                                                </array>
@@ -312,7 +355,7 @@
                                                                
<key>PBXProjectModuleGUID</key>
                                                                
<string>1CE0B20306471E060097A5F4</string>
                                                                
<key>PBXProjectModuleLabel</key>
-                                                               
<string>MapView.m</string>
+                                                               
<string>PrefsDriver.m</string>
                                                                
<key>PBXSplitModuleInNavigatorKey</key>
                                                                <dict>
                                                                        
<key>Split0</key>
@@ -320,65 +363,59 @@
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CE0B20406471E060097A5F4</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>MapView.m</string>
+                                                                               
<string>PrefsDriver.m</string>
                                                                                
<key>_historyCapacity</key>
                                                                                
<integer>20</integer>
                                                                                
<key>bookmark</key>
-                                                                               
<string>0042E7E309C0CB8100183F90</string>
+                                                                               
<string>00D5668F09C73D6300FB787B</string>
                                                                                
<key>history</key>
                                                                                
<array>
-                                                                               
        <string>0076352E09A26CAB002A5BEF</string>
-                                                                               
        <string>0076352F09A26CAB002A5BEF</string>
-                                                                               
        <string>0076353009A26CAB002A5BEF</string>
-                                                                               
        <string>0076353109A26CAB002A5BEF</string>
-                                                                               
        <string>0076353209A26CAB002A5BEF</string>
-                                                                               
        <string>0076353709A26CAB002A5BEF</string>
-                                                                               
        <string>0076353809A26CAC002A5BEF</string>
-                                                                               
        <string>0076353909A26CAC002A5BEF</string>
-                                                                               
        <string>0093D18409B0744F0046F830</string>
-                                                                               
        <string>0093D1CF09B085CB0046F830</string>
-                                                                               
        <string>0093D1D009B085CB0046F830</string>
-                                                                               
        <string>0093D1DA09B086220046F830</string>
-                                                                               
        <string>0042E78809C0C7D700183F90</string>
-                                                                               
        <string>0042E78909C0C7D700183F90</string>
-                                                                               
        <string>0042E7BD09C0C97A00183F90</string>
-                                                                               
        <string>0042E7DA09C0CB4500183F90</string>
-                                                                               
        <string>0042E7DB09C0CB4500183F90</string>
+                                                                               
        <string>00D5633809C47AA400FB787B</string>
+                                                                               
        <string>00D5633909C47AA400FB787B</string>
+                                                                               
        <string>00D5633A09C47AA400FB787B</string>
+                                                                               
        <string>00D5638009C4834000FB787B</string>
+                                                                               
        <string>00D5638109C4834000FB787B</string>
+                                                                               
        <string>00D5638209C4834000FB787B</string>
+                                                                               
        <string>00D5638309C4834000FB787B</string>
+                                                                               
        <string>00D5638409C4834000FB787B</string>
+                                                                               
        <string>00D5638509C4834000FB787B</string>
+                                                                               
        <string>00D563DD09C4948100FB787B</string>
+                                                                               
        <string>00D5662409C733D800FB787B</string>
+                                                                               
        <string>00D5662C09C7343700FB787B</string>
+                                                                               
        <string>00D5662D09C7343700FB787B</string>
+                                                                               
        <string>00D5663909C734DD00FB787B</string>
+                                                                               
        <string>00D5663B09C734DD00FB787B</string>
+                                                                               
        <string>00D5668209C73C9000FB787B</string>
+                                                                               
        <string>00D5668D09C73D6300FB787B</string>
+                                                                               
        <string>00D5663A09C734DD00FB787B</string>
                                                                                
</array>
                                                                                
<key>prevStack</key>
                                                                                
<array>
                                                                                
        <string>001F527E0997D8BD00ED11F1</string>
-                                                                               
        <string>0076350309A1B7B6002A5BEF</string>
                                                                                
        <string>0076353C09A26CAC002A5BEF</string>
-                                                                               
        <string>0076353F09A26CAC002A5BEF</string>
-                                                                               
        <string>0076354709A26CAC002A5BEF</string>
-                                                                               
        <string>0076354809A26CAC002A5BEF</string>
-                                                                               
        <string>0076354A09A26CAC002A5BEF</string>
-                                                                               
        <string>0076354B09A26CAC002A5BEF</string>
-                                                                               
        <string>0076354C09A26CAC002A5BEF</string>
-                                                                               
        <string>0076354D09A26CAC002A5BEF</string>
-                                                                               
        <string>0076355009A26CAC002A5BEF</string>
                                                                                
        <string>0076355709A26CAC002A5BEF</string>
-                                                                               
        <string>0076356009A26CAC002A5BEF</string>
-                                                                               
        <string>0093D18B09B0744F0046F830</string>
-                                                                               
        <string>0093D1D309B085CB0046F830</string>
-                                                                               
        <string>0042E78C09C0C7D700183F90</string>
-                                                                               
        <string>0042E78D09C0C7D700183F90</string>
-                                                                               
        <string>0042E78E09C0C7D700183F90</string>
-                                                                               
        <string>0042E78F09C0C7D700183F90</string>
-                                                                               
        <string>0042E79009C0C7D700183F90</string>
-                                                                               
        <string>0042E79109C0C7D700183F90</string>
-                                                                               
        <string>0042E79209C0C7D700183F90</string>
-                                                                               
        <string>0042E79309C0C7D700183F90</string>
-                                                                               
        <string>0042E79409C0C7D700183F90</string>
-                                                                               
        <string>0042E7B009C0C90F00183F90</string>
-                                                                               
        <string>0042E7BF09C0C97A00183F90</string>
-                                                                               
        <string>0042E7C009C0C97A00183F90</string>
-                                                                               
        <string>0042E7C109C0C97A00183F90</string>
-                                                                               
        <string>0042E7C209C0C97A00183F90</string>
-                                                                               
        <string>0042E7DC09C0CB4500183F90</string>
-                                                                               
        <string>0042E7DD09C0CB4500183F90</string>
-                                                                               
        <string>0042E7DE09C0CB4500183F90</string>
+                                                                               
        <string>00D5630509C44A4800FB787B</string>
+                                                                               
        <string>00D5630809C44A4800FB787B</string>
+                                                                               
        <string>00D5634109C47AA400FB787B</string>
+                                                                               
        <string>00D5634209C47AA400FB787B</string>
+                                                                               
        <string>00D5634309C47AA400FB787B</string>
+                                                                               
        <string>00D5634409C47AA400FB787B</string>
+                                                                               
        <string>00D5634A09C47AA400FB787B</string>
+                                                                               
        <string>00D5639009C4834000FB787B</string>
+                                                                               
        <string>00D5639109C4834000FB787B</string>
+                                                                               
        <string>00D5639209C4834000FB787B</string>
+                                                                               
        <string>00D5639609C4834000FB787B</string>
+                                                                               
        <string>00D5639A09C4834000FB787B</string>
+                                                                               
        <string>00D563DF09C4948100FB787B</string>
+                                                                               
        <string>00D5662509C733D800FB787B</string>
+                                                                               
        <string>00D5662F09C7343700FB787B</string>
+                                                                               
        <string>00D5663009C7343700FB787B</string>
+                                                                               
        <string>00D5663D09C734DD00FB787B</string>
+                                                                               
        <string>00D5663E09C734DD00FB787B</string>
+                                                                               
        <string>00D5663F09C734DD00FB787B</string>
+                                                                               
        <string>00D5664009C734DD00FB787B</string>
+                                                                               
        <string>00D5668409C73C9100FB787B</string>
+                                                                               
        <string>00D5668E09C73D6300FB787B</string>
                                                                                
</array>
                                                                        </dict>
                                                                        
<key>SplitCount</key>
@@ -436,9 +473,9 @@
                        </array>
                        <key>TableOfContents</key>
                        <array>
-                               <string>0042E76209C0C5BE00183F90</string>
+                               <string>00D5623B09C20BA700FB787B</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
-                               <string>0042E76309C0C5BE00183F90</string>
+                               <string>00D5623C09C20BA700FB787B</string>
                                <string>1CE0B20306471E060097A5F4</string>
                                <string>1CE0B20506471E060097A5F4</string>
                        </array>
@@ -573,6 +610,8 @@
        <key>WindowOrderList</key>
        <array>
                <string>00A3E66608242A87003CD96A</string>
+               <string>1C530D57069F1CE1000CFCEE</string>
+               <string>00D563E109C4948100FB787B</string>
                <string>1C0AD2B3069F1EA900FABCE6</string>
                <string>/Users/mick/openDev/KisMACng/KisMAC.xcodeproj</string>
        </array>
@@ -658,7 +697,7 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>00A3E66608242A87003CD96A</string>
-                               <string>0042E77509C0C72500183F90</string>
+                               <string>00D5623D09C20BA700FB787B</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>
@@ -798,12 +837,14 @@
                                                        <key>Dock</key>
                                                        <array>
                                                                <dict>
+                                                                       
<key>BecomeActive</key>
+                                                                       <true/>
                                                                        
<key>ContentConfiguration</key>
                                                                        <dict>
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CDD528C0622207200134675</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>&lt;No Editor&gt;</string>
+                                                                               
<string>ScanControllerMenus.m</string>
                                                                                
<key>StatusBarVisibility</key>
                                                                                
<true/>
                                                                        </dict>
@@ -859,8 +900,8 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>1C530D57069F1CE1000CFCEE</string>
-                               <string>000C18DC08B8648400464DAB</string>
-                               <string>000C18DD08B8648400464DAB</string>
+                               <string>00D5623309C20B9300FB787B</string>
+                               <string>00D5623409C20B9300FB787B</string>
                                <string>1CDD528C0622207200134675</string>
                                <string>1CD0528E0623707200166675</string>
                        </array>
@@ -869,7 +910,7 @@
                        <key>WindowToolGUID</key>
                        <string>1C530D57069F1CE1000CFCEE</string>
                        <key>WindowToolIsVisible</key>
-                       <false/>
+                       <true/>
                </dict>
                <dict>
                        <key>Identifier</key>
@@ -968,8 +1009,8 @@
                                                                                
<string>yes</string>
                                                                                
<key>sizes</key>
                                                                                
<array>
-                                                                               
        <string>{{0, 0}, {491, 168}}</string>
-                                                                               
        <string>{{0, 173}, {491, 270}}</string>
+                                                                               
        <string>{{0, 0}, {493, 168}}</string>
+                                                                               
        <string>{{0, 173}, {493, 270}}</string>
                                                                                
</array>
                                                                        </dict>
                                                                        
<key>VerticalSplitView</key>
@@ -1018,9 +1059,9 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>1C0AD2B3069F1EA900FABCE6</string>
-                               <string>0042E76709C0C5BE00183F90</string>
+                               <string>00D5625909C20D8D00FB787B</string>
                                <string>1CD0528B0623707200166675</string>
-                               <string>0042E76809C0C5BE00183F90</string>
+                               <string>00D5625A09C20D8D00FB787B</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.run</string>

Modified: KisMACng/KisMAC.xcodeproj/mick.pbxuser
===================================================================
--- KisMACng/KisMAC.xcodeproj/mick.pbxuser      2006-03-14 17:28:02 UTC (rev 
101)
+++ KisMACng/KisMAC.xcodeproj/mick.pbxuser      2006-03-14 18:35:22 UTC (rev 
102)
@@ -54,9 +54,9 @@
        };
        000D15A906AB0D7C00935F7C /* ValuePair.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {964, 1539}}";
-                       sepNavSelRange = "{1867, 0}";
-                       sepNavVisRect = "{{0, 531}, {964, 689}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 1554}}";
+                       sepNavSelRange = "{1926, 0}";
+                       sepNavVisRect = "{{0, 682}, {932, 662}}";
                };
        };
        000D15AA06AB0D7C00935F7C /* ValuePair.h */ = {
@@ -94,6 +94,40 @@
                        sepNavVisRect = "{{0, 0}, {964, 689}}";
                };
        };
+       0017843909C1E5C700530D82 /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
+               name = "MapView.m: 86";
+               rLen = 0;
+               rLoc = 2911;
+               rType = 0;
+               vrLen = 1681;
+               vrLoc = 1382;
+       };
+       0017843A09C1E5C700530D82 /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+       };
+       0017843B09C1E5C700530D82 /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
+               name = "MapView.m: 86";
+               rLen = 0;
+               rLoc = 2911;
+               rType = 0;
+               vrLen = 1681;
+               vrLoc = 1382;
+       };
+       0017843C09C1E5C700530D82 /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = devicePath;
+               rLen = 10;
+               rLoc = 1071;
+               rType = 0;
+               vrLen = 1470;
+               vrLoc = 195;
+       };
        001F527E0997D8BD00ED11F1 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
@@ -324,39 +358,39 @@
        003533A906A5DD8500AB4577 /* ScanController.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {932, 2814}}";
-                       sepNavSelRange = "{1458, 0}";
+                       sepNavSelRange = "{2527, 12}";
                        sepNavVisRect = "{{0, 616}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
        003533AA06A5DD8500AB4577 /* ScanController.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1430, 8372}}";
-                       sepNavSelRange = "{7300, 0}";
-                       sepNavVisRect = "{{0, 1928}, {932, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1430, 8484}}";
+                       sepNavSelRange = "{8027, 10}";
+                       sepNavVisRect = "{{0, 7822}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 54}, {1172, 773}}";
                };
        };
        003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1430, 10920}}";
-                       sepNavSelRange = "{24948, 0}";
-                       sepNavVisRect = "{{0, 9546}, {932, 662}}";
+                       sepNavSelRange = "{13412, 14}";
+                       sepNavVisRect = "{{0, 5111}, {734, 180}}";
                        sepNavWindowFrame = "{{107, 185}, {750, 558}}";
                };
        };
        003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {932, 952}}";
-                       sepNavSelRange = "{1491, 0}";
-                       sepNavVisRect = "{{0, 276}, {932, 662}}";
+                       sepNavSelRange = "{1149, 0}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                };
        };
        003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1976, 7868}}";
-                       sepNavSelRange = "{9335, 0}";
-                       sepNavVisRect = "{{0, 0}, {932, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1976, 7924}}";
+                       sepNavSelRange = "{2432, 0}";
+                       sepNavVisRect = "{{0, 912}, {734, 180}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
@@ -377,9 +411,9 @@
        };
        003533B006A5DD8500AB4577 /* TrafficController.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {964, 1133}}";
-                       sepNavSelRange = "{1447, 0}";
-                       sepNavVisRect = "{{0, 433}, {964, 689}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 1134}}";
+                       sepNavSelRange = "{1343, 0}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                };
        };
        003533B106A5DD8500AB4577 /* TrafficController.mm */ = {
@@ -603,8 +637,8 @@
        003533D706A5DD8500AB4577 /* USBIntersil.mm */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1772, 15890}}";
-                       sepNavSelRange = "{30308, 0}";
-                       sepNavVisRect = "{{0, 12495}, {1233, 309}}";
+                       sepNavSelRange = "{4049, 10}";
+                       sepNavVisRect = "{{0, 1261}, {734, 180}}";
                };
        };
        003533D906A5DD8500AB4577 /* WaveSecret.h */ = {
@@ -637,16 +671,17 @@
        };
        003533DF06A5DD8500AB4577 /* PrefsDriver.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {944, 4312}}";
-                       sepNavSelRange = "{4751, 0}";
-                       sepNavVisRect = "{{0, 1664}, {933, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {944, 4620}}";
+                       sepNavSelRange = "{10818, 0}";
+                       sepNavVisRect = "{{0, 3934}, {932, 662}}";
+                       sepNavWindowFrame = "{{15, 62}, {945, 765}}";
                };
        };
        003533E006A5DD8500AB4577 /* PrefsFilter.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {964, 689}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 662}}";
                        sepNavSelRange = "{0, 0}";
-                       sepNavVisRect = "{{0, 0}, {964, 689}}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                };
        };
        003533E106A5DD8500AB4577 /* PrefsFilter.m */ = {
@@ -842,30 +877,30 @@
        };
        0035340C06A5DD8500AB4577 /* SpinChannel.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {964, 689}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 662}}";
                        sepNavSelRange = "{964, 0}";
-                       sepNavVisRect = "{{0, 0}, {964, 689}}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                };
        };
        0035340D06A5DD8500AB4577 /* SpinChannel.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1239, 2310}}";
-                       sepNavSelRange = "{4760, 0}";
-                       sepNavVisRect = "{{0, 1967}, {1239, 309}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 2310}}";
+                       sepNavSelRange = "{2348, 10}";
+                       sepNavVisRect = "{{0, 796}, {932, 662}}";
                };
        };
        0035340F06A5DD8500AB4577 /* WaveDriver.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {933, 1386}}";
-                       sepNavSelRange = "{703, 0}";
-                       sepNavVisRect = "{{0, 0}, {933, 452}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 1386}}";
+                       sepNavSelRange = "{1818, 10}";
+                       sepNavVisRect = "{{0, 724}, {932, 662}}";
                };
        };
        0035341006A5DD8500AB4577 /* WaveDriver.m */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1292, 4200}}";
-                       sepNavSelRange = "{6681, 25}";
-                       sepNavVisRect = "{{0, 3534}, {705, 666}}";
+                       sepNavSelRange = "{3913, 0}";
+                       sepNavVisRect = "{{0, 1792}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
@@ -878,9 +913,9 @@
        };
        0035341206A5DD8500AB4577 /* WaveDriverAironet.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1031, 1372}}";
-                       sepNavSelRange = "{1409, 0}";
-                       sepNavVisRect = "{{0, 406}, {1031, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 1372}}";
+                       sepNavSelRange = "{1020, 14}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                };
        };
        0035341306A5DD8500AB4577 /* WaveDriverAirport.h */ = {
@@ -893,9 +928,9 @@
        };
        0035341406A5DD8500AB4577 /* WaveDriverAirport.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {933, 2072}}";
-                       sepNavSelRange = "{4295, 197}";
-                       sepNavVisRect = "{{0, 1608}, {933, 452}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1166, 2072}}";
+                       sepNavSelRange = "{3036, 10}";
+                       sepNavVisRect = "{{0, 850}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
@@ -908,9 +943,9 @@
        };
        0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {933, 5418}}";
-                       sepNavSelRange = "{11418, 0}";
-                       sepNavVisRect = "{{0, 3734}, {933, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 5432}}";
+                       sepNavSelRange = "{2666, 10}";
+                       sepNavVisRect = "{{0, 1414}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
@@ -923,9 +958,9 @@
        };
        0035341806A5DD8500AB4577 /* WaveDriverMacJack.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {938, 1666}}";
-                       sepNavSelRange = "{97, 0}";
-                       sepNavVisRect = "{{0, 0}, {938, 453}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 1666}}";
+                       sepNavSelRange = "{1792, 10}";
+                       sepNavVisRect = "{{0, 642}, {932, 662}}";
                };
        };
        0035341906A5DD8500AB4577 /* WaveDriverPCMCIA.h */ = {
@@ -958,16 +993,16 @@
        };
        0035341D06A5DD8500AB4577 /* WaveDriverViha.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {933, 476}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 662}}";
                        sepNavSelRange = "{141, 0}";
-                       sepNavVisRect = "{{0, 0}, {933, 452}}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                };
        };
        0035341E06A5DD8500AB4577 /* WaveDriverViha.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1031, 2380}}";
-                       sepNavSelRange = "{1745, 33}";
-                       sepNavVisRect = "{{0, 657}, {1031, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 2380}}";
+                       sepNavSelRange = "{1600, 10}";
+                       sepNavVisRect = "{{0, 644}, {932, 662}}";
                };
        };
        0035342006A5DD8500AB4577 /* CrashReportController.h */ = {
@@ -1045,34 +1080,6 @@
                modificationTime = 162564338.213185;
                state = 1;
        };
-       0042E75D09C0C4A500183F90 /* PBXBookmark */ = {
-               isa = PBXBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-       };
-       0042E76009C0C5BE00183F90 /* PBXBookmark */ = {
-               isa = PBXBookmark;
-               fRef = 005B12670730051A00906C36 /* MapControlItem.m */;
-       };
-       0042E76109C0C5BE00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 005B12670730051A00906C36 /* MapControlItem.m */;
-               name = retain;
-               rLen = 6;
-               rLoc = 8694;
-               rType = 0;
-               vrLen = 1310;
-               vrLoc = 8021;
-       };
-       0042E76609C0C5BE00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 164";
-               rLen = 0;
-               rLoc = 6219;
-               rType = 0;
-               vrLen = 1627;
-               vrLoc = 4966;
-       };
        0042E78809C0C7D700183F90 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 005B12670730051A00906C36 /* MapControlItem.m */;
@@ -1093,26 +1100,6 @@
                vrLen = 1561;
                vrLoc = 3843;
        };
-       0042E78A09C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 37";
-               rLen = 0;
-               rLoc = 1339;
-               rType = 0;
-               vrLen = 1914;
-               vrLoc = 0;
-       };
-       0042E78B09C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 160";
-               rLen = 0;
-               rLoc = 5905;
-               rType = 0;
-               vrLen = 2160;
-               vrLoc = 3705;
-       };
        0042E78C09C0C7D700183F90 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 005B12670730051A00906C36 /* MapControlItem.m */;
@@ -1128,141 +1115,11 @@
                fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
                name = "MapView.m: 164";
                rLen = 0;
-               rLoc = 6219;
+               rLoc = 6302;
                rType = 0;
                vrLen = 1719;
                vrLoc = 4966;
        };
-       0042E78E09C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "@implementation ScanCo";
-               rLen = 23;
-               rLoc = 2129;
-               rType = 0;
-               vrLen = 2519;
-               vrLoc = 1825;
-       };
-       0042E78F09C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m 
*/;
-               name = "ScanControllerScriptable.m: 511";
-               rLen = 0;
-               rLoc = 15384;
-               rType = 0;
-               vrLen = 1826;
-               vrLoc = 14537;
-       };
-       0042E79009C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 163";
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2706;
-               vrLoc = 5539;
-       };
-       0042E79109C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m 
*/;
-               name = "[_mappingView loadFromFile:filename]";
-               rLen = 36;
-               rLoc = 5097;
-               rType = 0;
-               vrLen = 1561;
-               vrLoc = 3843;
-       };
-       0042E79209C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 32";
-               rLen = 0;
-               rLoc = 1191;
-               rType = 0;
-               vrLen = 1918;
-               vrLoc = 0;
-       };
-       0042E79309C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 160";
-               rLen = 0;
-               rLoc = 5905;
-               rType = 0;
-               vrLen = 2185;
-               vrLoc = 3680;
-       };
-       0042E79409C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 37";
-               rLen = 0;
-               rLoc = 1339;
-               rType = 0;
-               vrLen = 1914;
-               vrLoc = 0;
-       };
-       0042E79509C0C7D700183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 161";
-               rLen = 0;
-               rLoc = 6070;
-               rType = 0;
-               vrLen = 2162;
-               vrLoc = 3705;
-       };
-       0042E7AF09C0C90F00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 136";
-               rLen = 0;
-               rLoc = 5171;
-               rType = 0;
-               vrLen = 2162;
-               vrLoc = 3705;
-       };
-       0042E7B009C0C90F00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 136";
-               rLen = 0;
-               rLoc = 5171;
-               rType = 0;
-               vrLen = 2162;
-               vrLoc = 3705;
-       };
-       0042E7B109C0C90F00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 166";
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2841;
-               vrLoc = 5485;
-       };
-       0042E7B409C0C92600183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 166";
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2754;
-               vrLoc = 5485;
-       };
-       0042E7BC09C0C97A00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "NSLog(@\"bla\");";
-               rLen = 0;
-               rLoc = 5317;
-               rType = 0;
-               vrLen = 2164;
-               vrLoc = 3705;
-       };
        0042E7BD09C0C97A00183F90 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 003533A906A5DD8500AB4577 /* ScanController.h */;
@@ -1273,66 +1130,6 @@
                vrLen = 1910;
                vrLoc = 1324;
        };
-       0042E7BE09C0C97A00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = _mappingView;
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2705;
-               vrLoc = 5703;
-       };
-       0042E7BF09C0C97A00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = _mappingView;
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2705;
-               vrLoc = 5703;
-       };
-       0042E7C009C0C97A00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "NSLog(@\"bla\");";
-               rLen = 0;
-               rLoc = 5317;
-               rType = 0;
-               vrLen = 2164;
-               vrLoc = 3705;
-       };
-       0042E7C109C0C97A00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = _mappingView;
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2705;
-               vrLoc = 5703;
-       };
-       0042E7C209C0C97A00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533A906A5DD8500AB4577 /* ScanController.h */;
-               name = "ScanController.h: 52";
-               rLen = 0;
-               rLoc = 1458;
-               rType = 0;
-               vrLen = 1910;
-               vrLoc = 1324;
-       };
-       0042E7C309C0C97A00183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 165";
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2714;
-               vrLoc = 5703;
-       };
        0042E7DA09C0CB4500183F90 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
@@ -1343,66 +1140,6 @@
                vrLen = 2778;
                vrLoc = 5485;
        };
-       0042E7DB09C0CB4500183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 156";
-               rLen = 0;
-               rLoc = 5846;
-               rType = 0;
-               vrLen = 1558;
-               vrLoc = 1466;
-       };
-       0042E7DC09C0CB4500183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 165";
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2754;
-               vrLoc = 5485;
-       };
-       0042E7DD09C0CB4500183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 156";
-               rLen = 0;
-               rLoc = 5846;
-               rType = 0;
-               vrLen = 1558;
-               vrLoc = 1466;
-       };
-       0042E7DE09C0CB4500183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "ScanController.m: 164";
-               rLen = 0;
-               rLoc = 7300;
-               rType = 0;
-               vrLen = 2778;
-               vrLoc = 5485;
-       };
-       0042E7DF09C0CB4500183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: ZOOMFACT";
-               rLen = 0;
-               rLoc = 15918;
-               rType = 0;
-               vrLen = 987;
-               vrLoc = 15319;
-       };
-       0042E7E309C0CB8100183F90 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
-               name = "MapView.m: 86";
-               rLen = 0;
-               rLoc = 2911;
-               rType = 0;
-               vrLen = 1721;
-               vrLoc = 1342;
-       };
        005B12660730051A00906C36 /* MapControlItem.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {964, 825}}";
@@ -1492,32 +1229,12 @@
                vrLen = 1903;
                vrLoc = 12231;
        };
-       0076353509A26CAB002A5BEF /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
-               name = "BOOL\t _errorSuppressed;";
-               rLen = 23;
-               rLoc = 2129;
-               rType = 0;
-               vrLen = 2571;
-               vrLoc = 1754;
-       };
-       0076353609A26CAB002A5BEF /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 003533A906A5DD8500AB4577 /* ScanController.h */;
-               name = "ScanController.h: 52";
-               rLen = 0;
-               rLoc = 1458;
-               rType = 0;
-               vrLen = 1950;
-               vrLoc = 1335;
-       };
        0076353709A26CAB002A5BEF /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
                name = "ScanControllerPrivate.m: 252";
                rLen = 0;
-               rLoc = 9335;
+               rLoc = 9393;
                rType = 0;
                vrLen = 1562;
                vrLoc = 0;
@@ -1527,7 +1244,7 @@
                fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
                name = "ScanControllerPrivate.h: startActiveAttack";
                rLen = 0;
-               rLoc = 1491;
+               rLoc = 1494;
                rType = 0;
                vrLen = 1478;
                vrLoc = 739;
@@ -1547,7 +1264,7 @@
                fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
                name = "ScanControllerPrivate.h: showBusyWithText:";
                rLen = 0;
-               rLoc = 1771;
+               rLoc = 1774;
                rType = 0;
                vrLen = 1477;
                vrLoc = 740;
@@ -1557,7 +1274,7 @@
                fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
                name = "Menu.nib!\")]";
                rLen = 12;
-               rLoc = 16110;
+               rLoc = 16168;
                rType = 0;
                vrLen = 1409;
                vrLoc = 15247;
@@ -1678,7 +1395,7 @@
                modificationTime = 162564239.874679;
                state = 2;
        };
-       0083C8EC0880633A00D895CB /* MapView.m:210 */ = {
+       0083C8EC0880633A00D895CB /* MapView.m:218 */ = {
                isa = PBXFileBreakpoint;
                actions = (
                );
@@ -1687,11 +1404,11 @@
                fileReference = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
                functionName = "-pdfData";
                hitCount = 1;
-               lineNumber = 210;
+               lineNumber = 218;
                modificationTime = 162564239.874701;
                state = 2;
        };
-       0083C8EE0880633E00D895CB /* MapView.m:224 */ = {
+       0083C8EE0880633E00D895CB /* MapView.m:232 */ = {
                isa = PBXFileBreakpoint;
                actions = (
                );
@@ -1700,7 +1417,7 @@
                fileReference = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
                functionName = "-pdfData";
                hitCount = 1;
-               lineNumber = 224;
+               lineNumber = 232;
                modificationTime = 162564239.874718;
                state = 2;
        };
@@ -1717,7 +1434,7 @@
                modificationTime = 162564239.874734;
                state = 2;
        };
-       0083C90E088064F700D895CB /* MapView.m:225 */ = {
+       0083C90E088064F700D895CB /* MapView.m:233 */ = {
                isa = PBXFileBreakpoint;
                actions = (
                );
@@ -1726,7 +1443,7 @@
                fileReference = 00CBA33F06DB8FDE000ACD19 /* MapView.m */;
                functionName = "-pdfData";
                hitCount = 1;
-               lineNumber = 225;
+               lineNumber = 233;
                modificationTime = 162564239.87475;
                state = 2;
        };
@@ -1743,14 +1460,14 @@
                        00412E8808265B3300E757BC /* WaveDriverViha.m:106 */,
                        0083C8AA08805F2900D895CB /* BISubView.m:129 */,
                        0083C8E1088062AF00D895CB /* BISubView.m:130 */,
-                       0083C8EC0880633A00D895CB /* MapView.m:210 */,
-                       0083C8EE0880633E00D895CB /* MapView.m:224 */,
+                       0083C8EC0880633A00D895CB /* MapView.m:218 */,
+                       0083C8EE0880633E00D895CB /* MapView.m:232 */,
                        0083C8FF088063B500D895CB /* BIView.m:58 */,
-                       0083C90E088064F700D895CB /* MapView.m:225 */,
-                       00DF45D208B1FFC1003F3C7E /* 
WaveDriverAirportExtreme.m:113 */,
+                       0083C90E088064F700D895CB /* MapView.m:233 */,
+                       00DF45D208B1FFC1003F3C7E /* 
WaveDriverAirportExtreme.m:134 */,
                        00DF45E108B202D6003F3C7E /* WaveDriverAtheros.m:208 */,
-                       00DF480508B23BB2003F3C7E /* 
WaveDriverAirportExtreme.m:110 */,
-                       00DF481908B23DC8003F3C7E /* 
WaveDriverAirportExtreme.m:81 */,
+                       00DF480508B23BB2003F3C7E /* 
WaveDriverAirportExtreme.m:131 */,
+                       00DF481908B23DC8003F3C7E /* 
WaveDriverAirportExtreme.m:101 */,
                        000C1A4108B8BAC800464DAB /* WaveScanner.mm:217 */,
                        0093D1EE09B08C370046F830 /* 
ScanControllerScriptable.m:508 */,
                );
@@ -1764,9 +1481,9 @@
        };
        00875D1A0708ADB300CACFCB /* WaveHelper.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1233, 9968}}";
-                       sepNavSelRange = "{10864, 33}";
-                       sepNavVisRect = "{{0, 4655}, {1233, 309}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1268, 10010}}";
+                       sepNavSelRange = "{22969, 0}";
+                       sepNavVisRect = "{{0, 4028}, {705, 666}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
@@ -2178,6 +1895,210 @@
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
+       00B1209D09C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: monitorModeEnabled";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00B1209E09C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 304";
+               rLen = 0;
+               rLoc = 10543;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 9959;
+       };
+       00B1209F09C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "+ (void)setMonitorMode:(BOOL)enable";
+               rLen = 21;
+               rLoc = 3839;
+               rType = 0;
+               vrLen = 2218;
+               vrLoc = 1748;
+       };
+       00B120A009C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = explicitlyLoadedAirportExtremeDriver;
+               rLen = 36;
+               rLoc = 8007;
+               rType = 0;
+               vrLen = 2017;
+               vrLoc = 5713;
+       };
+       00B120A109C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 147";
+               rLen = 0;
+               rLoc = 4868;
+               rType = 0;
+               vrLen = 1962;
+               vrLoc = 4057;
+       };
+       00B120A209C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "+ (BOOL)monitorModeEnabled";
+               rLen = 26;
+               rLoc = 1875;
+               rType = 0;
+               vrLen = 2218;
+               vrLoc = 1748;
+       };
+       00B120A309C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 34";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1100;
+               vrLoc = 0;
+       };
+       00B120A409C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "+ (BOOL)monitorModeEnabled";
+               rLen = 26;
+               rLoc = 1875;
+               rType = 0;
+               vrLen = 2218;
+               vrLoc = 1748;
+       };
+       00B120A509C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 35";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00B120A609C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "+ (BOOL)monitorModeEnabled";
+               rLen = 26;
+               rLoc = 1875;
+               rType = 0;
+               vrLen = 2218;
+               vrLoc = 1748;
+       };
+       00B120A709C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 37";
+               rLen = 0;
+               rLoc = 1130;
+               rType = 0;
+               vrLen = 1129;
+               vrLoc = 0;
+       };
+       00B120A809C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "+ (void)setMonitorMode:(BOOL)enable";
+               rLen = 21;
+               rLoc = 3839;
+               rType = 0;
+               vrLen = 2218;
+               vrLoc = 1748;
+       };
+       00B120A909C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: monitorModeEnabled";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00B120AA09C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 304";
+               rLen = 0;
+               rLoc = 10543;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 9959;
+       };
+       00B120AB09C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 81";
+               rLen = 0;
+               rLoc = 2697;
+               rType = 0;
+               vrLen = 2242;
+               vrLoc = 1748;
+       };
+       00B120C309C20A7F00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 156";
+               rLen = 0;
+               rLoc = 6956;
+               rType = 0;
+               vrLen = 2263;
+               vrLoc = 5173;
+       };
+       00B120C409C20A7F00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533E006A5DD8500AB4577 /* PrefsFilter.h */;
+               name = "PrefsFilter.h: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 476;
+               vrLoc = 0;
+       };
+       00B120C509C20A7F00AD6B0D /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+       };
+       00B120C609C20A7F00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 156";
+               rLen = 0;
+               rLoc = 6956;
+               rType = 0;
+               vrLen = 2263;
+               vrLoc = 5173;
+       };
+       00B120C709C20A7F00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533E006A5DD8500AB4577 /* PrefsFilter.h */;
+               name = "PrefsFilter.h: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 476;
+               vrLoc = 0;
+       };
+       00B120C809C20A7F00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 78";
+               rLen = 0;
+               rLoc = 2219;
+               rType = 0;
+               vrLen = 1654;
+               vrLoc = 1500;
+       };
        00B6296607058E2B006FC563 /* WaveNetWEPWeakCrack.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {932, 662}}";
@@ -2241,9 +2162,9 @@
        };
        00CBA33F06DB8FDE000ACD19 /* MapView.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1754, 9002}}";
-                       sepNavSelRange = "{2911, 0}";
-                       sepNavVisRect = "{{0, 642}, {932, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1754, 9114}}";
+                       sepNavSelRange = "{6302, 0}";
+                       sepNavVisRect = "{{0, 2238}, {932, 662}}";
                        sepNavWindowFrame = "{{38, 67}, {945, 765}}";
                };
        };
@@ -2283,23 +2204,1916 @@
                        sepNavVisRect = "{{0, 332}, {933, 452}}";
                };
        };
+       00D5623109C20B9300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+       };
+       00D5623209C20B9300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 114";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 478;
+               vrLoc = 4302;
+       };
+       00D5623809C20BA700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 78";
+               rLen = 0;
+               rLoc = 2219;
+               rType = 0;
+               vrLen = 1636;
+               vrLoc = 1500;
+       };
+       00D5623909C20BA700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 78";
+               rLen = 0;
+               rLoc = 2219;
+               rType = 0;
+               vrLen = 1636;
+               vrLoc = 1500;
+       };
+       00D5623A09C20BA700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = aeForever;
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 2645;
+               vrLoc = 3116;
+       };
+       00D5624409C20BC800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 114";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 478;
+               vrLoc = 4302;
+       };
+       00D5624909C20BDE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 116";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 414;
+               vrLoc = 4284;
+       };
+       00D5625809C20D8D00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 116";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 414;
+               vrLoc = 4284;
+       };
+       00D5628509C213B200FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 116";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 414;
+               vrLoc = 4284;
+       };
+       00D5628809C214A100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: monitorModeEnabled";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00D5628909C214A100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 91";
+               rLen = 0;
+               rLoc = 3098;
+               rType = 0;
+               vrLen = 2534;
+               vrLoc = 1880;
+       };
+       00D5628A09C214A100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 91";
+               rLen = 0;
+               rLoc = 3098;
+               rType = 0;
+               vrLen = 2534;
+               vrLoc = 1880;
+       };
+       00D5628B09C214A100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: monitorModeEnabled";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00D5628C09C214A100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 117";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 2467;
+               vrLoc = 3141;
+       };
+       00D5628E09C214F300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 116";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 412;
+               vrLoc = 4284;
+       };
+       00D5629009C2151100FB787B /* GrowlController.m:1 */ = {
+               isa = PBXFileBreakpoint;
+               actions = (
+               );
+               continueAfterActions = 0;
+               delayBeforeContinue = 0;
+               fileReference = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m 
*/;
+               functionName = "+notifyGrowlStartScan";
+               hitCount = 0;
+               lineNumber = 1;
+               modificationTime = 163714326.54055;
+               state = 2;
+       };
+       00D5629209C2151100FB787B /* GrowlController.m:1 */ = {
+               isa = PBXFileBreakpoint;
+               actions = (
+               );
+               continueAfterActions = 0;
+               delayBeforeContinue = 0;
+               fileReference = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m 
*/;
+               functionName = "+notifyGrowlStartScan";
+               hitCount = 0;
+               lineNumber = 1;
+               modificationTime = 163714324.286854;
+               state = 2;
+       };
+       00D5629609C2153900FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 117";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 2467;
+               vrLoc = 3141;
+       };
+       00D5629709C2153900FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+       };
+       00D5629809C2153900FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 117";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 2467;
+               vrLoc = 3141;
+       };
+       00D5629909C2153900FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 107";
+               rLen = 0;
+               rLoc = 3902;
+               rType = 0;
+               vrLen = 1596;
+               vrLoc = 3333;
+       };
+       00D562AB09C4373300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 116";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 412;
+               vrLoc = 4284;
+       };
+       00D562FC09C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533B006A5DD8500AB4577 /* TrafficController.h */;
+               name = "TrafficController.h: offset";
+               rLen = 0;
+               rLoc = 1343;
+               rType = 0;
+               vrLen = 1295;
+               vrLoc = 0;
+       };
+       00D562FD09C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
+               name = "ScanControllerPrivate.h: 1";
+               rLen = 952;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 0;
+       };
+       00D562FE09C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8009AEF03700AEB0B8 /* GrowlController.h */;
+               name = "GrowlController.h: 1";
+               rLen = 223;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1910;
+               vrLoc = 0;
+       };
+       00D562FF09C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 3";
+               rLen = 0;
+               rLoc = 31;
+               rType = 0;
+               vrLen = 1447;
+               vrLoc = 0;
+       };
+       00D5630009C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+               name = "CHANGES: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1864;
+               vrLoc = 0;
+       };
+       00D5630109C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 117";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 2467;
+               vrLoc = 3141;
+       };
+       00D5630209C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 119";
+               rLen = 0;
+               rLoc = 4213;
+               rType = 0;
+               vrLen = 1579;
+               vrLoc = 0;
+       };
+       00D5630309C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8009AEF03700AEB0B8 /* GrowlController.h */;
+               name = "GrowlController.h: 1";
+               rLen = 0;
+               rLoc = 223;
+               rType = 0;
+               vrLen = 1043;
+               vrLoc = 0;
+       };
+       00D5630409C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533B006A5DD8500AB4577 /* TrafficController.h */;
+               name = "TrafficController.h: offset";
+               rLen = 0;
+               rLoc = 1343;
+               rType = 0;
+               vrLen = 1295;
+               vrLoc = 0;
+       };
+       00D5630509C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
+               name = "ScanControllerPrivate.h: 1";
+               rLen = 952;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 0;
+       };
+       00D5630609C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8009AEF03700AEB0B8 /* GrowlController.h */;
+               name = "GrowlController.h: 1";
+               rLen = 223;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1910;
+               vrLoc = 0;
+       };
+       00D5630709C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 3";
+               rLen = 0;
+               rLoc = 31;
+               rType = 0;
+               vrLen = 1447;
+               vrLoc = 0;
+       };
+       00D5630809C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+               name = "CHANGES: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1864;
+               vrLoc = 0;
+       };
+       00D5630909C44A4800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = explicitlyLoadedAirportExtremeDriver;
+               rLen = 36;
+               rLoc = 8007;
+               rType = 0;
+               vrLen = 2016;
+               vrLoc = 6904;
+       };
+       00D5631609C4787500FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 116";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 412;
+               vrLoc = 4284;
+       };
+       00D5631709C4787500FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               rLen = 7;
+               rLoc = 9642;
+               rType = 0;
+       };
+       00D5631809C4787500FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 116";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 412;
+               vrLoc = 4284;
+       };
+       00D5631909C4787500FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = DumpLog;
+               rLen = 7;
+               rLoc = 9642;
+               rType = 0;
+               vrLen = 713;
+               vrLoc = 9428;
+       };
+       00D5633809C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 000D15A906AB0D7C00935F7C /* ValuePair.m */;
+               name = "ValuePair.m: getX";
+               rLen = 0;
+               rLoc = 1926;
+               rType = 0;
+               vrLen = 838;
+               vrLoc = 1503;
+       };
+       00D5633909C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340C06A5DD8500AB4577 /* SpinChannel.h */;
+               name = "SpinChannel.h: 26";
+               rLen = 0;
+               rLoc = 964;
+               rType = 0;
+               vrLen = 1238;
+               vrLoc = 0;
+       };
+       00D5633A09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340D06A5DD8500AB4577 /* SpinChannel.m */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 2348;
+               rType = 0;
+               vrLen = 1091;
+               vrLoc = 1721;
+       };
+       00D5633B09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 8027;
+               rType = 0;
+               vrLen = 2810;
+               vrLoc = 6326;
+       };
+       00D5633C09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341006A5DD8500AB4577 /* WaveDriver.m */;
+               name = _currentChannel;
+               rLen = 15;
+               rLoc = 4516;
+               rType = 0;
+               vrLen = 1171;
+               vrLoc = 3629;
+       };
+       00D5633D09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
+               name = "WaveDriver.h: 19";
+               rLen = 0;
+               rLoc = 703;
+               rType = 0;
+               vrLen = 1388;
+               vrLoc = 0;
+       };
+       00D5633E09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 32";
+               rLen = 0;
+               rLoc = 1075;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5633F09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 238";
+               rLen = 0;
+               rLoc = 9922;
+               rType = 0;
+               vrLen = 1475;
+               vrLoc = 8565;
+       };
+       00D5634009C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 183";
+               rLen = 0;
+               rLoc = 7829;
+               rType = 0;
+               vrLen = 2016;
+               vrLoc = 6904;
+       };
+       00D5634109C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 000D15A906AB0D7C00935F7C /* ValuePair.m */;
+               name = "ValuePair.m: getX";
+               rLen = 0;
+               rLoc = 1926;
+               rType = 0;
+               vrLen = 838;
+               vrLoc = 1503;
+       };
+       00D5634209C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340C06A5DD8500AB4577 /* SpinChannel.h */;
+               name = "SpinChannel.h: 26";
+               rLen = 0;
+               rLoc = 964;
+               rType = 0;
+               vrLen = 1238;
+               vrLoc = 0;
+       };
+       00D5634309C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340D06A5DD8500AB4577 /* SpinChannel.m */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 2348;
+               rType = 0;
+               vrLen = 1091;
+               vrLoc = 1721;
+       };
+       00D5634409C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 8027;
+               rType = 0;
+               vrLen = 2810;
+               vrLoc = 6326;
+       };
+       00D5634509C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: monitorModeEnabled";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00D5634609C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = getChannel;
+               rLen = 10;
+               rLoc = 9569;
+               rType = 0;
+               vrLen = 1474;
+               vrLoc = 8552;
+       };
+       00D5634709C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341006A5DD8500AB4577 /* WaveDriver.m */;
+               name = _currentChannel;
+               rLen = 15;
+               rLoc = 4516;
+               rType = 0;
+               vrLen = 1171;
+               vrLoc = 3629;
+       };
+       00D5634809C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 247";
+               rLen = 0;
+               rLoc = 10088;
+               rType = 0;
+               vrLen = 1474;
+               vrLoc = 8552;
+       };
+       00D5634909C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: monitorModeEnabled";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00D5634A09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
+               name = "WaveDriver.h: 19";
+               rLen = 0;
+               rLoc = 703;
+               rType = 0;
+               vrLen = 1388;
+               vrLoc = 0;
+       };
+       00D5634B09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: monitorModeEnabled";
+               rLen = 0;
+               rLoc = 1078;
+               rType = 0;
+               vrLen = 1166;
+               vrLoc = 0;
+       };
+       00D5634C09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 238";
+               rLen = 0;
+               rLoc = 9922;
+               rType = 0;
+               vrLen = 1475;
+               vrLoc = 8565;
+       };
+       00D5634D09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 32";
+               rLen = 0;
+               rLoc = 1075;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5634E09C47AA400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 322";
+               rLen = 0;
+               rLoc = 12464;
+               rType = 0;
+               vrLen = 1418;
+               vrLoc = 11519;
+       };
+       00D5635309C47AC300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 334";
+               rLen = 0;
+               rLoc = 12935;
+               rType = 0;
+               vrLen = 1418;
+               vrLoc = 11519;
+       };
+       00D5635809C47E9800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = DumpLog;
+               rLen = 7;
+               rLoc = 9642;
+               rType = 0;
+               vrLen = 713;
+               vrLoc = 9428;
+       };
+       00D5635909C47E9800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533D706A5DD8500AB4577 /* USBIntersil.mm */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 4049;
+               rType = 0;
+               vrLen = 399;
+               vrLoc = 3872;
+       };
+       00D5635A09C47E9800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               rLen = 10;
+               rLoc = 8027;
+               rType = 0;
+       };
+       00D5635B09C47E9800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = DumpLog;
+               rLen = 7;
+               rLoc = 9642;
+               rType = 0;
+               vrLen = 713;
+               vrLoc = 9428;
+       };
+       00D5635C09C47E9800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = getChannel;
+               rLen = 10;
+               rLoc = 8080;
+               rType = 0;
+               vrLen = 478;
+               vrLoc = 7841;
+       };
+       00D5635D09C47E9800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533D706A5DD8500AB4577 /* USBIntersil.mm */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 4049;
+               rType = 0;
+               vrLen = 399;
+               vrLoc = 3872;
+       };
+       00D5635E09C47E9800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = getChannel;
+               rLen = 10;
+               rLoc = 8080;
+               rType = 0;
+               vrLen = 478;
+               vrLoc = 7841;
+       };
+       00D5636409C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 8066;
+               rType = 0;
+               vrLen = 478;
+               vrLoc = 7841;
+       };
+       00D5636509C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "@\"whichDriver\"";
+               rLen = 14;
+               rLoc = 15036;
+               rType = 0;
+               vrLen = 300;
+               vrLoc = 14860;
+       };
+       00D5636609C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "@\"whichDriver\"";
+               rLen = 14;
+               rLoc = 2275;
+               rType = 0;
+               vrLen = 596;
+               vrLoc = 2033;
+       };
+       00D5636709C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341206A5DD8500AB4577 /* WaveDriverAironet.m */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1020;
+               rType = 0;
+               vrLen = 268;
+               vrLoc = 864;
+       };
+       00D5636809C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00D5636909C4816600FB787B /* Info.plist */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1001;
+               rType = 0;
+               vrLen = 338;
+               vrLoc = 835;
+       };
+       00D5636909C4816600FB787B /* Info.plist */ = {
+               isa = PBXFileReference;
+               name = Info.plist;
+               path = 
/Users/mick/openDev/KisMACng/Subprojects/files/AiroJack.kext/Contents/Info.plist;
+               sourceTree = "<absolute>";
+       };
+       00D5636A09C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               rLen = 14;
+               rLoc = 6820;
+               rType = 0;
+       };
+       00D5636B09C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 8066;
+               rType = 0;
+               vrLen = 478;
+               vrLoc = 7841;
+       };
+       00D5636C09C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 15220;
+               rType = 0;
+               vrLen = 287;
+               vrLoc = 15064;
+       };
+       00D5636D09C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = whichDriver;
+               rLen = 11;
+               rLoc = 3173;
+               rType = 0;
+               vrLen = 520;
+               vrLoc = 2851;
+       };
+       00D5636E09C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "@\"whichDriver\"";
+               rLen = 14;
+               rLoc = 15036;
+               rType = 0;
+               vrLen = 300;
+               vrLoc = 14860;
+       };
+       00D5636F09C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "@\"whichDriver\"";
+               rLen = 14;
+               rLoc = 2275;
+               rType = 0;
+               vrLen = 596;
+               vrLoc = 2033;
+       };
+       00D5637009C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 223";
+               rLen = 0;
+               rLoc = 6885;
+               rType = 0;
+               vrLen = 529;
+               vrLoc = 6576;
+       };
+       00D5637109C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341206A5DD8500AB4577 /* WaveDriverAironet.m */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1020;
+               rType = 0;
+               vrLen = 268;
+               vrLoc = 864;
+       };
+       00D5637209C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00D5637309C4816600FB787B /* Info.plist */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1001;
+               rType = 0;
+               vrLen = 338;
+               vrLoc = 835;
+       };
+       00D5637309C4816600FB787B /* Info.plist */ = {
+               isa = PBXFileReference;
+               name = Info.plist;
+               path = 
/Users/mick/openDev/KisMACng/Subprojects/files/AiroJack.kext/Contents/Info.plist;
+               sourceTree = "<absolute>";
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {734, 812}}";
+                       sepNavSelRange = "{1001, 14}";
+                       sepNavVisRect = "{{0, 350}, {734, 180}}";
+               };
+       };
+       00D5637409C4816600FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 224";
+               rLen = 0;
+               rLoc = 7024;
+               rType = 0;
+               vrLen = 461;
+               vrLoc = 0;
+       };
+       00D5637F09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 13976;
+               rType = 0;
+               vrLen = 1194;
+               vrLoc = 12859;
+       };
+       00D5638009C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533A906A5DD8500AB4577 /* ScanController.h */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 2527;
+               rType = 0;
+               vrLen = 1910;
+               vrLoc = 1324;
+       };
+       00D5638109C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = whichDriver;
+               rLen = 11;
+               rLoc = 2277;
+               rType = 0;
+               vrLen = 1865;
+               vrLoc = 1412;
+       };
+       00D5638209C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
+               name = "ScanControllerPrivate.h: menuSetEnabled:menu:";
+               rLen = 0;
+               rLoc = 1149;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 0;
+       };
+       00D5638309C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341206A5DD8500AB4577 /* WaveDriverAironet.m */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1020;
+               rType = 0;
+               vrLen = 1365;
+               vrLoc = 0;
+       };
+       00D5638409C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341806A5DD8500AB4577 /* WaveDriverMacJack.m */;
+               name = driverName;
+               rLen = 10;
+               rLoc = 1792;
+               rType = 0;
+               vrLen = 2108;
+               vrLoc = 1321;
+       };
+       00D5638509C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 1818;
+               rType = 0;
+               vrLen = 1082;
+               vrLoc = 1434;
+       };
+       00D5638609C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 2666;
+               rType = 0;
+               vrLen = 1503;
+               vrLoc = 3361;
+       };
+       00D5638709C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341D06A5DD8500AB4577 /* WaveDriverViha.h */;
+               name = "WaveDriverViha.h: 7";
+               rLen = 0;
+               rLoc = 141;
+               rType = 0;
+               vrLen = 1066;
+               vrLoc = 0;
+       };
+       00D5638809C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341E06A5DD8500AB4577 /* WaveDriverViha.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 1600;
+               rType = 0;
+               vrLen = 1649;
+               vrLoc = 1305;
+       };
+       00D5638909C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341406A5DD8500AB4577 /* WaveDriverAirport.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 3036;
+               rType = 0;
+               vrLen = 1395;
+               vrLoc = 2557;
+       };
+       00D5638A09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341006A5DD8500AB4577 /* WaveDriver.m */;
+               name = setCon;
+               rLen = 6;
+               rLoc = 2360;
+               rType = 0;
+               vrLen = 1584;
+               vrLoc = 2965;
+       };
+       00D5638B09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 264";
+               rLen = 0;
+               rLoc = 7885;
+               rType = 0;
+               vrLen = 2381;
+               vrLoc = 8227;
+       };
+       00D5638C09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 32";
+               rLen = 0;
+               rLoc = 1075;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5638D09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: devicePath";
+               rLen = 0;
+               rLoc = 1063;
+               rType = 0;
+               vrLen = 2153;
+               vrLoc = 1411;
+       };
+       00D5638E09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 339";
+               rLen = 0;
+               rLoc = 13031;
+               rType = 0;
+               vrLen = 1418;
+               vrLoc = 11519;
+       };
+       00D5638F09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 13976;
+               rType = 0;
+               vrLen = 1194;
+               vrLoc = 12859;
+       };
+       00D5639009C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533A906A5DD8500AB4577 /* ScanController.h */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 2527;
+               rType = 0;
+               vrLen = 1910;
+               vrLoc = 1324;
+       };
+       00D5639109C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = whichDriver;
+               rLen = 11;
+               rLoc = 2277;
+               rType = 0;
+               vrLen = 1865;
+               vrLoc = 1412;
+       };
+       00D5639209C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AC06A5DD8500AB4577 /* ScanControllerPrivate.h */;
+               name = "ScanControllerPrivate.h: menuSetEnabled:menu:";
+               rLen = 0;
+               rLoc = 1149;
+               rType = 0;
+               vrLen = 1594;
+               vrLoc = 0;
+       };
+       00D5639309C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "#define";
+               rLen = 0;
+               rLoc = 1063;
+               rType = 0;
+               vrLen = 1501;
+               vrLoc = 137;
+       };
+       00D5639409C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341406A5DD8500AB4577 /* WaveDriverAirport.m */;
+               name = "WaveDriverAirport.m: 124";
+               rLen = 0;
+               rLoc = 4347;
+               rType = 0;
+               vrLen = 1998;
+               vrLoc = 0;
+       };
+       00D5639509C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 32";
+               rLen = 0;
+               rLoc = 1075;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5639609C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341806A5DD8500AB4577 /* WaveDriverMacJack.m */;
+               name = driverName;
+               rLen = 10;
+               rLoc = 1792;
+               rType = 0;
+               vrLen = 2108;
+               vrLoc = 1321;
+       };
+       00D5639709C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 38";
+               rLen = 0;
+               rLoc = 1282;
+               rType = 0;
+               vrLen = 2375;
+               vrLoc = 1505;
+       };
+       00D5639809C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341406A5DD8500AB4577 /* WaveDriverAirport.m */;
+               name = "WaveDriverAirport.m: 25";
+               rLen = 0;
+               rLoc = 947;
+               rType = 0;
+               vrLen = 1998;
+               vrLoc = 0;
+       };
+       00D5639909C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341006A5DD8500AB4577 /* WaveDriver.m */;
+               name = "WaveDriver.m: 172";
+               rLen = 0;
+               rLoc = 4407;
+               rType = 0;
+               vrLen = 1171;
+               vrLoc = 3629;
+       };
+       00D5639A09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 1818;
+               rType = 0;
+               vrLen = 1082;
+               vrLoc = 1434;
+       };
+       00D5639B09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341006A5DD8500AB4577 /* WaveDriver.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 1602;
+               rType = 0;
+               vrLen = 623;
+               vrLoc = 1298;
+       };
+       00D5639C09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341406A5DD8500AB4577 /* WaveDriverAirport.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 3036;
+               rType = 0;
+               vrLen = 1396;
+               vrLoc = 2557;
+       };
+       00D5639D09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 1610;
+               rType = 0;
+               vrLen = 2373;
+               vrLoc = 1505;
+       };
+       00D5639E09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341406A5DD8500AB4577 /* WaveDriverAirport.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 3036;
+               rType = 0;
+               vrLen = 1395;
+               vrLoc = 2557;
+       };
+       00D5639F09C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 1610;
+               rType = 0;
+               vrLen = 2373;
+               vrLoc = 1505;
+       };
+       00D563A009C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 2666;
+               rType = 0;
+               vrLen = 1503;
+               vrLoc = 3361;
+       };
+       00D563A109C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341D06A5DD8500AB4577 /* WaveDriverViha.h */;
+               name = "WaveDriverViha.h: 7";
+               rLen = 0;
+               rLoc = 141;
+               rType = 0;
+               vrLen = 1066;
+               vrLoc = 0;
+       };
+       00D563A209C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341E06A5DD8500AB4577 /* WaveDriverViha.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 1600;
+               rType = 0;
+               vrLen = 1649;
+               vrLoc = 1305;
+       };
+       00D563A309C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341406A5DD8500AB4577 /* WaveDriverAirport.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 3036;
+               rType = 0;
+               vrLen = 1395;
+               vrLoc = 2557;
+       };
+       00D563A409C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: devicePath";
+               rLen = 0;
+               rLoc = 1063;
+               rType = 0;
+               vrLen = 2153;
+               vrLoc = 1411;
+       };
+       00D563A509C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341006A5DD8500AB4577 /* WaveDriver.m */;
+               name = setCon;
+               rLen = 6;
+               rLoc = 2360;
+               rType = 0;
+               vrLen = 1584;
+               vrLoc = 2965;
+       };
+       00D563A609C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 32";
+               rLen = 0;
+               rLoc = 1075;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D563A709C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 264";
+               rLen = 0;
+               rLoc = 7885;
+               rType = 0;
+               vrLen = 2381;
+               vrLoc = 8227;
+       };
+       00D563A809C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 32";
+               rLen = 0;
+               rLoc = 1075;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D563A909C4834000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 253";
+               rLen = 0;
+               rLoc = 10037;
+               rType = 0;
+               vrLen = 1045;
+               vrLoc = 9794;
+       };
+       00D563BA09C486E400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00D5637309C4816600FB787B /* Info.plist */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1001;
+               rType = 0;
+               vrLen = 338;
+               vrLoc = 835;
+       };
+       00D563C009C487DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 2666;
+               rType = 0;
+               vrLen = 1503;
+               vrLoc = 3361;
+       };
+       00D563C109C487DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 2666;
+               rType = 0;
+               vrLen = 1503;
+               vrLoc = 3361;
+       };
+       00D563C209C487DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 13976;
+               rType = 0;
+               vrLen = 1565;
+               vrLoc = 14006;
+       };
+       00D563C509C487DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               rLen = 1;
+               rLoc = 351;
+               rType = 1;
+       };
+       00D563C609C487DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 312";
+               rLen = 0;
+               rLoc = 9812;
+               rType = 0;
+               vrLen = 1925;
+               vrLoc = 8902;
+       };
+       00D563C909C4924100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00D5637309C4816600FB787B /* Info.plist */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1001;
+               rType = 0;
+               vrLen = 338;
+               vrLoc = 835;
+       };
+       00D563CA09C4924100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 73";
+               rLen = 0;
+               rLoc = 2432;
+               rType = 0;
+               vrLen = 589;
+               vrLoc = 2164;
+       };
+       00D563CB09C4924100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               rLen = 12;
+               rLoc = 13427;
+               rType = 0;
+       };
+       00D563CC09C4924100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00D5637309C4816600FB787B /* Info.plist */;
+               name = AiroJackDriver;
+               rLen = 14;
+               rLoc = 1001;
+               rType = 0;
+               vrLen = 338;
+               vrLoc = 835;
+       };
+       00D563CD09C4924100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "@\"whichDriver";
+               rLen = 13;
+               rLoc = 15036;
+               rType = 0;
+               vrLen = 300;
+               vrLoc = 14860;
+       };
+       00D563CE09C4924100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 73";
+               rLen = 0;
+               rLoc = 2432;
+               rType = 0;
+               vrLen = 589;
+               vrLoc = 2164;
+       };
+       00D563CF09C4924100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = driverWithName;
+               rLen = 14;
+               rLoc = 13412;
+               rType = 0;
+               vrLen = 377;
+               vrLoc = 13219;
+       };
+       00D563D009C4924200FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 13976;
+               rType = 0;
+               vrLen = 1565;
+               vrLoc = 14006;
+       };
+       00D563D109C4924200FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 312";
+               rLen = 0;
+               rLoc = 9812;
+               rType = 0;
+               vrLen = 1925;
+               vrLoc = 8902;
+       };
+       00D563D909C4946B00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 73";
+               rLen = 0;
+               rLoc = 2432;
+               rType = 0;
+               vrLen = 589;
+               vrLoc = 2164;
+       };
+       00D563DA09C4946B00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               rLen = 21;
+               rLoc = 13480;
+               rType = 0;
+       };
+       00D563DB09C4946B00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
+               name = "ScanControllerPrivate.m: 73";
+               rLen = 0;
+               rLoc = 2432;
+               rType = 0;
+               vrLen = 589;
+               vrLoc = 2164;
+       };
+       00D563DC09C4946B00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = driverWithName;
+               rLen = 14;
+               rLoc = 13412;
+               rType = 0;
+               vrLen = 473;
+               vrLoc = 13275;
+       };
+       00D563DD09C4948100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 2666;
+               rType = 0;
+               vrLen = 1503;
+               vrLoc = 3361;
+       };
+       00D563DE09C4948100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = _whichDriver;
+               rLen = 12;
+               rLoc = 13976;
+               rType = 0;
+               vrLen = 1557;
+               vrLoc = 13386;
+       };
+       00D563DF09C4948100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
+               name = deviceName;
+               rLen = 10;
+               rLoc = 2666;
+               rType = 0;
+               vrLen = 1503;
+               vrLoc = 3361;
+       };
+       00D563E009C4948100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "ScanControllerMenus.m: performExportJPEG:";
+               rLen = 0;
+               rLoc = 12982;
+               rType = 0;
+               vrLen = 1235;
+               vrLoc = 12689;
+       };
+       00D563E309C4948100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               rLen = 1;
+               rLoc = 351;
+               rType = 1;
+       };
+       00D563E409C4948100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 310";
+               rLen = 0;
+               rLoc = 9738;
+               rType = 0;
+               vrLen = 1925;
+               vrLoc = 8902;
+       };
+       00D5662409C733D800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "ScanControllerMenus.m: performExportJPEG:";
+               rLen = 0;
+               rLoc = 12982;
+               rType = 0;
+               vrLen = 1235;
+               vrLoc = 12689;
+       };
+       00D5662509C733D800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = "ScanControllerMenus.m: performExportJPEG:";
+               rLen = 0;
+               rLoc = 12982;
+               rType = 0;
+               vrLen = 1235;
+               vrLoc = 12689;
+       };
+       00D5662609C733D800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 8027;
+               rType = 0;
+               vrLen = 1464;
+               vrLoc = 21511;
+       };
+       00D5662709C733D800FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 715";
+               rLen = 0;
+               rLoc = 22969;
+               rType = 0;
+               vrLen = 2026;
+               vrLoc = 8885;
+       };
+       00D5662C09C7343700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 8027;
+               rType = 0;
+               vrLen = 1464;
+               vrLoc = 21511;
+       };
+       00D5662D09C7343700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8009AEF03700AEB0B8 /* GrowlController.h */;
+               name = "GrowlController.h: 10";
+               rLen = 0;
+               rLoc = 224;
+               rType = 0;
+               vrLen = 1950;
+               vrLoc = 0;
+       };
+       00D5662E09C7343700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 120";
+               rLen = 0;
+               rLoc = 3323;
+               rType = 0;
+               vrLen = 1787;
+               vrLoc = 0;
+       };
+       00D5662F09C7343700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AA06A5DD8500AB4577 /* ScanController.m */;
+               name = setChannel;
+               rLen = 10;
+               rLoc = 8027;
+               rType = 0;
+               vrLen = 1464;
+               vrLoc = 21511;
+       };
+       00D5663009C7343700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8009AEF03700AEB0B8 /* GrowlController.h */;
+               name = "GrowlController.h: 10";
+               rLen = 0;
+               rLoc = 224;
+               rType = 0;
+               vrLen = 1950;
+               vrLoc = 0;
+       };
+       00D5663109C7343700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 24";
+               rLen = 0;
+               rLoc = 921;
+               rType = 0;
+               vrLen = 1470;
+               vrLoc = 12;
+       };
+       00D5663209C7343700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 715";
+               rLen = 0;
+               rLoc = 22969;
+               rType = 0;
+               vrLen = 2026;
+               vrLoc = 8885;
+       };
+       00D5663909C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 31";
+               rLen = 0;
+               rLoc = 1018;
+               rType = 0;
+               vrLen = 1470;
+               vrLoc = 12;
+       };
+       00D5663A09C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 163";
+               rLen = 0;
+               rLoc = 5446;
+               rType = 0;
+               vrLen = 1617;
+               vrLoc = 10162;
+       };
+       00D5663B09C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 114";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 2586;
+               vrLoc = 3297;
+       };
+       00D5663C09C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 37";
+               rLen = 0;
+               rLoc = 1144;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5663D09C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
+               name = "GrowlController.m: 31";
+               rLen = 0;
+               rLoc = 1018;
+               rType = 0;
+               vrLen = 1470;
+               vrLoc = 12;
+       };
+       00D5663E09C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 163";
+               rLen = 0;
+               rLoc = 5446;
+               rType = 0;
+               vrLen = 1617;
+               vrLoc = 10162;
+       };
+       00D5663F09C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 37";
+               rLen = 0;
+               rLoc = 1144;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5664009C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m 
*/;
+               name = "WaveDriverAirportExtreme.m: 114";
+               rLen = 0;
+               rLoc = 4748;
+               rType = 0;
+               vrLen = 2586;
+               vrLoc = 3297;
+       };
+       00D5664109C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 28";
+               rLen = 0;
+               rLoc = 1004;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5664209C734DD00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 715";
+               rLen = 0;
+               rLoc = 22969;
+               rType = 0;
+               vrLen = 2026;
+               vrLoc = 8885;
+       };
+       00D5666309C7372E00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533AB06A5DD8500AB4577 /* ScanControllerMenus.m */;
+               name = driverWithName;
+               rLen = 14;
+               rLoc = 13412;
+               rType = 0;
+               vrLen = 473;
+               vrLoc = 13275;
+       };
+       00D5666609C737B200FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 28";
+               rLen = 0;
+               rLoc = 1004;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5666709C737B200FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 28";
+               rLen = 0;
+               rLoc = 1004;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5666809C737B200FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 715";
+               rLen = 0;
+               rLoc = 22969;
+               rType = 0;
+               vrLen = 2026;
+               vrLoc = 8885;
+       };
+       00D5668209C73C9000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 28";
+               rLen = 0;
+               rLoc = 1004;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5668309C73C9000FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+               name = "CHANGES: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 2541;
+               vrLoc = 0;
+       };
+       00D5668409C73C9100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h 
*/;
+               name = "WaveDriverAirportExtreme.h: 28";
+               rLen = 0;
+               rLoc = 1004;
+               rType = 0;
+               vrLen = 1149;
+               vrLoc = 0;
+       };
+       00D5668509C73C9100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+               name = "CHANGES: 4";
+               rLen = 0;
+               rLoc = 200;
+               rType = 0;
+               vrLen = 2615;
+               vrLoc = 0;
+       };
+       00D5668609C73C9100FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 715";
+               rLen = 0;
+               rLoc = 22969;
+               rType = 0;
+               vrLen = 2026;
+               vrLoc = 8885;
+       };
+       00D5668909C73CCE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+               name = "CHANGES: 30";
+               rLen = 0;
+               rLoc = 1787;
+               rType = 0;
+               vrLen = 2603;
+               vrLoc = 0;
+       };
+       00D5668A09C73CCE00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 715";
+               rLen = 0;
+               rLoc = 22969;
+               rType = 0;
+               vrLen = 2026;
+               vrLoc = 8885;
+       };
+       00D5668D09C73D6300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+               name = "CHANGES: 30";
+               rLen = 0;
+               rLoc = 1787;
+               rType = 0;
+               vrLen = 2603;
+               vrLoc = 0;
+       };
+       00D5668E09C73D6300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F57CAB06A8887F0035AE2F /* CHANGES */;
+               name = "CHANGES: 30";
+               rLen = 0;
+               rLoc = 1787;
+               rType = 0;
+               vrLen = 2603;
+               vrLoc = 0;
+       };
+       00D5668F09C73D6300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 003533DF06A5DD8500AB4577 /* PrefsDriver.m */;
+               name = "PrefsDriver.m: 310";
+               rLen = 0;
+               rLoc = 10818;
+               rType = 0;
+               vrLen = 1617;
+               vrLoc = 10162;
+       };
+       00D5669009C73D6300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00875D1A0708ADB300CACFCB /* WaveHelper.m */;
+               name = "WaveHelper.m: 715";
+               rLen = 0;
+               rLoc = 22969;
+               rType = 0;
+               vrLen = 2026;
+               vrLoc = 8885;
+       };
        00DF456108B1E969003F3C7E /* WaveDriverAirportExtreme.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {933, 662}}";
-                       sepNavSelRange = "{1082, 8}";
-                       sepNavVisRect = "{{0, 0}, {933, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 662}}";
+                       sepNavSelRange = "{1004, 0}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
        00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1232, 4564}}";
-                       sepNavSelRange = "{3910, 0}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1220, 5082}}";
+                       sepNavSelRange = "{4748, 0}";
                        sepNavVisRect = "{{0, 1284}, {932, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
-       00DF45D208B1FFC1003F3C7E /* WaveDriverAirportExtreme.m:113 */ = {
+       00DF45D208B1FFC1003F3C7E /* WaveDriverAirportExtreme.m:134 */ = {
                isa = PBXFileBreakpoint;
                actions = (
                );
@@ -2308,7 +4122,7 @@
                fileReference = 00DF456208B1E969003F3C7E /* 
WaveDriverAirportExtreme.m */;
                functionName = "+initBackend";
                hitCount = 1;
-               lineNumber = 113;
+               lineNumber = 134;
                modificationTime = 162564239.874767;
                state = 2;
        };
@@ -2324,7 +4138,7 @@
                modificationTime = 162564239.874803;
                state = 2;
        };
-       00DF480508B23BB2003F3C7E /* WaveDriverAirportExtreme.m:110 */ = {
+       00DF480508B23BB2003F3C7E /* WaveDriverAirportExtreme.m:131 */ = {
                isa = PBXFileBreakpoint;
                actions = (
                );
@@ -2333,11 +4147,11 @@
                fileReference = 00DF456208B1E969003F3C7E /* 
WaveDriverAirportExtreme.m */;
                functionName = "+initBackend";
                hitCount = 1;
-               lineNumber = 110;
+               lineNumber = 131;
                modificationTime = 162564239.874824;
                state = 2;
        };
-       00DF481908B23DC8003F3C7E /* WaveDriverAirportExtreme.m:81 */ = {
+       00DF481908B23DC8003F3C7E /* WaveDriverAirportExtreme.m:101 */ = {
                isa = PBXFileBreakpoint;
                actions = (
                );
@@ -2346,7 +4160,7 @@
                fileReference = 00DF456208B1E969003F3C7E /* 
WaveDriverAirportExtreme.m */;
                functionName = "+setMonitorMode:";
                hitCount = 1;
-               lineNumber = 81;
+               lineNumber = 101;
                modificationTime = 162564239.874841;
                state = 2;
        };
@@ -2396,9 +4210,9 @@
        };
        00F57CAB06A8887F0035AE2F /* CHANGES */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {933, 1876}}";
-                       sepNavSelRange = "{11, 0}";
-                       sepNavVisRect = "{{0, 0}, {933, 452}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1850, 5180}}";
+                       sepNavSelRange = "{1787, 0}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
                };
        };
        00F57CAC06A8887F0035AE2F /* TODO */ = {
@@ -2455,16 +4269,18 @@
                        00412E8808265B3300E757BC /* WaveDriverViha.m:106 */,
                        0083C8AA08805F2900D895CB /* BISubView.m:129 */,
                        0083C8E1088062AF00D895CB /* BISubView.m:130 */,
-                       0083C8EC0880633A00D895CB /* MapView.m:210 */,
-                       0083C8EE0880633E00D895CB /* MapView.m:224 */,
+                       0083C8EC0880633A00D895CB /* MapView.m:218 */,
+                       0083C8EE0880633E00D895CB /* MapView.m:232 */,
                        0083C8FF088063B500D895CB /* BIView.m:58 */,
-                       0083C90E088064F700D895CB /* MapView.m:225 */,
-                       00DF45D208B1FFC1003F3C7E /* 
WaveDriverAirportExtreme.m:113 */,
+                       0083C90E088064F700D895CB /* MapView.m:233 */,
+                       00DF45D208B1FFC1003F3C7E /* 
WaveDriverAirportExtreme.m:134 */,
                        00DF45E108B202D6003F3C7E /* WaveDriverAtheros.m:208 */,
-                       00DF480508B23BB2003F3C7E /* 
WaveDriverAirportExtreme.m:110 */,
-                       00DF481908B23DC8003F3C7E /* 
WaveDriverAirportExtreme.m:81 */,
+                       00DF480508B23BB2003F3C7E /* 
WaveDriverAirportExtreme.m:131 */,
+                       00DF481908B23DC8003F3C7E /* 
WaveDriverAirportExtreme.m:101 */,
                        000C1A4108B8BAC800464DAB /* WaveScanner.mm:217 */,
                        0093D1EE09B08C370046F830 /* 
ScanControllerScriptable.m:508 */,
+                       00D5629009C2151100FB787B /* GrowlController.m:1 */,
+                       00D5629209C2151100FB787B /* GrowlController.m:1 */,
                );
                breakpointsGroup = 0083C9130880650C00D895CB /* 
XCBreakpointsBucket */;
                codeSenseManager = 009F5C6106A5C8FF004BB18E /* Code sense */;
@@ -2624,7 +4440,7 @@
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 163628024;
+                       PBXPerProjectTemplateStateSaveDate = 163711778;
                        PBXPrepackagedSmartGroups_v2 = (
                                {
                                        PBXTransientLocationAtTop = bottom;
@@ -3055,55 +4871,26 @@
                                PBXModuleWindowStatusBarHidden = YES;
                                RubberWindowFrame = "267 358 745 464 0 0 1280 
832 ";
                        };
-                       PBXWorkspaceStateSaveDate = 163628024;
+                       PBXWorkspaceStateSaveDate = 163711778;
                };
                perUserProjectItems = {
+                       0017843909C1E5C700530D82 = 0017843909C1E5C700530D82 /* 
PBXTextBookmark */;
+                       0017843A09C1E5C700530D82 = 0017843A09C1E5C700530D82 /* 
PBXBookmark */;
+                       0017843B09C1E5C700530D82 = 0017843B09C1E5C700530D82 /* 
PBXTextBookmark */;
+                       0017843C09C1E5C700530D82 = 0017843C09C1E5C700530D82 /* 
PBXTextBookmark */;
                        001F527E0997D8BD00ED11F1 = 001F527E0997D8BD00ED11F1 /* 
PBXTextBookmark */;
-                       0042E75D09C0C4A500183F90 /* PBXBookmark */ = 
0042E75D09C0C4A500183F90 /* PBXBookmark */;
-                       0042E76009C0C5BE00183F90 /* PBXBookmark */ = 
0042E76009C0C5BE00183F90 /* PBXBookmark */;
-                       0042E76109C0C5BE00183F90 /* PBXTextBookmark */ = 
0042E76109C0C5BE00183F90 /* PBXTextBookmark */;
-                       0042E76609C0C5BE00183F90 /* PBXTextBookmark */ = 
0042E76609C0C5BE00183F90 /* PBXTextBookmark */;
-                       0042E78809C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78809C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E78909C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78909C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E78A09C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78A09C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E78B09C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78B09C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E78C09C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78C09C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E78D09C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78D09C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E78E09C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78E09C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E78F09C0C7D700183F90 /* PBXTextBookmark */ = 
0042E78F09C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E79009C0C7D700183F90 /* PBXTextBookmark */ = 
0042E79009C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E79109C0C7D700183F90 /* PBXTextBookmark */ = 
0042E79109C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E79209C0C7D700183F90 /* PBXTextBookmark */ = 
0042E79209C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E79309C0C7D700183F90 /* PBXTextBookmark */ = 
0042E79309C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E79409C0C7D700183F90 /* PBXTextBookmark */ = 
0042E79409C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E79509C0C7D700183F90 /* PBXTextBookmark */ = 
0042E79509C0C7D700183F90 /* PBXTextBookmark */;
-                       0042E7AF09C0C90F00183F90 /* PBXTextBookmark */ = 
0042E7AF09C0C90F00183F90 /* PBXTextBookmark */;
-                       0042E7B009C0C90F00183F90 /* PBXTextBookmark */ = 
0042E7B009C0C90F00183F90 /* PBXTextBookmark */;
-                       0042E7B109C0C90F00183F90 /* PBXTextBookmark */ = 
0042E7B109C0C90F00183F90 /* PBXTextBookmark */;
-                       0042E7B409C0C92600183F90 /* PBXTextBookmark */ = 
0042E7B409C0C92600183F90 /* PBXTextBookmark */;
-                       0042E7BC09C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7BC09C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7BD09C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7BD09C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7BE09C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7BE09C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7BF09C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7BF09C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7C009C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7C009C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7C109C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7C109C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7C209C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7C209C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7C309C0C97A00183F90 /* PBXTextBookmark */ = 
0042E7C309C0C97A00183F90 /* PBXTextBookmark */;
-                       0042E7DA09C0CB4500183F90 /* PBXTextBookmark */ = 
0042E7DA09C0CB4500183F90 /* PBXTextBookmark */;
-                       0042E7DB09C0CB4500183F90 /* PBXTextBookmark */ = 
0042E7DB09C0CB4500183F90 /* PBXTextBookmark */;
-                       0042E7DC09C0CB4500183F90 /* PBXTextBookmark */ = 
0042E7DC09C0CB4500183F90 /* PBXTextBookmark */;
-                       0042E7DD09C0CB4500183F90 /* PBXTextBookmark */ = 
0042E7DD09C0CB4500183F90 /* PBXTextBookmark */;
-                       0042E7DE09C0CB4500183F90 /* PBXTextBookmark */ = 
0042E7DE09C0CB4500183F90 /* PBXTextBookmark */;
-                       0042E7DF09C0CB4500183F90 /* PBXTextBookmark */ = 
0042E7DF09C0CB4500183F90 /* PBXTextBookmark */;
-                       0042E7E309C0CB8100183F90 /* PBXTextBookmark */ = 
0042E7E309C0CB8100183F90 /* PBXTextBookmark */;
+                       0042E78809C0C7D700183F90 = 0042E78809C0C7D700183F90 /* 
PBXTextBookmark */;
+                       0042E78909C0C7D700183F90 = 0042E78909C0C7D700183F90 /* 
PBXTextBookmark */;
+                       0042E78C09C0C7D700183F90 = 0042E78C09C0C7D700183F90 /* 
PBXTextBookmark */;
+                       0042E78D09C0C7D700183F90 = 0042E78D09C0C7D700183F90 /* 
PBXTextBookmark */;
+                       0042E7BD09C0C97A00183F90 = 0042E7BD09C0C97A00183F90 /* 
PBXTextBookmark */;
+                       0042E7DA09C0CB4500183F90 = 0042E7DA09C0CB4500183F90 /* 
PBXTextBookmark */;
                        0076350309A1B7B6002A5BEF = 0076350309A1B7B6002A5BEF /* 
PBXTextBookmark */;
                        0076352E09A26CAB002A5BEF = 0076352E09A26CAB002A5BEF /* 
PBXTextBookmark */;
                        0076352F09A26CAB002A5BEF = 0076352F09A26CAB002A5BEF /* 
PBXTextBookmark */;
                        0076353009A26CAB002A5BEF = 0076353009A26CAB002A5BEF /* 
PBXTextBookmark */;
                        0076353109A26CAB002A5BEF = 0076353109A26CAB002A5BEF /* 
PBXTextBookmark */;
                        0076353209A26CAB002A5BEF = 0076353209A26CAB002A5BEF /* 
PBXTextBookmark */;
-                       0076353509A26CAB002A5BEF = 0076353509A26CAB002A5BEF /* 
PBXTextBookmark */;
-                       0076353609A26CAB002A5BEF = 0076353609A26CAB002A5BEF /* 
PBXTextBookmark */;
                        0076353709A26CAB002A5BEF = 0076353709A26CAB002A5BEF /* 
PBXTextBookmark */;
                        0076353809A26CAC002A5BEF = 0076353809A26CAC002A5BEF /* 
PBXTextBookmark */;
                        0076353909A26CAC002A5BEF = 0076353909A26CAC002A5BEF /* 
PBXTextBookmark */;
@@ -3124,6 +4911,215 @@
                        0093D1D009B085CB0046F830 = 0093D1D009B085CB0046F830 /* 
PBXTextBookmark */;
                        0093D1D309B085CB0046F830 = 0093D1D309B085CB0046F830 /* 
PBXTextBookmark */;
                        0093D1DA09B086220046F830 = 0093D1DA09B086220046F830 /* 
PBXTextBookmark */;
+                       00B1209D09C2087200AD6B0D = 00B1209D09C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B1209E09C2087200AD6B0D = 00B1209E09C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B1209F09C2087200AD6B0D = 00B1209F09C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A009C2087200AD6B0D = 00B120A009C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A109C2087200AD6B0D = 00B120A109C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A209C2087200AD6B0D = 00B120A209C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A309C2087200AD6B0D = 00B120A309C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A409C2087200AD6B0D = 00B120A409C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A509C2087200AD6B0D = 00B120A509C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A609C2087200AD6B0D = 00B120A609C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A709C2087200AD6B0D = 00B120A709C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A809C2087200AD6B0D = 00B120A809C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120A909C2087200AD6B0D = 00B120A909C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120AA09C2087200AD6B0D = 00B120AA09C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120AB09C2087200AD6B0D = 00B120AB09C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00B120C309C20A7F00AD6B0D = 00B120C309C20A7F00AD6B0D /* 
PBXTextBookmark */;
+                       00B120C409C20A7F00AD6B0D = 00B120C409C20A7F00AD6B0D /* 
PBXTextBookmark */;
+                       00B120C509C20A7F00AD6B0D = 00B120C509C20A7F00AD6B0D /* 
PBXBookmark */;
+                       00B120C609C20A7F00AD6B0D = 00B120C609C20A7F00AD6B0D /* 
PBXTextBookmark */;
+                       00B120C709C20A7F00AD6B0D = 00B120C709C20A7F00AD6B0D /* 
PBXTextBookmark */;
+                       00B120C809C20A7F00AD6B0D = 00B120C809C20A7F00AD6B0D /* 
PBXTextBookmark */;
+                       00D5623109C20B9300FB787B /* PBXTextBookmark */ = 
00D5623109C20B9300FB787B /* PBXTextBookmark */;
+                       00D5623209C20B9300FB787B /* PBXTextBookmark */ = 
00D5623209C20B9300FB787B /* PBXTextBookmark */;
+                       00D5623809C20BA700FB787B /* PBXTextBookmark */ = 
00D5623809C20BA700FB787B /* PBXTextBookmark */;
+                       00D5623909C20BA700FB787B /* PBXTextBookmark */ = 
00D5623909C20BA700FB787B /* PBXTextBookmark */;
+                       00D5623A09C20BA700FB787B /* PBXTextBookmark */ = 
00D5623A09C20BA700FB787B /* PBXTextBookmark */;
+                       00D5624409C20BC800FB787B /* PBXTextBookmark */ = 
00D5624409C20BC800FB787B /* PBXTextBookmark */;
+                       00D5624909C20BDE00FB787B /* PBXTextBookmark */ = 
00D5624909C20BDE00FB787B /* PBXTextBookmark */;
+                       00D5625809C20D8D00FB787B /* PBXTextBookmark */ = 
00D5625809C20D8D00FB787B /* PBXTextBookmark */;
+                       00D5628509C213B200FB787B /* PBXTextBookmark */ = 
00D5628509C213B200FB787B /* PBXTextBookmark */;
+                       00D5628809C214A100FB787B /* PBXTextBookmark */ = 
00D5628809C214A100FB787B /* PBXTextBookmark */;
+                       00D5628909C214A100FB787B /* PBXTextBookmark */ = 
00D5628909C214A100FB787B /* PBXTextBookmark */;
+                       00D5628A09C214A100FB787B /* PBXTextBookmark */ = 
00D5628A09C214A100FB787B /* PBXTextBookmark */;
+                       00D5628B09C214A100FB787B /* PBXTextBookmark */ = 
00D5628B09C214A100FB787B /* PBXTextBookmark */;
+                       00D5628C09C214A100FB787B /* PBXTextBookmark */ = 
00D5628C09C214A100FB787B /* PBXTextBookmark */;
+                       00D5628E09C214F300FB787B /* PBXTextBookmark */ = 
00D5628E09C214F300FB787B /* PBXTextBookmark */;
+                       00D5629609C2153900FB787B /* PBXTextBookmark */ = 
00D5629609C2153900FB787B /* PBXTextBookmark */;
+                       00D5629709C2153900FB787B /* PBXBookmark */ = 
00D5629709C2153900FB787B /* PBXBookmark */;
+                       00D5629809C2153900FB787B /* PBXTextBookmark */ = 
00D5629809C2153900FB787B /* PBXTextBookmark */;
+                       00D5629909C2153900FB787B /* PBXTextBookmark */ = 
00D5629909C2153900FB787B /* PBXTextBookmark */;
+                       00D562AB09C4373300FB787B /* PBXTextBookmark */ = 
00D562AB09C4373300FB787B /* PBXTextBookmark */;
+                       00D562FC09C44A4800FB787B /* PBXTextBookmark */ = 
00D562FC09C44A4800FB787B /* PBXTextBookmark */;
+                       00D562FD09C44A4800FB787B /* PBXTextBookmark */ = 
00D562FD09C44A4800FB787B /* PBXTextBookmark */;
+                       00D562FE09C44A4800FB787B /* PBXTextBookmark */ = 
00D562FE09C44A4800FB787B /* PBXTextBookmark */;
+                       00D562FF09C44A4800FB787B /* PBXTextBookmark */ = 
00D562FF09C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630009C44A4800FB787B /* PBXTextBookmark */ = 
00D5630009C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630109C44A4800FB787B /* PBXTextBookmark */ = 
00D5630109C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630209C44A4800FB787B /* PBXTextBookmark */ = 
00D5630209C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630309C44A4800FB787B /* PBXTextBookmark */ = 
00D5630309C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630409C44A4800FB787B /* PBXTextBookmark */ = 
00D5630409C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630509C44A4800FB787B /* PBXTextBookmark */ = 
00D5630509C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630609C44A4800FB787B /* PBXTextBookmark */ = 
00D5630609C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630709C44A4800FB787B /* PBXTextBookmark */ = 
00D5630709C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630809C44A4800FB787B /* PBXTextBookmark */ = 
00D5630809C44A4800FB787B /* PBXTextBookmark */;
+                       00D5630909C44A4800FB787B /* PBXTextBookmark */ = 
00D5630909C44A4800FB787B /* PBXTextBookmark */;
+                       00D5631609C4787500FB787B /* PBXTextBookmark */ = 
00D5631609C4787500FB787B /* PBXTextBookmark */;
+                       00D5631709C4787500FB787B /* PBXTextBookmark */ = 
00D5631709C4787500FB787B /* PBXTextBookmark */;
+                       00D5631809C4787500FB787B /* PBXTextBookmark */ = 
00D5631809C4787500FB787B /* PBXTextBookmark */;
+                       00D5631909C4787500FB787B /* PBXTextBookmark */ = 
00D5631909C4787500FB787B /* PBXTextBookmark */;
+                       00D5633809C47AA400FB787B /* PBXTextBookmark */ = 
00D5633809C47AA400FB787B /* PBXTextBookmark */;
+                       00D5633909C47AA400FB787B /* PBXTextBookmark */ = 
00D5633909C47AA400FB787B /* PBXTextBookmark */;
+                       00D5633A09C47AA400FB787B /* PBXTextBookmark */ = 
00D5633A09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5633B09C47AA400FB787B /* PBXTextBookmark */ = 
00D5633B09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5633C09C47AA400FB787B /* PBXTextBookmark */ = 
00D5633C09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5633D09C47AA400FB787B /* PBXTextBookmark */ = 
00D5633D09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5633E09C47AA400FB787B /* PBXTextBookmark */ = 
00D5633E09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5633F09C47AA400FB787B /* PBXTextBookmark */ = 
00D5633F09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634009C47AA400FB787B /* PBXTextBookmark */ = 
00D5634009C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634109C47AA400FB787B /* PBXTextBookmark */ = 
00D5634109C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634209C47AA400FB787B /* PBXTextBookmark */ = 
00D5634209C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634309C47AA400FB787B /* PBXTextBookmark */ = 
00D5634309C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634409C47AA400FB787B /* PBXTextBookmark */ = 
00D5634409C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634509C47AA400FB787B /* PBXTextBookmark */ = 
00D5634509C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634609C47AA400FB787B /* PBXTextBookmark */ = 
00D5634609C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634709C47AA400FB787B /* PBXTextBookmark */ = 
00D5634709C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634809C47AA400FB787B /* PBXTextBookmark */ = 
00D5634809C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634909C47AA400FB787B /* PBXTextBookmark */ = 
00D5634909C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634A09C47AA400FB787B /* PBXTextBookmark */ = 
00D5634A09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634B09C47AA400FB787B /* PBXTextBookmark */ = 
00D5634B09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634C09C47AA400FB787B /* PBXTextBookmark */ = 
00D5634C09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634D09C47AA400FB787B /* PBXTextBookmark */ = 
00D5634D09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5634E09C47AA400FB787B /* PBXTextBookmark */ = 
00D5634E09C47AA400FB787B /* PBXTextBookmark */;
+                       00D5635309C47AC300FB787B /* PBXTextBookmark */ = 
00D5635309C47AC300FB787B /* PBXTextBookmark */;
+                       00D5635809C47E9800FB787B /* PBXTextBookmark */ = 
00D5635809C47E9800FB787B /* PBXTextBookmark */;
+                       00D5635909C47E9800FB787B /* PBXTextBookmark */ = 
00D5635909C47E9800FB787B /* PBXTextBookmark */;
+                       00D5635A09C47E9800FB787B /* PBXTextBookmark */ = 
00D5635A09C47E9800FB787B /* PBXTextBookmark */;
+                       00D5635B09C47E9800FB787B /* PBXTextBookmark */ = 
00D5635B09C47E9800FB787B /* PBXTextBookmark */;
+                       00D5635C09C47E9800FB787B /* PBXTextBookmark */ = 
00D5635C09C47E9800FB787B /* PBXTextBookmark */;
+                       00D5635D09C47E9800FB787B /* PBXTextBookmark */ = 
00D5635D09C47E9800FB787B /* PBXTextBookmark */;
+                       00D5635E09C47E9800FB787B /* PBXTextBookmark */ = 
00D5635E09C47E9800FB787B /* PBXTextBookmark */;
+                       00D5636409C4816600FB787B /* PBXTextBookmark */ = 
00D5636409C4816600FB787B /* PBXTextBookmark */;
+                       00D5636509C4816600FB787B /* PBXTextBookmark */ = 
00D5636509C4816600FB787B /* PBXTextBookmark */;
+                       00D5636609C4816600FB787B /* PBXTextBookmark */ = 
00D5636609C4816600FB787B /* PBXTextBookmark */;
+                       00D5636709C4816600FB787B /* PBXTextBookmark */ = 
00D5636709C4816600FB787B /* PBXTextBookmark */;
+                       00D5636809C4816600FB787B /* PBXTextBookmark */ = 
00D5636809C4816600FB787B /* PBXTextBookmark */;
+                       00D5636A09C4816600FB787B /* PBXTextBookmark */ = 
00D5636A09C4816600FB787B /* PBXTextBookmark */;
+                       00D5636B09C4816600FB787B /* PBXTextBookmark */ = 
00D5636B09C4816600FB787B /* PBXTextBookmark */;
+                       00D5636C09C4816600FB787B /* PBXTextBookmark */ = 
00D5636C09C4816600FB787B /* PBXTextBookmark */;
+                       00D5636D09C4816600FB787B /* PBXTextBookmark */ = 
00D5636D09C4816600FB787B /* PBXTextBookmark */;
+                       00D5636E09C4816600FB787B /* PBXTextBookmark */ = 
00D5636E09C4816600FB787B /* PBXTextBookmark */;
+                       00D5636F09C4816600FB787B /* PBXTextBookmark */ = 
00D5636F09C4816600FB787B /* PBXTextBookmark */;
+                       00D5637009C4816600FB787B /* PBXTextBookmark */ = 
00D5637009C4816600FB787B /* PBXTextBookmark */;
+                       00D5637109C4816600FB787B /* PBXTextBookmark */ = 
00D5637109C4816600FB787B /* PBXTextBookmark */;
+                       00D5637209C4816600FB787B /* PBXTextBookmark */ = 
00D5637209C4816600FB787B /* PBXTextBookmark */;
+                       00D5637409C4816600FB787B /* PBXTextBookmark */ = 
00D5637409C4816600FB787B /* PBXTextBookmark */;
+                       00D5637F09C4834000FB787B /* PBXTextBookmark */ = 
00D5637F09C4834000FB787B /* PBXTextBookmark */;
+                       00D5638009C4834000FB787B /* PBXTextBookmark */ = 
00D5638009C4834000FB787B /* PBXTextBookmark */;
+                       00D5638109C4834000FB787B /* PBXTextBookmark */ = 
00D5638109C4834000FB787B /* PBXTextBookmark */;
+                       00D5638209C4834000FB787B /* PBXTextBookmark */ = 
00D5638209C4834000FB787B /* PBXTextBookmark */;
+                       00D5638309C4834000FB787B /* PBXTextBookmark */ = 
00D5638309C4834000FB787B /* PBXTextBookmark */;
+                       00D5638409C4834000FB787B /* PBXTextBookmark */ = 
00D5638409C4834000FB787B /* PBXTextBookmark */;
+                       00D5638509C4834000FB787B /* PBXTextBookmark */ = 
00D5638509C4834000FB787B /* PBXTextBookmark */;
+                       00D5638609C4834000FB787B /* PBXTextBookmark */ = 
00D5638609C4834000FB787B /* PBXTextBookmark */;
+                       00D5638709C4834000FB787B /* PBXTextBookmark */ = 
00D5638709C4834000FB787B /* PBXTextBookmark */;
+                       00D5638809C4834000FB787B /* PBXTextBookmark */ = 
00D5638809C4834000FB787B /* PBXTextBookmark */;
+                       00D5638909C4834000FB787B /* PBXTextBookmark */ = 
00D5638909C4834000FB787B /* PBXTextBookmark */;
+                       00D5638A09C4834000FB787B /* PBXTextBookmark */ = 
00D5638A09C4834000FB787B /* PBXTextBookmark */;
+                       00D5638B09C4834000FB787B /* PBXTextBookmark */ = 
00D5638B09C4834000FB787B /* PBXTextBookmark */;
+                       00D5638C09C4834000FB787B /* PBXTextBookmark */ = 
00D5638C09C4834000FB787B /* PBXTextBookmark */;
+                       00D5638D09C4834000FB787B /* PBXTextBookmark */ = 
00D5638D09C4834000FB787B /* PBXTextBookmark */;
+                       00D5638E09C4834000FB787B /* PBXTextBookmark */ = 
00D5638E09C4834000FB787B /* PBXTextBookmark */;
+                       00D5638F09C4834000FB787B /* PBXTextBookmark */ = 
00D5638F09C4834000FB787B /* PBXTextBookmark */;
+                       00D5639009C4834000FB787B /* PBXTextBookmark */ = 
00D5639009C4834000FB787B /* PBXTextBookmark */;
+                       00D5639109C4834000FB787B /* PBXTextBookmark */ = 
00D5639109C4834000FB787B /* PBXTextBookmark */;
+                       00D5639209C4834000FB787B /* PBXTextBookmark */ = 
00D5639209C4834000FB787B /* PBXTextBookmark */;
+                       00D5639309C4834000FB787B /* PBXTextBookmark */ = 
00D5639309C4834000FB787B /* PBXTextBookmark */;
+                       00D5639409C4834000FB787B /* PBXTextBookmark */ = 
00D5639409C4834000FB787B /* PBXTextBookmark */;
+                       00D5639509C4834000FB787B /* PBXTextBookmark */ = 
00D5639509C4834000FB787B /* PBXTextBookmark */;
+                       00D5639609C4834000FB787B /* PBXTextBookmark */ = 
00D5639609C4834000FB787B /* PBXTextBookmark */;
+                       00D5639709C4834000FB787B /* PBXTextBookmark */ = 
00D5639709C4834000FB787B /* PBXTextBookmark */;
+                       00D5639809C4834000FB787B /* PBXTextBookmark */ = 
00D5639809C4834000FB787B /* PBXTextBookmark */;
+                       00D5639909C4834000FB787B /* PBXTextBookmark */ = 
00D5639909C4834000FB787B /* PBXTextBookmark */;
+                       00D5639A09C4834000FB787B /* PBXTextBookmark */ = 
00D5639A09C4834000FB787B /* PBXTextBookmark */;
+                       00D5639B09C4834000FB787B /* PBXTextBookmark */ = 
00D5639B09C4834000FB787B /* PBXTextBookmark */;
+                       00D5639C09C4834000FB787B /* PBXTextBookmark */ = 
00D5639C09C4834000FB787B /* PBXTextBookmark */;
+                       00D5639D09C4834000FB787B /* PBXTextBookmark */ = 
00D5639D09C4834000FB787B /* PBXTextBookmark */;
+                       00D5639E09C4834000FB787B /* PBXTextBookmark */ = 
00D5639E09C4834000FB787B /* PBXTextBookmark */;
+                       00D5639F09C4834000FB787B /* PBXTextBookmark */ = 
00D5639F09C4834000FB787B /* PBXTextBookmark */;
+                       00D563A009C4834000FB787B /* PBXTextBookmark */ = 
00D563A009C4834000FB787B /* PBXTextBookmark */;
+                       00D563A109C4834000FB787B /* PBXTextBookmark */ = 
00D563A109C4834000FB787B /* PBXTextBookmark */;
+                       00D563A209C4834000FB787B /* PBXTextBookmark */ = 
00D563A209C4834000FB787B /* PBXTextBookmark */;
+                       00D563A309C4834000FB787B /* PBXTextBookmark */ = 
00D563A309C4834000FB787B /* PBXTextBookmark */;
+                       00D563A409C4834000FB787B /* PBXTextBookmark */ = 
00D563A409C4834000FB787B /* PBXTextBookmark */;
+                       00D563A509C4834000FB787B /* PBXTextBookmark */ = 
00D563A509C4834000FB787B /* PBXTextBookmark */;
+                       00D563A609C4834000FB787B /* PBXTextBookmark */ = 
00D563A609C4834000FB787B /* PBXTextBookmark */;
+                       00D563A709C4834000FB787B /* PBXTextBookmark */ = 
00D563A709C4834000FB787B /* PBXTextBookmark */;
+                       00D563A809C4834000FB787B /* PBXTextBookmark */ = 
00D563A809C4834000FB787B /* PBXTextBookmark */;
+                       00D563A909C4834000FB787B /* PBXTextBookmark */ = 
00D563A909C4834000FB787B /* PBXTextBookmark */;
+                       00D563BA09C486E400FB787B /* PBXTextBookmark */ = 
00D563BA09C486E400FB787B /* PBXTextBookmark */;
+                       00D563C009C487DD00FB787B /* PBXTextBookmark */ = 
00D563C009C487DD00FB787B /* PBXTextBookmark */;
+                       00D563C109C487DD00FB787B /* PBXTextBookmark */ = 
00D563C109C487DD00FB787B /* PBXTextBookmark */;
+                       00D563C209C487DD00FB787B /* PBXTextBookmark */ = 
00D563C209C487DD00FB787B /* PBXTextBookmark */;
+                       00D563C509C487DD00FB787B /* PBXTextBookmark */ = 
00D563C509C487DD00FB787B /* PBXTextBookmark */;
+                       00D563C609C487DD00FB787B /* PBXTextBookmark */ = 
00D563C609C487DD00FB787B /* PBXTextBookmark */;
+                       00D563C909C4924100FB787B /* PBXTextBookmark */ = 
00D563C909C4924100FB787B /* PBXTextBookmark */;
+                       00D563CA09C4924100FB787B /* PBXTextBookmark */ = 
00D563CA09C4924100FB787B /* PBXTextBookmark */;
+                       00D563CB09C4924100FB787B /* PBXTextBookmark */ = 
00D563CB09C4924100FB787B /* PBXTextBookmark */;
+                       00D563CC09C4924100FB787B /* PBXTextBookmark */ = 
00D563CC09C4924100FB787B /* PBXTextBookmark */;
+                       00D563CD09C4924100FB787B /* PBXTextBookmark */ = 
00D563CD09C4924100FB787B /* PBXTextBookmark */;
+                       00D563CE09C4924100FB787B /* PBXTextBookmark */ = 
00D563CE09C4924100FB787B /* PBXTextBookmark */;
+                       00D563CF09C4924100FB787B /* PBXTextBookmark */ = 
00D563CF09C4924100FB787B /* PBXTextBookmark */;
+                       00D563D009C4924200FB787B /* PBXTextBookmark */ = 
00D563D009C4924200FB787B /* PBXTextBookmark */;
+                       00D563D109C4924200FB787B /* PBXTextBookmark */ = 
00D563D109C4924200FB787B /* PBXTextBookmark */;
+                       00D563D909C4946B00FB787B /* PBXTextBookmark */ = 
00D563D909C4946B00FB787B /* PBXTextBookmark */;
+                       00D563DA09C4946B00FB787B /* PBXTextBookmark */ = 
00D563DA09C4946B00FB787B /* PBXTextBookmark */;
+                       00D563DB09C4946B00FB787B /* PBXTextBookmark */ = 
00D563DB09C4946B00FB787B /* PBXTextBookmark */;
+                       00D563DC09C4946B00FB787B /* PBXTextBookmark */ = 
00D563DC09C4946B00FB787B /* PBXTextBookmark */;
+                       00D563DD09C4948100FB787B /* PBXTextBookmark */ = 
00D563DD09C4948100FB787B /* PBXTextBookmark */;
+                       00D563DE09C4948100FB787B /* PBXTextBookmark */ = 
00D563DE09C4948100FB787B /* PBXTextBookmark */;
+                       00D563DF09C4948100FB787B /* PBXTextBookmark */ = 
00D563DF09C4948100FB787B /* PBXTextBookmark */;
+                       00D563E009C4948100FB787B /* PBXTextBookmark */ = 
00D563E009C4948100FB787B /* PBXTextBookmark */;
+                       00D563E309C4948100FB787B /* PBXTextBookmark */ = 
00D563E309C4948100FB787B /* PBXTextBookmark */;
+                       00D563E409C4948100FB787B /* PBXTextBookmark */ = 
00D563E409C4948100FB787B /* PBXTextBookmark */;
+                       00D5662409C733D800FB787B /* PBXTextBookmark */ = 
00D5662409C733D800FB787B /* PBXTextBookmark */;
+                       00D5662509C733D800FB787B /* PBXTextBookmark */ = 
00D5662509C733D800FB787B /* PBXTextBookmark */;
+                       00D5662609C733D800FB787B /* PBXTextBookmark */ = 
00D5662609C733D800FB787B /* PBXTextBookmark */;
+                       00D5662709C733D800FB787B /* PBXTextBookmark */ = 
00D5662709C733D800FB787B /* PBXTextBookmark */;
+                       00D5662C09C7343700FB787B /* PBXTextBookmark */ = 
00D5662C09C7343700FB787B /* PBXTextBookmark */;
+                       00D5662D09C7343700FB787B /* PBXTextBookmark */ = 
00D5662D09C7343700FB787B /* PBXTextBookmark */;
+                       00D5662E09C7343700FB787B /* PBXTextBookmark */ = 
00D5662E09C7343700FB787B /* PBXTextBookmark */;
+                       00D5662F09C7343700FB787B /* PBXTextBookmark */ = 
00D5662F09C7343700FB787B /* PBXTextBookmark */;
+                       00D5663009C7343700FB787B /* PBXTextBookmark */ = 
00D5663009C7343700FB787B /* PBXTextBookmark */;
+                       00D5663109C7343700FB787B /* PBXTextBookmark */ = 
00D5663109C7343700FB787B /* PBXTextBookmark */;
+                       00D5663209C7343700FB787B /* PBXTextBookmark */ = 
00D5663209C7343700FB787B /* PBXTextBookmark */;
+                       00D5663909C734DD00FB787B /* PBXTextBookmark */ = 
00D5663909C734DD00FB787B /* PBXTextBookmark */;
+                       00D5663A09C734DD00FB787B /* PBXTextBookmark */ = 
00D5663A09C734DD00FB787B /* PBXTextBookmark */;
+                       00D5663B09C734DD00FB787B /* PBXTextBookmark */ = 
00D5663B09C734DD00FB787B /* PBXTextBookmark */;
+                       00D5663C09C734DD00FB787B /* PBXTextBookmark */ = 
00D5663C09C734DD00FB787B /* PBXTextBookmark */;
+                       00D5663D09C734DD00FB787B /* PBXTextBookmark */ = 
00D5663D09C734DD00FB787B /* PBXTextBookmark */;
+                       00D5663E09C734DD00FB787B /* PBXTextBookmark */ = 
00D5663E09C734DD00FB787B /* PBXTextBookmark */;
+                       00D5663F09C734DD00FB787B /* PBXTextBookmark */ = 
00D5663F09C734DD00FB787B /* PBXTextBookmark */;
+                       00D5664009C734DD00FB787B /* PBXTextBookmark */ = 
00D5664009C734DD00FB787B /* PBXTextBookmark */;
+                       00D5664109C734DD00FB787B /* PBXTextBookmark */ = 
00D5664109C734DD00FB787B /* PBXTextBookmark */;
+                       00D5664209C734DD00FB787B /* PBXTextBookmark */ = 
00D5664209C734DD00FB787B /* PBXTextBookmark */;
+                       00D5666309C7372E00FB787B /* PBXTextBookmark */ = 
00D5666309C7372E00FB787B /* PBXTextBookmark */;
+                       00D5666609C737B200FB787B /* PBXTextBookmark */ = 
00D5666609C737B200FB787B /* PBXTextBookmark */;
+                       00D5666709C737B200FB787B /* PBXTextBookmark */ = 
00D5666709C737B200FB787B /* PBXTextBookmark */;
+                       00D5666809C737B200FB787B /* PBXTextBookmark */ = 
00D5666809C737B200FB787B /* PBXTextBookmark */;
+                       00D5668209C73C9000FB787B /* PBXTextBookmark */ = 
00D5668209C73C9000FB787B /* PBXTextBookmark */;
+                       00D5668309C73C9000FB787B /* PBXTextBookmark */ = 
00D5668309C73C9000FB787B /* PBXTextBookmark */;
+                       00D5668409C73C9100FB787B /* PBXTextBookmark */ = 
00D5668409C73C9100FB787B /* PBXTextBookmark */;
+                       00D5668509C73C9100FB787B /* PBXTextBookmark */ = 
00D5668509C73C9100FB787B /* PBXTextBookmark */;
+                       00D5668609C73C9100FB787B /* PBXTextBookmark */ = 
00D5668609C73C9100FB787B /* PBXTextBookmark */;
+                       00D5668909C73CCE00FB787B /* PBXTextBookmark */ = 
00D5668909C73CCE00FB787B /* PBXTextBookmark */;
+                       00D5668A09C73CCE00FB787B /* PBXTextBookmark */ = 
00D5668A09C73CCE00FB787B /* PBXTextBookmark */;
+                       00D5668D09C73D6300FB787B /* PBXTextBookmark */ = 
00D5668D09C73D6300FB787B /* PBXTextBookmark */;
+                       00D5668E09C73D6300FB787B /* PBXTextBookmark */ = 
00D5668E09C73D6300FB787B /* PBXTextBookmark */;
+                       00D5668F09C73D6300FB787B /* PBXTextBookmark */ = 
00D5668F09C73D6300FB787B /* PBXTextBookmark */;
+                       00D5669009C73D6300FB787B /* PBXTextBookmark */ = 
00D5669009C73D6300FB787B /* PBXTextBookmark */;
                };
                sourceControlManager = 009F5C6006A5C8FF004BB18E /* Source 
Control */;
                userBuildSettings = {
@@ -3143,6 +5139,20 @@
                        sepNavVisRect = "{{0, 0}, {933, 452}}";
                };
        };
+       87CEBA8009AEF03700AEB0B8 /* GrowlController.h */ = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {932, 662}}";
+                       sepNavSelRange = "{224, 0}";
+                       sepNavVisRect = "{{0, 0}, {932, 662}}";
+               };
+       };
+       87CEBA8109AEF03700AEB0B8 /* GrowlController.m */ = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {1094, 2296}}";
+                       sepNavSelRange = "{1018, 0}";
+                       sepNavVisRect = "{{0, 41}, {932, 662}}";
+               };
+       };
        8D1107260486CEB800E47090 /* KisMAC */ = {
                activeExec = 0;
                executables = (

Modified: KisMACng/Sources/Controller/GrowlController.h
===================================================================
--- KisMACng/Sources/Controller/GrowlController.h       2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Sources/Controller/GrowlController.h       2006-03-14 18:35:22 UTC 
(rev 102)
@@ -1,27 +1,27 @@
 /*
- File:                 GrowlController.h
- Program:              KisMAC
- Author:               themacuser at gmail dot com
- mick@xxxxxxxxxxxxxxxx
- Description:  KisMAC is a wireless stumbler for MacOS X.
- 
- This file is part of KisMAC.
- 
- KisMAC is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- 
- KisMAC is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with KisMAC; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+        
+        File:                  GrowlController.h
+        Program:               KisMAC
+               Description:    KisMAC is a wireless stumbler for MacOS X.
+               Author:                 themacuser at gmail dot com
+                
+        This file is part of KisMAC.
 
+    KisMAC is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    KisMAC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with KisMAC; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
 #import <Cocoa/Cocoa.h>
 #import <Growl/Growl.h>
 #import "WavePacket.h"

Modified: KisMACng/Sources/Controller/GrowlController.m
===================================================================
--- KisMACng/Sources/Controller/GrowlController.m       2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Sources/Controller/GrowlController.m       2006-03-14 18:35:22 UTC 
(rev 102)
@@ -1,27 +1,27 @@
 /*
- File:                 GrowlController.m
- Program:              KisMAC
- Author:               themacuser at gmail dot com
- mick@xxxxxxxxxxxxxxxx
- Description:  KisMAC is a wireless stumbler for MacOS X.
- 
- This file is part of KisMAC.
- 
- KisMAC is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- 
- KisMAC is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with KisMAC; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+        
+        File:                  GrowlController.m
+        Program:               KisMAC
+               Description:    KisMAC is a wireless stumbler for MacOS X.
+               Author:                 themacuser at gmail dot com
+        
+        This file is part of KisMAC.
 
+    KisMAC is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    KisMAC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with KisMAC; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
 #import "GrowlController.h"
 
 @implementation GrowlController
@@ -128,7 +128,7 @@
        notifyWithTitle:@"KisMAC"
                description:@"Starting Scan..."
    notificationName:@"Scan Started/Stopped"
-                  iconData:[NSData dataWithData:[[NSImage 
imageNamed:@"network"] TIFFRepresentation]]
+                  iconData:[NSData dataWithData:[[NSImage 
imageNamed:@"devil.icns"] TIFFRepresentation]]
                   priority:0
                   isSticky:NO
           clickContext:nil];
@@ -140,7 +140,7 @@
        notifyWithTitle:@"KisMAC"
                description:@"Stopping Scan..."
    notificationName:@"Scan Started/Stopped"
-                  iconData:[NSData dataWithData:[[NSImage 
imageNamed:@"network"] TIFFRepresentation]]
+                  iconData:[NSData dataWithData:[[NSImage 
imageNamed:@"devil.icns"] TIFFRepresentation]]
                   priority:0
                   isSticky:NO
           clickContext:nil];

Modified: KisMACng/Sources/Controller/ScanController.m
===================================================================
--- KisMACng/Sources/Controller/ScanController.m        2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Sources/Controller/ScanController.m        2006-03-14 18:35:22 UTC 
(rev 102)
@@ -93,7 +93,8 @@
         [NSNumber numberWithInt:0], @"DebugMode",
         [NSNumber numberWithInt:2], @"WaveNetAvgTime",
         [NSArray array], @"ActiveDrivers",
-        [NSNumber numberWithBool: NO], @"useWebService",
+        [NSNumber numberWithBool: NO], @"aeForever",
+               [NSNumber numberWithBool: NO], @"useWebService",
         [NSNumber numberWithBool: NO], @"useWebServiceAutomatically",
         @"", @"webServiceAccount",
         nil];

Modified: KisMACng/Sources/Controller/ScanControllerMenus.m
===================================================================
--- KisMACng/Sources/Controller/ScanControllerMenus.m   2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Sources/Controller/ScanControllerMenus.m   2006-03-14 18:35:22 UTC 
(rev 102)
@@ -369,7 +369,7 @@
     
     wd = [WaveHelper driverWithName:_whichDriver];
     if (!wd) {
-        NSLog(@"Error: invalid driver selected");
+        NSLog(@"Error: invalid driver selected (%@)", _whichDriver);
         return;
     }
     

Modified: KisMACng/Sources/Controller/ScanControllerPrivate.h
===================================================================
--- KisMACng/Sources/Controller/ScanControllerPrivate.h 2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Sources/Controller/ScanControllerPrivate.h 2006-03-14 18:35:22 UTC 
(rev 102)
@@ -2,9 +2,9 @@
         
         File:                  ScanControllerPrivate.h
         Program:               KisMAC
-       Author:                 Michael Rossberg
-                               mick@xxxxxxxxxxxxxxxx
-       Description:            KisMAC is a wireless stumbler for MacOS X.
+               Author:                 Michael Rossberg
+                                               mick@xxxxxxxxxxxxxxxx
+               Description:    KisMAC is a wireless stumbler for MacOS X.
                 
         This file is part of KisMAC.
 

Modified: KisMACng/Sources/Controller/ScanControllerPrivate.m
===================================================================
--- KisMACng/Sources/Controller/ScanControllerPrivate.m 2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Sources/Controller/ScanControllerPrivate.m 2006-03-14 18:35:22 UTC 
(rev 102)
@@ -66,8 +66,11 @@
         a = [a sortedArrayUsingSelector:@selector(compareDrivers:)];
 
         whichDriver = [sets objectForKey:@"whichDriver"];
-        if (!whichDriver) whichDriver = [[a objectAtIndex:0] deviceName];
-        
+        if (!whichDriver) {
+                       whichDriver = [[a objectAtIndex:0] deviceName];
+                       [sets setObject:whichDriver forKey:@"whichDriver"];
+               }
+               
         for (x = 0; x < [a count]; x++) {
             wd = [a objectAtIndex:x];
             mi = (NSMenuItem*)[aChannelMenu insertItemWithTitle:[wd 
deviceName] action:@selector(selDriver:) keyEquivalent:@"" atIndex:0];

Modified: KisMACng/Sources/Core/WaveHelper.m
===================================================================
--- KisMACng/Sources/Core/WaveHelper.m  2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Sources/Core/WaveHelper.m  2006-03-14 18:35:22 UTC (rev 102)
@@ -224,7 +224,7 @@
         if (![self isServiceAvailable:"AiroJackDriver"]) return NO;
         else return YES;
     case 4:
-        if ([self isServiceAvailable:"AirPortDriver"] || [self 
isServiceAvailable:"AirPortPCI"] || [WaveHelper 
isServiceAvailable:"AirPort_Athr5424"]) return YES;
+        if ([self isServiceAvailable:"AirPortDriver"] || [self 
isServiceAvailable:"AirPortPCI"] || [self isServiceAvailable:"AirPortPCI_MM"]  
|| [WaveHelper isServiceAvailable:"AirPort_Athr5424"]) return YES;
         else return NO;
     default:
         return NO;

Modified: KisMACng/Sources/Obsolete/ValuePair.m
===================================================================
--- KisMACng/Sources/Obsolete/ValuePair.m       2006-03-14 17:28:02 UTC (rev 
101)
+++ KisMACng/Sources/Obsolete/ValuePair.m       2006-03-14 18:35:22 UTC (rev 
102)
@@ -76,6 +76,7 @@
     waypoint w;
     w._long = _x;
     w._lat  = _y;
+       w._elevation = 0.0;
     return w;
 }
 

Modified: KisMACng/Sources/Preferences/PreferencePanes/PrefsDriver.m
===================================================================
--- KisMACng/Sources/Preferences/PreferencePanes/PrefsDriver.m  2006-03-14 
17:28:02 UTC (rev 101)
+++ KisMACng/Sources/Preferences/PreferencePanes/PrefsDriver.m  2006-03-14 
18:35:22 UTC (rev 102)
@@ -73,9 +73,11 @@
     NSDictionary *d = Nil;
     unsigned int x, y;
     int val, startCorrect = 0;
+       BOOL aeEnabledForever;
     
+       aeEnabledForever = [[controller objectForKey:@"aeForever"] boolValue] 
&& [WaveDriverAirportExtreme monitorModeEnabled];
     [_frequence     setFloatValue:  [[controller objectForKey:@"frequence"   ] 
floatValue]];
-    [_aeForever     setState:       [WaveDriverAirportExtreme 
getMonitorMode]]; 
+    [_aeForever     setState:       aeEnabledForever ? NSOnState : 
NSOffState]; 
 
     if ([_driverTable numberOfSelectedRows]) {
         d = [self getCurrentSettings];
@@ -157,6 +159,7 @@
     unsigned int x, y;
     
     [controller setObject:[NSNumber numberWithFloat: [_frequence     
floatValue]]    forKey:@"frequence"];
+    [controller setObject:[NSNumber numberWithBool: [_aeForever state] == 
NSOnState] forKey:@"aeForever"];
 
     if (i < 0) return YES;
     d = [[self getCurrentSettings] mutableCopy];

Modified: KisMACng/Sources/Views/MapView.m
===================================================================
--- KisMACng/Sources/Views/MapView.m    2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Sources/Views/MapView.m    2006-03-14 18:35:22 UTC (rev 102)
@@ -167,10 +167,18 @@
                if ([settings objectForKey:@"fileName"]) {
                        img = [[NSImage alloc] initWithContentsOfFile:[mapName 
stringByAppendingPathComponent:[[wps objectAtIndex:2] 
objectForKey:@"fileName"]]];
         } 
+       NS_HANDLER
+    NS_ENDHANDLER
+       
+       NS_DURING
+       if (!img) {
+               img = [[NSImage alloc] initWithContentsOfFile:[mapName 
stringByAppendingPathComponent:@"map.pdf"]];
+       }
+       NS_HANDLER
+    NS_ENDHANDLER
+       
+       NS_DURING
                if (!img) {
-                       img = [[NSImage alloc] initWithContentsOfFile:[mapName 
stringByAppendingPathComponent:@"map.pdf"]];
-               }
-               if (!img) {
                        //fall back
                        img = [[NSImage alloc] initWithContentsOfFile:[mapName 
stringByAppendingPathComponent:@"map.png"]];
                }

Modified: KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.h
===================================================================
--- KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.h     2006-03-14 
17:28:02 UTC (rev 101)
+++ KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.h     2006-03-14 
18:35:22 UTC (rev 102)
@@ -29,8 +29,9 @@
 
 @interface WaveDriverAirportExtreme : WaveDriver {
        pcap_t *_device;
-       UInt8 _channel;
 }
 
-+ (BOOL)getMonitorMode;
++ (BOOL)monitorModeEnabled;
++ (void)setMonitorMode:(BOOL)enable;
+
 @end

Modified: KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m
===================================================================
--- KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m     2006-03-14 
17:28:02 UTC (rev 101)
+++ KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m     2006-03-14 
18:35:22 UTC (rev 102)
@@ -28,7 +28,6 @@
 #import "WaveHelper.h"
 #import <BIGeneric/BIGeneric.h>
 
-#define driverName "AirportExtremeDriver"
 #define devicePath @"wlt1"
 #define optionsFile 
@"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist"
 #define devFile @"/dev/bpf0"
@@ -68,24 +67,49 @@
        return NO;
 }
 
-+ (void)setMonitorMode:(BOOL)enable {
++ (BOOL)monitorModeEnabled {
+       NSDictionary *dict;
+       NSData *fileData;
+       
+       fileData = [NSData 
dataWithContentsOfFile:@"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist"];
+       dict = [NSPropertyListSerialization propertyListFromData:fileData 
mutabilityOption:kCFPropertyListImmutable format:NULL errorDescription:Nil];
+       if ([[dict valueForKeyPath:@"IOKitPersonalities.Broadcom 
PCI.APMonitorMode"] boolValue]) return YES;
+       
+       fileData = [NSData 
dataWithContentsOfFile:@"/System/Library/Extensions/IO80211Family.kext/Contents/PlugIns/AppleAirPortBrcm4311.kext/Contents/Info.plist"];
+       dict = [NSPropertyListSerialization propertyListFromData:fileData 
mutabilityOption:kCFPropertyListImmutable format:NULL errorDescription:Nil];
+       if ([[dict valueForKeyPath:@"IOKitPersonalities.Broadcom 
PCI.APMonitorMode"] boolValue]) return YES;
+       
+       return NO;
+}
+
++ (BOOL)setMonitorMode:(BOOL)enable forFile:(NSString*)fileName {
        [NSThread sleep:1.0];
-       [[BLAuthentication sharedInstance] executeCommand:@"/usr/bin/chgrp" 
withArgs:[NSArray arrayWithObjects:@"admin", optionsFile, nil]];
-       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0664", optionsFile, nil]];
+       [[BLAuthentication sharedInstance] executeCommand:@"/usr/bin/chgrp" 
withArgs:[NSArray arrayWithObjects:@"admin", fileName, nil]];
+       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0664", fileName, nil]];
        
        [NSThread sleep:1.0];
-       NSDictionary *dict= [NSPropertyListSerialization 
propertyListFromData:[NSData dataWithContentsOfFile:optionsFile] 
mutabilityOption:kCFPropertyListMutableContainers format:NULL 
errorDescription:Nil];
+       NSDictionary *dict = [NSPropertyListSerialization 
propertyListFromData:[NSData dataWithContentsOfFile:fileName] 
mutabilityOption:kCFPropertyListMutableContainers format:NULL 
errorDescription:Nil];
        [dict setValue:[NSNumber numberWithBool:enable] 
forKeyPath:@"IOKitPersonalities.Broadcom PCI.APMonitorMode"];
-       [[NSPropertyListSerialization dataFromPropertyList:dict 
format:kCFPropertyListXMLFormat_v1_0 errorDescription:nil] 
writeToFile:optionsFile atomically:NO];
+       [[NSPropertyListSerialization dataFromPropertyList:dict 
format:kCFPropertyListXMLFormat_v1_0 errorDescription:nil] writeToFile:fileName 
atomically:NO];
                
-       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0644", optionsFile, nil]];
-       [[BLAuthentication sharedInstance] executeCommand:@"/usr/bin/chgrp" 
withArgs:[NSArray arrayWithObjects:@"wheel", optionsFile, nil]];
-       [NSThread sleep:1.0];
+       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0644", fileName, nil]];
+       [[BLAuthentication sharedInstance] executeCommand:@"/usr/bin/chgrp" 
withArgs:[NSArray arrayWithObjects:@"wheel", fileName, nil]];
+       
+       return YES;
 }
 
-+ (BOOL)getMonitorMode {
-    NSDictionary *dict= [NSPropertyListSerialization 
propertyListFromData:[NSData dataWithContentsOfFile:optionsFile] 
mutabilityOption:kCFPropertyListMutableContainers format:NULL 
errorDescription:Nil];
-       return [[dict valueForKeyPath:@"IOKitPersonalities.Broadcom 
PCI.APMonitorMode"] boolValue];
++ (void)setMonitorMode:(BOOL)enable {
+       NSUserDefaults *defs;
+    
+    defs = [NSUserDefaults standardUserDefaults];
+    [WaveDriverAirportExtreme setMonitorMode:enable 
forFile:@"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist"];
+       [WaveDriverAirportExtreme setMonitorMode:enable 
forFile:@"/System/Library/Extensions/IO80211Family.kext/Contents/PlugIns/AppleAirPortBrcm4311.kext/Contents/Info.plist"];
+       
+       if ([[defs objectForKey:@"aeForever"] boolValue]) {
+               [[BLAuthentication sharedInstance] executeCommand:@"/bin/rm" 
withArgs:[NSArray arrayWithObject:@"/System/Library/Extensions.kextcache"]];
+               [[BLAuthentication sharedInstance] 
executeCommand:@"/usr/sbin/kextcache" withArgs:[NSArray arrayWithObjects:@"-k", 
@"/System/Library/Extensions", nil]];
+               [[BLAuthentication sharedInstance] executeCommand:@"/bin/rm" 
withArgs:[NSArray arrayWithObject:@"/System/Library/Extensions.mkext"]];
+       }
 }
 
 // return 0 for success, 1 for error, 2 for self handled error
@@ -97,8 +121,8 @@
     
     defs = [NSUserDefaults standardUserDefaults];
     if ([WaveDriverAirportExtreme deviceAvailable]) return 0;
-    if (![[defs objectForKey:@"aeForever"] intValue]){
-        //NSLog(@"Loading AE Passive for this session only!");
+    if (![[defs objectForKey:@"aeForever"] boolValue]){
+        NSLog(@"Loading AE Passive for this session only!");
         explicitlyLoadedAirportExtremeDriver = YES;
     
         if (NSAppKitVersionNumber < 824.11) {
@@ -141,8 +165,6 @@
                NSLocalizedString(@"Could not load Monitor Mode for Airport 
Extreme. Drivers were not found.  If you just enabled Monitor Mode permanently, 
you must reboot.", "Error dialog description"),
                OK, nil, nil);
        
-       
-       
        return 2;
 }
 
@@ -175,18 +197,18 @@
 
 + (bool) unloadBackend {
        BOOL ret;
-    if (!explicitlyLoadedAirportExtremeDriver) return YES;
+    if (explicitlyLoadedAirportExtremeDriver) {
+               ret = [[BLAuthentication sharedInstance] 
executeCommand:@"/sbin/kextunload" withArgs:[NSArray arrayWithObjects:@"-b", 
@"com.apple.iokit.AppleAirPort2", nil]];
+               if (!ret) {
+                       NSLog(@"WARNING!!! User canceled password dialog for: 
kextunload");
+                       return NO;
+               }
+               [WaveDriverAirportExtreme setMonitorMode:NO];
+               [[BLAuthentication sharedInstance] 
executeCommand:@"/sbin/kextload" withArgs:[NSArray 
arrayWithObject:@"/System/Library/Extensions/AppleAirPort2.kext"]];
 
-       ret = [[BLAuthentication sharedInstance] 
executeCommand:@"/sbin/kextunload" withArgs:[NSArray arrayWithObjects:@"-b", 
@"com.apple.iokit.AppleAirPort2", nil]];
-       if (!ret) {
-               NSLog(@"WARNING!!! User canceled password dialog for: 
kextunload");
-               return NO;
+               [NSThread sleep:1.0];
        }
-       [WaveDriverAirportExtreme setMonitorMode:NO];
-       [[BLAuthentication sharedInstance] executeCommand:@"/sbin/kextload" 
withArgs:[NSArray 
arrayWithObject:@"/System/Library/Extensions/AppleAirPort2.kext"]];
        
-       [NSThread sleep:1.0];
-
        [[NSTask 
launchedTaskWithLaunchPath:@"/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport"
                arguments:[NSArray arrayWithObject:@"-a"]] waitUntilExit];
 
@@ -200,6 +222,8 @@
        
        if (![[BLAuthentication sharedInstance] 
executeCommand:@"/usr/bin/chgrp" withArgs:[NSArray arrayWithObjects:@"admin", 
devFile, nil]]) return Nil;
        if (![[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0660", devFile, nil]]) return Nil;
+       [NSThread sleep:0.5];
+       
        _device = pcap_open_live([devicePath cString], 3000, 0, 2, err);
        [[BLAuthentication sharedInstance] executeCommand:@"/usr/bin/chgrp" 
withArgs:[NSArray arrayWithObjects:@"admin", devFile, nil]];
        [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0660", devFile, nil]];
@@ -215,17 +239,18 @@
 #pragma mark -
 
 - (unsigned short) getChannelUnCached {
-       return _channel;
+       return _currentChannel;
 }
 
 - (bool) setChannel:(unsigned short)newChannel {
    [[NSTask 
launchedTaskWithLaunchPath:@"/System/Library/PrivateFrameworks/Apple80211.framework/Resources/airport"
                arguments:[NSArray arrayWithObjects:@"-z", [NSString 
stringWithFormat:@"--channel=%u", newChannel], nil]] waitUntilExit];
-       _channel = newChannel;
+       _currentChannel = newChannel;
     return YES;
 }
 
 - (bool) startCapture:(unsigned short)newChannel {
+       [self setChannel:newChannel];
     return YES;
 }
 

Modified: KisMACng/Subprojects/BIGL/BIGL.h
===================================================================
--- KisMACng/Subprojects/BIGL/BIGL.h    2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/BIGL/BIGL.h    2006-03-14 18:35:22 UTC (rev 102)
@@ -2,9 +2,9 @@
         
         File:                  BIGL.h
         Program:               binaervarianz OpenGL Framework
-       Author:                 Michael RoÃberg
-                               mick@xxxxxxxxxxxxxxxx
-       Description:            This framework provides abstract Cocoa methods 
to quickly draw 2D sprites
+               Author:                 Michael Rossberg
+                                               mick@xxxxxxxxxxxxxxxx
+               Description:    This framework provides abstract Cocoa methods 
to quickly draw 2D sprites
                 
         This file is part of BIGL.
 

Modified: KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.mode1
===================================================================
--- KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.mode1 2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.mode1 2006-03-14 18:35:22 UTC 
(rev 102)
@@ -255,16 +255,16 @@
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
                                                        <array>
                                                                
<string>0867D691FE84028FC02AAC07</string>
+                                                               
<string>08FB77AEFE84172EC02AAC07</string>
                                                                
<string>1C37FBAC04509CD000000102</string>
-                                                               
<string>00B4DD09086C7531009A8F23</string>
                                                                
<string>1C37FABC05509CD000000102</string>
                                                        </array>
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       
<integer>13</integer>
-                                                                       
<integer>7</integer>
-                                                                       
<integer>6</integer>
+                                                                       
<integer>4</integer>
+                                                                       
<integer>1</integer>
+                                                                       
<integer>0</integer>
                                                                </array>
                                                        </array>
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@@ -298,12 +298,14 @@
                                        <key>Dock</key>
                                        <array>
                                                <dict>
+                                                       <key>BecomeActive</key>
+                                                       <true/>
                                                        
<key>ContentConfiguration</key>
                                                        <dict>
                                                                
<key>PBXProjectModuleGUID</key>
                                                                
<string>1CE0B20306471E060097A5F4</string>
                                                                
<key>PBXProjectModuleLabel</key>
-                                                               
<string>MyNewFile14.java</string>
+                                                               
<string>BIGLView.m</string>
                                                                
<key>PBXSplitModuleInNavigatorKey</key>
                                                                <dict>
                                                                        
<key>Split0</key>
@@ -311,7 +313,20 @@
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CE0B20406471E060097A5F4</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>MyNewFile14.java</string>
+                                                                               
<string>BIGLView.m</string>
+                                                                               
<key>_historyCapacity</key>
+                                                                               
<integer>20</integer>
+                                                                               
<key>bookmark</key>
+                                                                               
<string>00D5631309C4786900FB787B</string>
+                                                                               
<key>history</key>
+                                                                               
<array>
+                                                                               
        <string>00D562EC09C4391F00FB787B</string>
+                                                                               
        <string>00D562ED09C4391F00FB787B</string>
+                                                                               
</array>
+                                                                               
<key>prevStack</key>
+                                                                               
<array>
+                                                                               
        <string>00D562EE09C4391F00FB787B</string>
+                                                                               
</array>
                                                                        </dict>
                                                                        
<key>SplitCount</key>
                                                                        
<string>1</string>
@@ -322,18 +337,16 @@
                                                        
<key>GeometryConfiguration</key>
                                                        <dict>
                                                                <key>Frame</key>
-                                                               <string>{{0, 
0}, {1072, 0}}</string>
+                                                               <string>{{0, 
0}, {1072, 694}}</string>
                                                                
<key>RubberWindowFrame</key>
                                                                <string>0 92 
1280 740 0 0 1280 832 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        
<string>PBXNavigatorGroup</string>
                                                        <key>Proportion</key>
-                                                       <string>0pt</string>
+                                                       <string>694pt</string>
                                                </dict>
                                                <dict>
-                                                       <key>BecomeActive</key>
-                                                       <true/>
                                                        
<key>ContentConfiguration</key>
                                                        <dict>
                                                                
<key>PBXProjectModuleGUID</key>
@@ -344,14 +357,14 @@
                                                        
<key>GeometryConfiguration</key>
                                                        <dict>
                                                                <key>Frame</key>
-                                                               <string>{{0, 
5}, {1072, 694}}</string>
+                                                               <string>{{0, 
699}, {1072, 0}}</string>
                                                                
<key>RubberWindowFrame</key>
                                                                <string>0 92 
1280 740 0 0 1280 832 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        
<string>XCDetailModule</string>
                                                        <key>Proportion</key>
-                                                       <string>694pt</string>
+                                                       <string>0pt</string>
                                                </dict>
                                        </array>
                                        <key>Proportion</key>
@@ -370,9 +383,9 @@
                        </array>
                        <key>TableOfContents</key>
                        <array>
-                               <string>00B4DD0A086C7531009A8F23</string>
+                               <string>00D562F009C4391F00FB787B</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
-                               <string>00B4DD0B086C7531009A8F23</string>
+                               <string>00D562F109C4391F00FB787B</string>
                                <string>1CE0B20306471E060097A5F4</string>
                                <string>1CE0B20506471E060097A5F4</string>
                        </array>
@@ -589,7 +602,7 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>006247E308328E0A0023D3AB</string>
-                               <string>00B4DCFE086C74EA009A8F23</string>
+                               <string>00D562DC09C4386500FB787B</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>

Modified: KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.pbxuser
===================================================================
--- KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.pbxuser       2006-03-14 
17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/BIGL/BIGL.xcodeproj/mick.pbxuser       2006-03-14 
18:35:22 UTC (rev 102)
@@ -14,25 +14,25 @@
        };
        000238DB06933029007C44ED /* BIGLView.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {945, 615}}";
-                       sepNavSelRange = "{713, 0}";
-                       sepNavVisRect = "{{0, 154}, {945, 461}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1025, 662}}";
+                       sepNavSelRange = "{285, 0}";
+                       sepNavVisRect = "{{0, 0}, {1025, 662}}";
                        sepNavWindowFrame = "{{61, 227}, {750, 558}}";
                };
        };
        000238DC06933029007C44ED /* BIGLView.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {716, 3682}}";
-                       sepNavSelRange = "{6252, 23}";
-                       sepNavVisRect = "{{0, 2742}, {459, 186}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1025, 3682}}";
+                       sepNavSelRange = "{6277, 0}";
+                       sepNavVisRect = "{{0, 2504}, {1025, 662}}";
                        sepNavWindowFrame = "{{38, 248}, {750, 558}}";
                };
        };
        000239B20693365E007C44ED /* BIGL.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1057, 489}}";
-                       sepNavSelRange = "{693, 0}";
-                       sepNavVisRect = "{{0, 205}, {1057, 256}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {1025, 662}}";
+                       sepNavSelRange = "{387, 0}";
+                       sepNavVisRect = "{{0, 0}, {1025, 662}}";
                };
        };
        00023ACA069347CC007C44ED /* BIGLSubView.h */ = {
@@ -91,14 +91,16 @@
        };
        005D9B8C069DDC3400A4BA7B /* BIGLView.m:212 */ = {
                isa = PBXFileBreakpoint;
+               actions = (
+               );
                continueAfterActions = 0;
                delayBeforeContinue = 0;
                fileReference = 000238DC06933029007C44ED /* BIGLView.m */;
                functionName = "-dataWithTIFFInsideRect:";
                hitCount = 0;
                lineNumber = 212;
-               modificationTime = 0;
-               state = 1;
+               modificationTime = 163854615.467753;
+               state = 2;
        };
        00A299F60693EC1500E39953 /* BIGLPolyView.h */ = {
                uiCtxt = {
@@ -129,6 +131,46 @@
                        sepNavVisRect = "{{0, 1019}, {1057, 689}}";
                };
        };
+       00D562EC09C4391F00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 000238DB06933029007C44ED /* BIGLView.h */;
+               name = "BIGLView.h: 9";
+               rLen = 0;
+               rLoc = 285;
+               rType = 0;
+               vrLen = 1419;
+               vrLoc = 0;
+       };
+       00D562ED09C4391F00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 000238DC06933029007C44ED /* BIGLView.m */;
+               name = "src = imageBuffer;";
+               rLen = 39;
+               rLoc = 6252;
+               rType = 0;
+               vrLen = 1560;
+               vrLoc = 5382;
+       };
+       00D562EE09C4391F00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 000238DB06933029007C44ED /* BIGLView.h */;
+               name = "BIGLView.h: 9";
+               rLen = 0;
+               rLoc = 285;
+               rType = 0;
+               vrLen = 1419;
+               vrLoc = 0;
+       };
+       00D5631309C4786900FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 000238DC06933029007C44ED /* BIGLView.m */;
+               name = "BIGLView.m: 203";
+               rLen = 0;
+               rLoc = 6277;
+               rType = 0;
+               vrLen = 1576;
+               vrLoc = 5382;
+       };
        00F514C606944F0500F4D67C /* BIGLLineView.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1057, 689}}";
@@ -235,9 +277,9 @@
                                PBXFileTableDataSourceColumnSortingKey = 
PBXSymbolsDataSource_SymbolNameID;
                                PBXFileTableDataSourceColumnWidthsKey = (
                                        16,
-                                       301.8008,
-                                       329.0356,
-                                       306.2085,
+                                       301,
+                                       329,
+                                       393.2085,
                                );
                                PBXFileTableDataSourceColumnsKey = (
                                        PBXSymbolsDataSource_SymbolTypeIconID,
@@ -268,7 +310,7 @@
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 141325504;
+                       PBXPerProjectTemplateStateSaveDate = 163854304;
                        PBXPrepackagedSmartGroups_v2 = (
                                {
                                        PBXTransientLocationAtTop = bottom;
@@ -723,8 +765,14 @@
                                };
                                RubberWindowFrame = "0 84 1280 748 0 0 1280 832 
";
                        };
-                       PBXWorkspaceStateSaveDate = 141325504;
+                       PBXWorkspaceStateSaveDate = 163854304;
                };
+               perUserProjectItems = {
+                       00D562EC09C4391F00FB787B /* PBXTextBookmark */ = 
00D562EC09C4391F00FB787B /* PBXTextBookmark */;
+                       00D562ED09C4391F00FB787B /* PBXTextBookmark */ = 
00D562ED09C4391F00FB787B /* PBXTextBookmark */;
+                       00D562EE09C4391F00FB787B /* PBXTextBookmark */ = 
00D562EE09C4391F00FB787B /* PBXTextBookmark */;
+                       00D5631309C4786900FB787B /* PBXTextBookmark */ = 
00D5631309C4786900FB787B /* PBXTextBookmark */;
+               };
                sourceControlManager = 000238D906933015007C44ED /* Source 
Control */;
                userBuildSettings = {
                };

Modified: KisMACng/Subprojects/BIGL/BIGLView.h
===================================================================
--- KisMACng/Subprojects/BIGL/BIGLView.h        2006-03-14 17:28:02 UTC (rev 
101)
+++ KisMACng/Subprojects/BIGL/BIGLView.h        2006-03-14 18:35:22 UTC (rev 
102)
@@ -2,9 +2,9 @@
         
         File:                  BIGLView.h
         Program:               binaervarianz OpenGL Framework
-       Author:                 Michael RoÃberg
-                               mick@xxxxxxxxxxxxxxxx
-       Description:            This framework provides abstract Cocoa methods 
to quickly draw 2D sprites
+               Author:                 Michael Rossberg
+                                               mick@xxxxxxxxxxxxxxxx
+               Description:    This framework provides abstract Cocoa methods 
to quickly draw 2D sprites
                 
         This file is part of BIGL.
 

Modified: KisMACng/Subprojects/BIGL/BIGLView.m
===================================================================
--- KisMACng/Subprojects/BIGL/BIGLView.m        2006-03-14 17:28:02 UTC (rev 
101)
+++ KisMACng/Subprojects/BIGL/BIGLView.m        2006-03-14 18:35:22 UTC (rev 
102)
@@ -200,7 +200,7 @@
                         bytesPerRow: 0
                         bitsPerPixel: 0];
                         
-    src = imageBuffer;
+    src = (unsigned char*)imageBuffer;
     end = src + bytesPerImage;
     dest = [b bitmapData];
 

Modified: KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.mode1
===================================================================
--- KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.mode1       
2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.mode1       
2006-03-14 18:35:22 UTC (rev 102)
@@ -256,23 +256,19 @@
                                                        <array>
                                                                
<string>0867D691FE84028FC02AAC07</string>
                                                                
<string>08FB77AEFE84172EC02AAC07</string>
-                                                               
<string>0867D69AFE84028FC02AAC07</string>
-                                                               
<string>1058C7B0FEA5585E11CA2CBB</string>
-                                                               
<string>034768DFFF38A50411DB9C8B</string>
                                                                
<string>1C37FBAC04509CD000000102</string>
-                                                               
<string>00B4DD16086C759A009A8F23</string>
                                                                
<string>1C37FABC05509CD000000102</string>
                                                        </array>
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       
<integer>44</integer>
-                                                                       
<integer>37</integer>
-                                                                       
<integer>36</integer>
+                                                                       
<integer>19</integer>
+                                                                       
<integer>1</integer>
+                                                                       
<integer>0</integer>
                                                                </array>
                                                        </array>
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-                                                       <string>{{0, 220}, 
{186, 681}}</string>
+                                                       <string>{{0, 0}, {186, 
681}}</string>
                                                </dict>
                                                <key>PBXTopSmartGroupGIDs</key>
                                                <array/>
@@ -321,12 +317,12 @@
                                                                                
<key>_historyCapacity</key>
                                                                                
<integer>0</integer>
                                                                                
<key>bookmark</key>
-                                                                               
<string>00B4DD1D086C759A009A8F23</string>
+                                                                               
<string>00D5631009C4785D00FB787B</string>
                                                                                
<key>history</key>
                                                                                
<array>
                                                                                
        <string>00B4DD17086C759A009A8F23</string>
                                                                                
        <string>00B4DD18086C759A009A8F23</string>
-                                                                               
        <string>00B4DD19086C759A009A8F23</string>
+                                                                               
        <string>00D562E309C4386D00FB787B</string>
                                                                                
</array>
                                                                                
<key>prevStack</key>
                                                                                
<array>
@@ -390,9 +386,9 @@
                        </array>
                        <key>TableOfContents</key>
                        <array>
-                               <string>00B4DD1E086C759A009A8F23</string>
+                               <string>00D562EA09C438F500FB787B</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
-                               <string>00B4DD1F086C759A009A8F23</string>
+                               <string>00D562EB09C438F500FB787B</string>
                                <string>1CE0B20306471E060097A5F4</string>
                                <string>1CE0B20506471E060097A5F4</string>
                        </array>
@@ -551,7 +547,7 @@
                                                                
<key>PBXProjectModuleGUID</key>
                                                                
<string>1CD0528F0623707200166675</string>
                                                                
<key>PBXProjectModuleLabel</key>
-                                                               
<string>BIZoomView.m</string>
+                                                               
<string></string>
                                                                
<key>StatusBarVisibility</key>
                                                                <true/>
                                                        </dict>
@@ -609,7 +605,7 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>006247D408328DC60023D3AB</string>
-                               <string>00B4DCEA086C74BB009A8F23</string>
+                               <string>00D562F809C4395600FB787B</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>

Modified: KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.pbxuser
===================================================================
--- KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.pbxuser     
2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/mick.pbxuser     
2006-03-14 18:35:22 UTC (rev 102)
@@ -126,16 +126,6 @@
                vrLen = 355;
                vrLoc = 0;
        };
-       00B4DD19086C759A009A8F23 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00F15E4306975F6A00AF33BA /* BIZoomView.m */;
-               name = "self = [super initWithFrame:frameRect];";
-               rLen = 44;
-               rLoc = 237;
-               rType = 0;
-               vrLen = 502;
-               vrLoc = 34;
-       };
        00B4DD1A086C759A009A8F23 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 00F0FF6A06AD499B006D4119 /* BISpeechController.m */;
@@ -151,7 +141,7 @@
                fRef = 00F15E4306975F6A00AF33BA /* BIZoomView.m */;
                name = "self = [super initWithFrame:frameRect];";
                rLen = 44;
-               rLoc = 237;
+               rLoc = 258;
                rType = 0;
                vrLen = 502;
                vrLoc = 34;
@@ -166,16 +156,6 @@
                vrLen = 355;
                vrLoc = 0;
        };
-       00B4DD1D086C759A009A8F23 /* PBXTextBookmark */ = {
-               isa = PBXTextBookmark;
-               fRef = 00F15E4306975F6A00AF33BA /* BIZoomView.m */;
-               name = "BIZoomView.m: 22";
-               rLen = 0;
-               rLoc = 427;
-               rType = 0;
-               vrLen = 815;
-               vrLoc = 0;
-       };
        00C135630695B3B6004F02A8 /* BIToolbar.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1057, 689}}";
@@ -239,6 +219,26 @@
                        sepNavVisRect = "{{0, 1047}, {1020, 689}}";
                };
        };
+       00D562E309C4386D00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F15E4306975F6A00AF33BA /* BIZoomView.m */;
+               name = "BIZoomView.m: 38";
+               rLen = 0;
+               rLoc = 937;
+               rType = 0;
+               vrLen = 1081;
+               vrLoc = 751;
+       };
+       00D5631009C4785D00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00F15E4306975F6A00AF33BA /* BIZoomView.m */;
+               name = "BIZoomView.m: 48";
+               rLen = 0;
+               rLoc = 1139;
+               rType = 0;
+               vrLen = 733;
+               vrLoc = 1814;
+       };
        00F0FF6906AD499B006D4119 /* BISpeechController.h */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1020, 689}}";
@@ -264,8 +264,8 @@
        00F15E4306975F6A00AF33BA /* BIZoomView.m */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1025, 1344}}";
-                       sepNavSelRange = "{427, 0}";
-                       sepNavVisRect = "{{0, 0}, {1025, 454}}";
+                       sepNavSelRange = "{1139, 0}";
+                       sepNavVisRect = "{{0, 890}, {1025, 454}}";
                };
        };
        00F57B1806A87A0C0035AE2F /* BIValuePair.h */ = {
@@ -355,7 +355,7 @@
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 141323146;
+                       PBXPerProjectTemplateStateSaveDate = 163854573;
                        PBXPrepackagedSmartGroups_v2 = (
                                {
                                        PBXTransientLocationAtTop = bottom;
@@ -792,16 +792,16 @@
                                Frame = "{{0, 0}, {745, 422}}";
                                RubberWindowFrame = "267 358 745 464 0 0 1280 
832 ";
                        };
-                       PBXWorkspaceStateSaveDate = 141323146;
+                       PBXWorkspaceStateSaveDate = 163854573;
                };
                perUserProjectItems = {
                        00B4DD17086C759A009A8F23 /* PBXTextBookmark */ = 
00B4DD17086C759A009A8F23 /* PBXTextBookmark */;
                        00B4DD18086C759A009A8F23 /* PBXTextBookmark */ = 
00B4DD18086C759A009A8F23 /* PBXTextBookmark */;
-                       00B4DD19086C759A009A8F23 /* PBXTextBookmark */ = 
00B4DD19086C759A009A8F23 /* PBXTextBookmark */;
                        00B4DD1A086C759A009A8F23 /* PBXTextBookmark */ = 
00B4DD1A086C759A009A8F23 /* PBXTextBookmark */;
                        00B4DD1B086C759A009A8F23 /* PBXTextBookmark */ = 
00B4DD1B086C759A009A8F23 /* PBXTextBookmark */;
                        00B4DD1C086C759A009A8F23 /* PBXTextBookmark */ = 
00B4DD1C086C759A009A8F23 /* PBXTextBookmark */;
-                       00B4DD1D086C759A009A8F23 /* PBXTextBookmark */ = 
00B4DD1D086C759A009A8F23 /* PBXTextBookmark */;
+                       00D562E309C4386D00FB787B /* PBXTextBookmark */ = 
00D562E309C4386D00FB787B /* PBXTextBookmark */;
+                       00D5631009C4785D00FB787B /* PBXTextBookmark */ = 
00D5631009C4785D00FB787B /* PBXTextBookmark */;
                };
                sourceControlManager = 00C1356F0695B3D7004F02A8 /* Source 
Control */;
                userBuildSettings = {

Modified: KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/project.pbxproj
===================================================================
--- KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/project.pbxproj  
2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/BIGeneric/BIGeneric.xcodeproj/project.pbxproj  
2006-03-14 18:35:22 UTC (rev 102)
@@ -102,23 +102,6 @@
                };
 /* End PBXBuildStyle section */
 
-/* Begin PBXContainerItemProxy section */
-               002E7DA006A869C900C9D931 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 002E7D9906A869BF00C9D931 /* 
BIGL.xcode */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
-                       remoteInfo = BIGL;
-               };
-               00F0FF7306AD4D4A006D4119 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 002E7D9906A869BF00C9D931 /* 
BIGL.xcode */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
-                       remoteInfo = BIGL;
-               };
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXCopyFilesBuildPhase section */
                002E7A7E06A8652700C9D931 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
@@ -163,7 +146,6 @@
                002E7A6A06A8625700C9D931 /* ColoredRowTableView.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = 
ColoredRowTableView.h; sourceTree = "<group>"; };
                002E7A6B06A8625700C9D931 /* ColoredRowTableView.m */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; 
path = ColoredRowTableView.m; sourceTree = "<group>"; };
                002E7A8106A865D500C9D931 /* Security.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
Security.framework; path = /System/Library/Frameworks/Security.framework; 
sourceTree = "<absolute>"; };
-               002E7D9906A869BF00C9D931 /* BIGL.xcode */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BIGL.xcode; 
path = ../BIGL/BIGL.xcode; sourceTree = SOURCE_ROOT; };
                004A8B6A069EC85F00CC8FAB /* AMRollOverButton.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = 
AMRollOverButton.h; sourceTree = "<group>"; };
                004A8B6B069EC85F00CC8FAB /* AMRollOverButton.m */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; 
path = AMRollOverButton.m; sourceTree = "<group>"; };
                004A8B6C069EC85F00CC8FAB /* AMRollOverButtonCell.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = 
AMRollOverButtonCell.h; sourceTree = "<group>"; };
@@ -238,14 +220,6 @@
                        name = "3rd Party Code";
                        sourceTree = "<group>";
                };
-               002E7D9E06A869BF00C9D931 /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               00F0FF6E06AD4D2C006D4119 /* BIGL.framework */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
                034768DFFF38A50411DB9C8B /* Products */ = {
                        isa = PBXGroup;
                        children = (
@@ -257,7 +231,6 @@
                0867D691FE84028FC02AAC07 /* BIGeneric */ = {
                        isa = PBXGroup;
                        children = (
-                               002E7D9906A869BF00C9D931 /* BIGL.xcode */,
                                08FB77AEFE84172EC02AAC07 /* Classes */,
                                32C88DFF0371C24200C91783 /* Other Sources */,
                                089C1665FE841158C02AAC07 /* Resources */,
@@ -417,7 +390,6 @@
                                WRAPPER_EXTENSION = framework;
                        };
                        dependencies = (
-                               002E7DA106A869C900C9D931 /* PBXTargetDependency 
*/,
                        );
                        name = BIGeneric;
                        productInstallPath = "$(HOME)/Library/Frameworks";
@@ -441,28 +413,12 @@
                        mainGroup = 0867D691FE84028FC02AAC07 /* BIGeneric */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products 
*/;
                        projectDirPath = "";
-                       projectReferences = (
-                               {
-                                       ProductGroup = 002E7D9E06A869BF00C9D931 
/* Products */;
-                                       ProjectRef = 002E7D9906A869BF00C9D931 
/* BIGL.xcode */;
-                               },
-                       );
                        targets = (
                                8DC2EF4F0486A6940098B216 /* BIGeneric */,
                        );
                };
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-               00F0FF6E06AD4D2C006D4119 /* BIGL.framework */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = wrapper.framework;
-                       path = BIGL.framework;
-                       remoteRef = 00F0FF7306AD4D4A006D4119 /* 
PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
                8DC2EF520486A6940098B216 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
@@ -498,14 +454,6 @@
                };
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-               002E7DA106A869C900C9D931 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = "BIGL (from BIGL.xcode)";
-                       targetProxy = 002E7DA006A869C900C9D931 /* 
PBXContainerItemProxy */;
-               };
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
                089C1666FE841158C02AAC07 /* InfoPlist.strings */ = {
                        isa = PBXVariantGroup;

Modified: KisMACng/Subprojects/BIGeneric/BIZoomView.m
===================================================================
--- KisMACng/Subprojects/BIGeneric/BIZoomView.m 2006-03-14 17:28:02 UTC (rev 
101)
+++ KisMACng/Subprojects/BIGeneric/BIZoomView.m 2006-03-14 18:35:22 UTC (rev 
102)
@@ -7,8 +7,8 @@
 //
 
 #import "BIZoomView.h"
+#import <BIGL/BIGL.h>
 
-
 @implementation BIZoomView
 
 - (id)initWithFrame:(NSRect)frameRect {
@@ -49,12 +49,12 @@
     [newV setFrame:[oldV frame]];
     
     if ([oldV respondsToSelector:@selector(dataWithTIFFInsideRect:)]) {
-        v1 = [[NSImage alloc] initWithData:[oldV 
dataWithTIFFInsideRect:_frame]];
+        v1 = [[NSImage alloc] initWithData:[(BIGLView*)oldV 
dataWithTIFFInsideRect:_frame]];
     } else {
         v1 = [[NSImage alloc] initWithData:[oldV 
dataWithPDFInsideRect:_frame]];
     }
     if ([newV respondsToSelector:@selector(dataWithTIFFInsideRect:)]) {
-        v2 = [[NSImage alloc] initWithData:[newV 
dataWithTIFFInsideRect:_frame]];
+        v2 = [[NSImage alloc] initWithData:[(BIGLView*)newV 
dataWithTIFFInsideRect:_frame]];
     } else {
         v2 = [[NSImage alloc] initWithData:[newV 
dataWithPDFInsideRect:_frame]];
     }

Modified: KisMACng/Subprojects/KisMAC 
Installer/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- KisMACng/Subprojects/KisMAC 
Installer/English.lproj/MainMenu.nib/classes.nib        2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Subprojects/KisMAC 
Installer/English.lproj/MainMenu.nib/classes.nib        2006-03-14 18:35:22 UTC 
(rev 102)
@@ -6,9 +6,10 @@
             CLASS = InstallController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                "_aeForeverCheckBox" = NSButton; 
                 "_configureView" = NSView; 
                 "_confirmConfigureView" = NSView; 
+                "_enableMonitorMode" = NSButtonCell; 
+                "_enableMonitorModeView" = NSView; 
                 "_installDirectoryView" = NSView; 
                 "_installDoneView" = NSView; 
                 "_installKisMAC" = NSButtonCell; 
@@ -33,6 +34,7 @@
                 "_removeStatus" = NSTextField; 
                 "_restartWarning" = NSTextField; 
                 "_selectedDriver" = NSPopUpButton; 
+                "_skipMonModeInstallation" = NSButtonCell; 
                 "_skipPatch" = NSButtonCell; 
                 "_targetDirectory" = NSTextField; 
                 "_welcomeView" = NSView; 

Modified: KisMACng/Subprojects/KisMAC 
Installer/English.lproj/MainMenu.nib/info.nib
===================================================================
--- KisMACng/Subprojects/KisMAC Installer/English.lproj/MainMenu.nib/info.nib   
2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/KisMAC Installer/English.lproj/MainMenu.nib/info.nib   
2006-03-14 18:35:22 UTC (rev 102)
@@ -3,33 +3,35 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>23 315 356 240 0 0 1280 832 </string>
+       <string>25 234 356 240 0 0 1280 832 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>217</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>226</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>229</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>246</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>259</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>272</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>280</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>288</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>29</key>
                <string>80 706 258 44 0 0 1280 832 </string>
                <key>297</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>304</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
                <key>316</key>
-               <string>394 370 492 372 0 0 1280 832 </string>
+               <string>394 381 492 372 0 0 1280 832 </string>
+               <key>328</key>
+               <string>394 381 492 372 0 0 1280 832 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>443.0</string>
@@ -46,14 +48,23 @@
                <integer>288</integer>
                <integer>304</integer>
                <integer>316</integer>
+               <integer>328</integer>
        </array>
        <key>IBOldestOS</key>
        <integer>2</integer>
        <key>IBOpenObjects</key>
        <array>
+               <integer>280</integer>
+               <integer>297</integer>
+               <integer>288</integer>
+               <integer>226</integer>
                <integer>316</integer>
-               <integer>29</integer>
-               <integer>226</integer>
+               <integer>229</integer>
+               <integer>304</integer>
+               <integer>217</integer>
+               <integer>272</integer>
+               <integer>328</integer>
+               <integer>259</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8H14</string>

Modified: KisMACng/Subprojects/KisMAC 
Installer/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: KisMACng/Subprojects/KisMAC Installer/InstallController.h
===================================================================
--- KisMACng/Subprojects/KisMAC Installer/InstallController.h   2006-03-14 
17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/KisMAC Installer/InstallController.h   2006-03-14 
18:35:22 UTC (rev 102)
@@ -33,8 +33,9 @@
     stateDoInstall = 5,
     stateConfigure = 6,
     stateConfirmConfigure = 7,
-    stateInstallDone = 8,
-    stateInstallCanceled = 9,
+       stateEnableMonitorMode = 8,
+    stateInstallDone = 9,
+    stateInstallCanceled = 10,
     
     stateCleanKisMAC = 97,
     stateRemovingKisMAC = 98,
@@ -42,52 +43,55 @@
 };
 
 @interface InstallController : NSWindowController {
-    IBOutlet NSButton   *_next;
-    IBOutlet NSButton   *_prev;
-    IBOutlet NSBox      *_mainBox;
+    IBOutlet NSButton          *_next;
+    IBOutlet NSButton          *_prev;
+    IBOutlet NSBox                     *_mainBox;
     
-    IBOutlet NSView     *_welcomeView;
-        IBOutlet NSButtonCell   *_installKisMAC;
-        IBOutlet NSButtonCell   *_removeKisMAC;
+    IBOutlet NSView                    *_welcomeView;
+       IBOutlet NSButtonCell   *_installKisMAC;
+       IBOutlet NSButtonCell   *_removeKisMAC;
 
-    IBOutlet NSView     *_licenseView;
+    IBOutlet NSView                    *_licenseView;
     
-    IBOutlet NSView     *_removePreferencesView;
-        IBOutlet NSButtonCell   *_keepPrefs;
-        IBOutlet NSButtonCell   *_removePrefs;
+    IBOutlet NSView                    *_removePreferencesView;
+       IBOutlet NSButtonCell   *_keepPrefs;
+       IBOutlet NSButtonCell   *_removePrefs;
 
-    IBOutlet NSView     *_installSFPatchView;
-        IBOutlet NSButtonCell   *_installPatch;
-        IBOutlet NSButtonCell   *_skipPatch;
+    IBOutlet NSView                    *_installSFPatchView;
+       IBOutlet NSButtonCell   *_installPatch;
+       IBOutlet NSButtonCell   *_skipPatch;
 
-    IBOutlet NSView     *_installDirectoryView;
-        IBOutlet NSTextField    *_targetDirectory;
+    IBOutlet NSView                    *_installDirectoryView;
+       IBOutlet NSTextField    *_targetDirectory;
 
-    IBOutlet NSView     *_installView;
-        IBOutlet NSTextField            *_installStatus;
-        IBOutlet NSProgressIndicator    *_progBar;
+    IBOutlet NSView                                    *_installView;
+       IBOutlet NSTextField            *_installStatus;
+       IBOutlet NSProgressIndicator    *_progBar;
     
-    IBOutlet NSView     *_configureView;
+    IBOutlet NSView                                    *_configureView;
     
-    IBOutlet NSView     *_confirmConfigureView;
-    IBOutlet NSPopUpButton  *_selectedDriver;
-    IBOutlet NSButton   *_aeForeverCheckBox;
-        
-    IBOutlet NSView     *_installDoneView;
-       IBOutlet NSTextField    *_installationStatus;
-       IBOutlet NSTextField    *_restartWarning;
+    IBOutlet NSView                                    *_confirmConfigureView;
+       IBOutlet NSPopUpButton                  *_selectedDriver;
     
-    IBOutlet NSView     *_removeKisMACView;
-        IBOutlet NSTextField            *_removeStatus;
-        IBOutlet NSProgressIndicator    *_removeBar;
+       IBOutlet NSView                                 *_enableMonitorModeView;
+       IBOutlet NSButtonCell                   *_enableMonitorMode;
+       IBOutlet NSButtonCell                   *_skipMonModeInstallation;
+                   
+    IBOutlet NSView                                    *_installDoneView;
+       IBOutlet NSTextField                    *_installationStatus;
+       IBOutlet NSTextField                    *_restartWarning;
     
-    IBOutlet NSView                    *_removalDoneView;
-       IBOutlet NSTextField    *_removeRestartWarning;
+    IBOutlet NSView                                    *_removeKisMACView;
+       IBOutlet NSTextField            *_removeStatus;
+       IBOutlet NSProgressIndicator    *_removeBar;
+    
+    IBOutlet NSView                                    *_removalDoneView;
+       IBOutlet NSTextField                    *_removeRestartWarning;
         
-    enum states         _currentState;
-    BOOL                _prevEnabled;
-    BOOL                _nextEnabled;
-    BOOL                _patchWasInstalled;
+    enum states                                                _currentState;
+    BOOL                                                       _prevEnabled;
+    BOOL                                                       _nextEnabled;
+       BOOL                                                    _shallReboot;
 }
 
 -(IBAction)next:(id)sender;

Modified: KisMACng/Subprojects/KisMAC Installer/InstallController.m
===================================================================
--- KisMACng/Subprojects/KisMAC Installer/InstallController.m   2006-03-14 
17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/KisMAC Installer/InstallController.m   2006-03-14 
18:35:22 UTC (rev 102)
@@ -25,10 +25,7 @@
 #import "InstallController.h"
 #import "BLAuthentication.h"
 #import <Carbon/Carbon.h>
-#include <unistd.h>
 
-#define optionsFile 
@"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist"
-
 struct identStruct {
     UInt16 vendor;
     UInt16 device;
@@ -87,8 +84,8 @@
     if (self==Nil) return Nil;
 
     _currentState = stateWelcome;
-    _nextEnabled = YES;
-    
+    _nextEnabled  = YES;
+    _shallReboot  = NO;
        [NSApp setDelegate:self];
        
     return self;
@@ -110,6 +107,48 @@
     m = [NSFileManager defaultManager];
     return [m fileExistsAtPath:[file stringByExpandingTildeInPath]];
 }
+- (BOOL)enableMonitorModeForFile:(NSString*)fileName andEnable:(BOOL)enable {
+       NSDictionary *dict;
+       NSData *data;
+       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0666", fileName, nil]];
+       
+       [NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.0]];
+       data = [NSData dataWithContentsOfFile:fileName];
+       if(!data) return NO;
+       dict = [NSPropertyListSerialization propertyListFromData:data 
mutabilityOption:kCFPropertyListMutableContainers format:NULL 
errorDescription:Nil];
+       if(!dict) return NO;
+       [dict setValue:[NSNumber numberWithBool:enable] 
forKeyPath:@"IOKitPersonalities.Broadcom PCI.APMonitorMode"];
+       [[NSPropertyListSerialization dataFromPropertyList:dict 
format:kCFPropertyListXMLFormat_v1_0 errorDescription:nil] writeToFile:fileName 
atomically:NO];
+               
+       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0644", fileName, nil]];
+       return YES;     
+}
+- (BOOL)enableMonitorMode:(BOOL)enable {
+       BOOL ret;
+       _shallReboot = YES;
+       ret = [self 
enableMonitorModeForFile:@"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist"
 andEnable:enable] || 
+       [self 
enableMonitorModeForFile:@"/System/Library/Extensions/IO80211Family.kext/Contents/PlugIns/AppleAirPortBrcm4311.kext/Contents/Info.plist"
 andEnable:enable];
+       
+       [[BLAuthentication sharedInstance] executeCommand:@"/bin/rm" 
withArgs:[NSArray arrayWithObject:@"/System/Library/Extensions.kextcache"]];
+       [[BLAuthentication sharedInstance] 
executeCommand:@"/usr/sbin/kextcache" withArgs:[NSArray arrayWithObjects:@"-k", 
@"/System/Library/Extensions", nil]];
+       [[BLAuthentication sharedInstance] executeCommand:@"/bin/rm" 
withArgs:[NSArray arrayWithObject:@"/System/Library/Extensions.mkext"]];
+       
+       return ret;
+}
+- (BOOL)monitorModeEnabled {
+       NSDictionary *dict;
+       NSData *fileData;
+       
+       fileData = [NSData 
dataWithContentsOfFile:@"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist"];
+       dict = [NSPropertyListSerialization propertyListFromData:fileData 
mutabilityOption:kCFPropertyListImmutable format:NULL errorDescription:Nil];
+       if ([[dict valueForKeyPath:@"IOKitPersonalities.Broadcom 
PCI.APMonitorMode"] boolValue]) return YES;
+       
+       fileData = [NSData 
dataWithContentsOfFile:@"/System/Library/Extensions/IO80211Family.kext/Contents/PlugIns/AppleAirPortBrcm4311.kext/Contents/Info.plist"];
+       dict = [NSPropertyListSerialization propertyListFromData:fileData 
mutabilityOption:kCFPropertyListImmutable format:NULL errorDescription:Nil];
+       if ([[dict valueForKeyPath:@"IOKitPersonalities.Broadcom 
PCI.APMonitorMode"] boolValue]) return YES;
+       
+       return NO;
+}
 - (BOOL)findWirelessDriverPatch {
     return [self 
findFile:@"/System/Library/Extensions/WirelessDriver.kext/bipatch"];
 }
@@ -119,7 +158,7 @@
 - (BOOL)findKisMACPrefs {
     return [self 
findFile:@"~/Library/Preferences/de.binaervarianz.kismac.plist"];
 }
-- (BOOL)findTar {
+- (BOOL)findTAR {
        return [self findFile:@"/usr/bin/tar"];
 }
 
@@ -179,24 +218,10 @@
     return [a executeCommandSynced:[NSString 
stringWithFormat:@"%@/permissions.sh", [[NSBundle mainBundle] resourcePath]] 
withArgs:[NSArray arrayWithObject:targetDir]];
 }
 
-- (void)setMonitorMode:(BOOL)enable {
-    sleep(1);
-       [[BLAuthentication sharedInstance] executeCommand:@"/usr/bin/chgrp" 
withArgs:[NSArray arrayWithObjects:@"admin", optionsFile, nil]];
-       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0664", optionsFile, nil]];
-    
-    sleep(1);
-       NSDictionary *dict= [NSPropertyListSerialization 
propertyListFromData:[NSData dataWithContentsOfFile:optionsFile] 
mutabilityOption:kCFPropertyListMutableContainers format:NULL 
errorDescription:Nil];
-       [dict setValue:[NSNumber numberWithBool:enable] 
forKeyPath:@"IOKitPersonalities.Broadcom PCI.APMonitorMode"];
-       [[NSPropertyListSerialization dataFromPropertyList:dict 
format:kCFPropertyListXMLFormat_v1_0 errorDescription:nil] 
writeToFile:optionsFile atomically:NO];
-    
-       [[BLAuthentication sharedInstance] executeCommand:@"/bin/chmod" 
withArgs:[NSArray arrayWithObjects:@"0644", optionsFile, nil]];
-       [[BLAuthentication sharedInstance] executeCommand:@"/usr/bin/chgrp" 
withArgs:[NSArray arrayWithObjects:@"wheel", optionsFile, nil]];
-    sleep(1);
-}
-
 - (BOOL)removeWirelessDriverPatch {
     BLAuthentication *a;
     
+       _shallReboot = YES;
     a = [BLAuthentication sharedInstance];
     return [a executeCommandSynced:[NSString 
stringWithFormat:@"%@/sfpatch_remove.sh", [[NSBundle mainBundle] resourcePath]] 
withArgs:nil];
 }
@@ -204,6 +229,7 @@
 - (BOOL)installWirelessPatchToPath:(NSString*)targetDir {
     BLAuthentication *a;
     
+       _shallReboot = YES;
     a = [BLAuthentication sharedInstance];
     return [a executeCommandSynced:[NSString 
stringWithFormat:@"%@/sfpatch_install.sh", [[NSBundle mainBundle] 
resourcePath]] withArgs:[NSArray arrayWithObjects:targetDir, [[NSBundle 
mainBundle] resourcePath], nil]];
 }
@@ -348,12 +374,11 @@
         [_selectedDriver addItemWithTitle:@"Apple Airport Card, active mode"];
         [[_selectedDriver lastItem] setTag: 2];
     }
-    if ([self isServiceAvailable:"AirPortPCI"]) {
+    if ([self isServiceAvailable:"AirPortPCI"] || [self 
isServiceAvailable:"AirPortPCI_MM"]) {
         [_selectedDriver addItemWithTitle:@"Apple Airport Extreme Card, active 
mode"];
         [[_selectedDriver lastItem] setTag: 2];
-        [_selectedDriver addItemWithTitle:@"Apple Airport Extreme Card, 
passive mode"];
+               [_selectedDriver addItemWithTitle:@"Apple Airport Extreme Card, 
passive mode"];
         [[_selectedDriver lastItem] setTag: 8];
-
     }
     
     ids = [NSArray arrayWithObjects:@"pccard156,3", @"pccardb,7300", 
@"pccard156,2", @"pccard126,8000", @"pccard105,7", @"pccard89,1", 
@"pccard124,1110", @"pccard138,2", @"pccard268,1", @"pccard250,2", 
@"pccard26f,30b", @"pccard274,1612", @"pccard274,1613", @"pccard274,3301", 
@"pccard28a,2", @"pccard2d2,1", @"pccardd601,2", @"pccardd601,5", nil];
@@ -383,13 +408,10 @@
 - (void)writeDriverSetting {
     NSString *s;
     NSMutableDictionary *md;
+       NSMutableDictionary *md2;
     int i;
     
     if ([[_selectedDriver selectedItem] tag] == 0) return;
-    if ([_aeForeverCheckBox state]) {
-        [self setMonitorMode:YES];
-        NSLog(@"Enable AE forever!");
-    }
     
     md = [NSMutableDictionary dictionary];
     
@@ -422,13 +444,13 @@
         [md setObject:@"PrismGT based Card" forKey:@"deviceName"];
         [md setObject:@"WaveDriverPrismGT" forKey:@"driverID"];
         break;
-    case 8:
-        [md setObject:@"Apple Airport Extreme card" forKey:@"deviceName"];
+       case 8:
+           [md setObject:@"Airport Card" forKey:@"deviceName"];
         [md setObject:@"WaveDriverAirportExtreme" forKey:@"driverID"];
         break;
     }    
     
-    [md setObject:@"../DumpLog %y-%m-%d %H:%M" forKey:@"dumpDestination"];
+    [md setObject:@"~/DumpLog %y-%m-%d %H:%M" forKey:@"dumpDestination"];
     [md setObject:[NSNumber numberWithInt:0] forKey:@"dumpFilter"];
     [md setObject:[NSNumber numberWithInt:1] forKey:@"firstChannel"];
     [md setObject:[NSNumber numberWithBool:NO] forKey:@"injectionDevice"];
@@ -441,7 +463,12 @@
         [md setObject:[NSNumber numberWithBool:NO] forKey:s];
     }
     
-    [[NSDictionary dictionaryWithObject:[NSArray arrayWithObject:md] 
forKey:@"ActiveDrivers"] 
writeToFile:[@"~/Library/Preferences/de.binaervarianz.kismac.plist" 
stringByExpandingTildeInPath] atomically:YES];
+       md2 = [NSMutableDictionary dictionaryWithObject:[NSArray 
arrayWithObject:md] forKey:@"ActiveDrivers"];
+       if(([_enableMonitorMode state] == NSOnState) && ([_selectedDriver 
selectedTag] == 8)) {
+               [md2 setValue:[NSNumber numberWithBool:YES] 
forKey:@"aeForever"];
+       }
+       
+    [md2 writeToFile:[@"~/Library/Preferences/de.binaervarianz.kismac.plist" 
stringByExpandingTildeInPath] atomically:YES];
 }
 #pragma mark -
 
@@ -459,7 +486,7 @@
     switch(_currentState) {
     case stateWelcome:
         if ([_installKisMAC state] == NSOnState) 
-                       if (![self findTar]) {
+                       if (![self findTAR]) {
                                NSBeginInformationalAlertSheet(@"Unable to find 
Support Program!", @"OK", Nil, Nil, [self window], self, nil, nil, nil, 
                                        @"The KisMAC installer was unable to 
find /usr/bin/tar. Make sure it exists! The program is part of the MacOS X BSD 
Subsystem, which is a default part of the operating system.");
                                _currentState = stateWelcome;
@@ -493,29 +520,35 @@
         break;
     case stateInstallDir:
         if ([self validDir:[_targetDirectory stringValue]])
-            _currentState = stateDoInstall;
+            if ([self findKisMACPrefs])
+                               _currentState = stateDoInstall;
+                       else
+                               _currentState = stateConfigure;
         else
             NSBeginInformationalAlertSheet(@"Invalid Directory", Nil, Nil, 
Nil, [self window], self, nil, nil, nil, @"The path you have chosen, does 
either not exist or is not writeable!");
         break;
+       case stateConfigure:
+        _prevEnabled = YES;
+        _currentState = stateConfirmConfigure;
+        break;
+    case stateConfirmConfigure:
+        if([_selectedDriver selectedTag] == 8 && ![self monitorModeEnabled])
+                       _currentState = stateEnableMonitorMode;
+               else
+                       _currentState = stateDoInstall;
+        break;
+       case stateEnableMonitorMode:
+               _currentState = stateDoInstall;
+               break;
     case stateDoInstall:
         _prevEnabled = NO; //cannot go back to config
-               if ([_progBar doubleValue] == 0) {
+               if ([_progBar doubleValue] == 0)
                        _currentState = stateInstallCanceled;
-               } else if ([self findKisMACPrefs]) {
+               else
             _currentState = stateInstallDone;
-        } else 
-            _currentState = stateConfigure;
         break;
-    case stateConfigure:
-        _prevEnabled = YES;
-        _currentState = stateConfirmConfigure;
-        break;
-    case stateConfirmConfigure:
-        [self writeDriverSetting];
-        _currentState = stateInstallDone;
-        break;
     case stateInstallDone:
-        if ([self findWirelessDriverPatch]) [self reboot];
+        if (_shallReboot) [self reboot];
         [NSApp terminate:nil];
         break;
        case stateInstallCanceled:
@@ -529,7 +562,7 @@
         _currentState = stateRemovalDone;
         break;
     case stateRemovalDone:
-        if (_patchWasInstalled) [self reboot];
+        if (_shallReboot) [self reboot];
         [NSApp terminate:nil];
         break;
         
@@ -548,6 +581,7 @@
     
     switch(_currentState) {
     case stateLicense:
+               _prevEnabled  = NO;
         _currentState = stateWelcome;
         break;
     case stateRemovePrefs:
@@ -568,18 +602,22 @@
             _currentState = stateLicense;
         
         break;
-    case stateDoInstall:
-        break;
     case stateConfigure:
+               _currentState = stateInstallDir;
         break;
     case stateConfirmConfigure:
-        _prevEnabled = NO;
         _currentState = stateConfigure;
         break;
-    case stateInstallDone:
+       case stateEnableMonitorMode:
         _currentState = stateConfirmConfigure;
         break;
+    case stateDoInstall:
+        break;
+       case stateInstallDone:
+               break;
        case stateInstallCanceled:
+               _prevEnabled  = YES;
+               _currentState = stateWelcome;
                break;
                
     default:
@@ -619,6 +657,8 @@
     
     pool = [[NSAutoreleasePool alloc] init];
     
+       [self writeDriverSetting];
+               
     if (![self removeKisMACInstallation:[[self getPreviousInstallDir] 
stringByExpandingTildeInPath]]) goto cancel;
     [_progBar incrementBy:1.0];
         
@@ -648,6 +688,12 @@
         if (![self adjustWirelessPatchPermissions]) goto cancel;
         [_progBar incrementBy:1.0];
     }
+       
+       if (![self monitorModeEnabled] && ([_selectedDriver selectedTag] == 8) 
&& ([_enableMonitorMode state] == NSOnState)) {
+               [_installStatus setStringValue:@"Enabling Airport Extreme 
Monitor Mode..."];
+               [self enableMonitorMode:YES];
+               [_progBar incrementBy:1.0];
+       }
     
     [_installStatus setStringValue:@"Installation complete..."];
     [_progBar setDoubleValue:[_progBar maxValue]];
@@ -674,13 +720,9 @@
 
 -(void)performRemoval:(id)nilObject {
     NSAutoreleasePool *pool;
+    
     pool = [[NSAutoreleasePool alloc] init];
     
-    NSDictionary *dict= [NSPropertyListSerialization 
propertyListFromData:[NSData dataWithContentsOfFile:optionsFile] 
-                                                         
mutabilityOption:kCFPropertyListMutableContainers
-                                                                   format:NULL 
errorDescription:Nil];
-    
-    
     [_installStatus setStringValue:@"Removing Preferences..."];
     [self removePreferences];
     [_progBar incrementBy:1.0];
@@ -694,13 +736,13 @@
         [self removeWirelessDriverPatch];
         [_progBar incrementBy:1.0];
     }
-        
-       if ([[dict valueForKeyPath:@"IOKitPersonalities.Broadcom 
PCI.APMonitorMode"] boolValue]) {
-        [_installStatus setStringValue:@"Restoring Airport Extreme Monitor 
Mode to Normal"];
-        [self setMonitorMode:NO];
-    }
-
-    
+ 
+       if([self monitorModeEnabled]) {
+               [_installStatus setStringValue:@"Disabling Airport Extreme 
Monitor Mode..."];
+               [self enableMonitorMode:NO];
+               [_progBar incrementBy:1.0];
+       }
+   
     [_installStatus setStringValue:@"Removal complete..."];
     [_progBar setDoubleValue:[_progBar maxValue]];
 
@@ -718,6 +760,8 @@
     switch(_currentState) {
     case stateWelcome:
         _prevEnabled = NO;
+               [_next setImage:[NSImage imageNamed:@"skip_forward_active"]];
+        [_next setAlternateImage:[NSImage imageNamed:@"skip_forward_blue"]];
         [_mainBox setContentView:_welcomeView];        
         break;
     case stateLicense:
@@ -734,13 +778,28 @@
         [_targetDirectory setStringValue:[self getPreviousInstallDir]];
         [_mainBox setContentView:_installDirectoryView];
         break;
+    case stateConfigure:
+        [_mainBox setContentView:_configureView];
+        break;
+    case stateConfirmConfigure:
+        [_next setImage:[NSImage imageNamed:@"skip_forward_active"]];
+        [_next setAlternateImage:[NSImage imageNamed:@"skip_forward_blue"]];
+        
+        [_selectedDriver removeAllItems];
+        [self populateDriverBox];
+        [_mainBox setContentView:_confirmConfigureView];
+        break;
+       case stateEnableMonitorMode:
+               [_mainBox setContentView:_enableMonitorModeView];
+               break;
     case stateDoInstall:
         _prevEnabled = NO;
         _nextEnabled = NO;
         numberOfSteps = 4;
         if ([self findWirelessDriverPatch]) numberOfSteps++;
         if ([self findWirelessDriver] && ([_installPatch state] == NSOnState)) 
numberOfSteps+=2;
-        
+        if (![self monitorModeEnabled] && ([_selectedDriver selectedTag] == 8) 
&& ([_enableMonitorMode state] == NSOnState)) numberOfSteps++;
+               
         [_progBar setMinValue:0];
         [_progBar setMaxValue:numberOfSteps];
         [_progBar setDoubleValue:0.0];
@@ -750,23 +809,12 @@
         
         [NSThread detachNewThreadSelector:@selector(performInstall:) 
toTarget:self withObject:nil];
         break;
-    case stateConfigure:
-        [_mainBox setContentView:_configureView];
-        break;
-    case stateConfirmConfigure:
-        [_next setImage:[NSImage imageNamed:@"skip_forward_active"]];
-        [_next setAlternateImage:[NSImage imageNamed:@"skip_forward_blue"]];
-        
-        [_selectedDriver removeAllItems];
-        [self populateDriverBox];
-        [_mainBox setContentView:_confirmConfigureView];
-        break;
     case stateInstallDone:
         [NSApp requestUserAttention:NSInformationalRequest];
         [_next setImage:[NSImage imageNamed:@"stop_active"]];
         [_next setAlternateImage:[NSImage imageNamed:@"stop_blue"]];
         
-        if ([self findWirelessDriverPatch])
+        if (_shallReboot)
             [_restartWarning setStringValue:@"WARNING! Your computer will be 
rebooted!"];
         else
             [_restartWarning setStringValue:@""];
@@ -774,6 +822,7 @@
         [_mainBox setContentView:_installDoneView];
         break;
        case stateInstallCanceled:
+               _prevEnabled = YES;
            [NSApp requestUserAttention:NSInformationalRequest];
         [_next setImage:[NSImage imageNamed:@"stop_active"]];
         [_next setAlternateImage:[NSImage imageNamed:@"stop_blue"]];
@@ -788,20 +837,16 @@
         _prevEnabled = NO;
         _nextEnabled = NO;
         numberOfSteps = 2;
-        if ([self findWirelessDriverPatch]) {
-            numberOfSteps++;
-            _patchWasInstalled = YES;
-        } else {
-            _patchWasInstalled = NO;
-        }
-
+        if ([self findWirelessDriverPatch]) numberOfSteps++;
+        if ([self monitorModeEnabled]) numberOfSteps++;
+               
         [_progBar setMinValue:0];
         [_progBar setMaxValue:numberOfSteps];
         [_progBar setDoubleValue:0.0];
         [_progBar setUsesThreadedAnimation:YES];
         [_installStatus setStringValue:@"Removing KisMAC..."];
         [_mainBox setContentView:_removeKisMACView];
-        
+
         [NSThread detachNewThreadSelector:@selector(performRemoval:) 
toTarget:self withObject:nil];
         break;
     case stateRemovalDone:
@@ -810,16 +855,18 @@
         [_next setImage:[NSImage imageNamed:@"stop_active"]];
         [_next setAlternateImage:[NSImage imageNamed:@"stop_blue"]];
         
-        if (!_patchWasInstalled) [_removeRestartWarning setStringValue:@""];
+               if (_shallReboot)
+                       [_removeRestartWarning setStringValue:@"WARNING! Your 
computer will be rebooted!"];
+               else
+                       [_removeRestartWarning setStringValue:@""];
+
         [_mainBox setContentView:_removalDoneView];
         break;
     default:
         NSAssert(0, @"Illegal state");
     }
-
 }
 
-
 #pragma mark -
 
 - (void)quitInstaller:(NSWindow *)sheet returnCode:(int)returnCode 
contextInfo:(void *)contextInfo {

Modified: KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/mick.mode1
===================================================================
--- KisMACng/Subprojects/KisMAC Installer/KisMAC Installer.xcodeproj/mick.mode1 
2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/KisMAC Installer/KisMAC Installer.xcodeproj/mick.mode1 
2006-03-14 18:35:22 UTC (rev 102)
@@ -244,7 +244,7 @@
                                                        
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
                                                        <array>
                                                                <real>22</real>
-                                                               <real>164</real>
+                                                               <real>250</real>
                                                        </array>
                                                        
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
                                                        <array>
@@ -257,10 +257,10 @@
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
                                                        <array>
                                                                
<string>29B97314FDCFA39411CA2CEA</string>
-                                                               
<string>00F9C4B806DA9DCC00E357F0</string>
                                                                
<string>080E96DDFE201D6D7F000001</string>
                                                                
<string>29B97317FDCFA39411CA2CEA</string>
-                                                               
<string>00B9E9810647F5EC009FEF35</string>
+                                                               
<string>00B9E6080647B9E5009FEF35</string>
+                                                               
<string>29B97318FDCFA39411CA2CEA</string>
                                                                
<string>19C28FACFE9D520D11CA2CBB</string>
                                                                
<string>1C37FBAC04509CD000000102</string>
                                                                
<string>1C37FAAC04509CD000000102</string>
@@ -269,13 +269,14 @@
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       
<integer>8</integer>
-                                                                       
<integer>4</integer>
+                                                                       
<integer>29</integer>
+                                                                       
<integer>28</integer>
+                                                                       
<integer>7</integer>
                                                                        
<integer>0</integer>
                                                                </array>
                                                        </array>
                                                        
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-                                                       <string>{{0, 0}, {186, 
681}}</string>
+                                                       <string>{{0, 0}, {272, 
681}}</string>
                                                </dict>
                                                <key>PBXTopSmartGroupGIDs</key>
                                                <array/>
@@ -287,13 +288,13 @@
                                        <key>GeometryConfiguration</key>
                                        <dict>
                                                <key>Frame</key>
-                                               <string>{{0, 0}, {203, 
699}}</string>
+                                               <string>{{0, 0}, {289, 
699}}</string>
                                                
<key>GroupTreeTableConfiguration</key>
                                                <array>
                                                        
<string>SCMStatusColumn</string>
                                                        <real>22</real>
                                                        
<string>MainColumn</string>
-                                                       <real>164</real>
+                                                       <real>250</real>
                                                </array>
                                                <key>RubberWindowFrame</key>
                                                <string>0 92 1280 740 0 0 1280 
832 </string>
@@ -301,7 +302,7 @@
                                        <key>Module</key>
                                        <string>PBXSmartGroupTreeModule</string>
                                        <key>Proportion</key>
-                                       <string>203pt</string>
+                                       <string>289pt</string>
                                </dict>
                                <dict>
                                        <key>Dock</key>
@@ -326,17 +327,28 @@
                                                                                
<key>_historyCapacity</key>
                                                                                
<integer>20</integer>
                                                                                
<key>bookmark</key>
-                                                                               
<string>0054928508E6EF8800307083</string>
+                                                                               
<string>00D5667F09C73C3700FB787B</string>
                                                                                
<key>history</key>
                                                                                
<array>
-                                                                               
        <string>0054928008E6EF8800307083</string>
-                                                                               
        <string>0054928108E6EF8800307083</string>
-                                                                               
        <string>0054928208E6EF8800307083</string>
+                                                                               
        <string>0017842B09C1E48500530D82</string>
+                                                                               
        <string>00B1200D09C1F95C00AD6B0D</string>
+                                                                               
        <string>00D5632209C478C300FB787B</string>
+                                                                               
        <string>00D5667509C73B6D00FB787B</string>
+                                                                               
        <string>00D5667609C73B6D00FB787B</string>
                                                                                
</array>
                                                                                
<key>prevStack</key>
                                                                                
<array>
                                                                                
        <string>0054928308E6EF8800307083</string>
-                                                                               
        <string>0054928408E6EF8800307083</string>
+                                                                               
        <string>0017842E09C1E48500530D82</string>
+                                                                               
        <string>0017842F09C1E48500530D82</string>
+                                                                               
        <string>00D5632309C478C300FB787B</string>
+                                                                               
        <string>00D5632409C478C300FB787B</string>
+                                                                               
        <string>00D5632509C478C300FB787B</string>
+                                                                               
        <string>00D5632609C478C300FB787B</string>
+                                                                               
        <string>00D5632709C478C300FB787B</string>
+                                                                               
        <string>00D5632809C478C300FB787B</string>
+                                                                               
        <string>00D5667709C73B6D00FB787B</string>
+                                                                               
        <string>00D5667809C73B6D00FB787B</string>
                                                                                
</array>
                                                                        </dict>
                                                                        
<key>SplitCount</key>
@@ -348,7 +360,7 @@
                                                        
<key>GeometryConfiguration</key>
                                                        <dict>
                                                                <key>Frame</key>
-                                                               <string>{{0, 
0}, {1072, 694}}</string>
+                                                               <string>{{0, 
0}, {986, 694}}</string>
                                                                
<key>RubberWindowFrame</key>
                                                                <string>0 92 
1280 740 0 0 1280 832 </string>
                                                        </dict>
@@ -368,7 +380,7 @@
                                                        
<key>GeometryConfiguration</key>
                                                        <dict>
                                                                <key>Frame</key>
-                                                               <string>{{0, 
699}, {1072, 0}}</string>
+                                                               <string>{{0, 
699}, {986, 0}}</string>
                                                                
<key>RubberWindowFrame</key>
                                                                <string>0 92 
1280 740 0 0 1280 832 </string>
                                                        </dict>
@@ -379,7 +391,7 @@
                                                </dict>
                                        </array>
                                        <key>Proportion</key>
-                                       <string>1072pt</string>
+                                       <string>986pt</string>
                                </dict>
                        </array>
                        <key>Name</key>
@@ -394,9 +406,9 @@
                        </array>
                        <key>TableOfContents</key>
                        <array>
-                               <string>0054928608E6EF8800307083</string>
+                               <string>00D5632A09C478C300FB787B</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
-                               <string>0054928708E6EF8800307083</string>
+                               <string>00D5632B09C478C300FB787B</string>
                                <string>1CE0B20306471E060097A5F4</string>
                                <string>1CE0B20506471E060097A5F4</string>
                        </array>
@@ -530,9 +542,10 @@
        <integer>5</integer>
        <key>WindowOrderList</key>
        <array>
+               <string>1C530D57069F1CE1000CFCEE</string>
                <string>009CE613082D155B00135EE1</string>
                <string>1C0AD2B3069F1EA900FABCE6</string>
-               <string>/Users/mick/openDev/KisMACng/Subprojects/KisMAC 
Installer/KisMAC Installer.xcodeproj</string>
+               
<string>/Users/mick/openDev/KisMACng/Subprojects/KisMACInstaller/KisMAC 
Installer.xcodeproj</string>
        </array>
        <key>WindowString</key>
        <string>0 92 1280 740 0 0 1280 832 </string>
@@ -573,8 +586,6 @@
                                                        <string>231pt</string>
                                                </dict>
                                                <dict>
-                                                       <key>BecomeActive</key>
-                                                       <true/>
                                                        
<key>ContentConfiguration</key>
                                                        <dict>
                                                                
<key>PBXProjectModuleGUID</key>
@@ -614,7 +625,7 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>009CE613082D155B00135EE1</string>
-                               <string>0054926E08E6EA1A00307083</string>
+                               <string>00D5625209C20D5D00FB787B</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>
@@ -730,8 +741,12 @@
                        <integer>0</integer>
                </dict>
                <dict>
+                       <key>FirstTimeWindowDisplayed</key>
+                       <false/>
                        <key>Identifier</key>
                        <string>windowTool.find</string>
+                       <key>IsVertical</key>
+                       <true/>
                        <key>Layout</key>
                        <array>
                                <dict>
@@ -741,31 +756,23 @@
                                                        <key>Dock</key>
                                                        <array>
                                                                <dict>
+                                                                       
<key>BecomeActive</key>
+                                                                       <true/>
                                                                        
<key>ContentConfiguration</key>
                                                                        <dict>
                                                                                
<key>PBXProjectModuleGUID</key>
                                                                                
<string>1CDD528C0622207200134675</string>
                                                                                
<key>PBXProjectModuleLabel</key>
-                                                                               
<string>&lt;No Editor&gt;</string>
-                                                                               
<key>PBXSplitModuleInNavigatorKey</key>
-                                                                               
<dict>
-                                                                               
        <key>Split0</key>
-                                                                               
        <dict>
-                                                                               
                <key>PBXProjectModuleGUID</key>
-                                                                               
                <string>1CD0528D0623707200166675</string>
-                                                                               
        </dict>
-                                                                               
        <key>SplitCount</key>
-                                                                               
        <string>1</string>
-                                                                               
</dict>
+                                                                               
<string>InstallController.m</string>
                                                                                
<key>StatusBarVisibility</key>
-                                                                               
<integer>1</integer>
+                                                                               
<true/>
                                                                        </dict>
                                                                        
<key>GeometryConfiguration</key>
                                                                        <dict>
                                                                                
<key>Frame</key>
-                                                                               
<string>{{0, 0}, {781, 167}}</string>
+                                                                               
<string>{{0, 0}, {781, 212}}</string>
                                                                                
<key>RubberWindowFrame</key>
-                                                                               
<string>62 385 781 470 0 0 1440 878 </string>
+                                                                               
<string>21 339 781 470 0 0 1280 832 </string>
                                                                        </dict>
                                                                        
<key>Module</key>
                                                                        
<string>PBXNavigatorGroup</string>
@@ -774,11 +781,9 @@
                                                                </dict>
                                                        </array>
                                                        <key>Proportion</key>
-                                                       <string>50%</string>
+                                                       <string>212pt</string>
                                                </dict>
                                                <dict>
-                                                       <key>BecomeActive</key>
-                                                       <integer>1</integer>
                                                        
<key>ContentConfiguration</key>
                                                        <dict>
                                                                
<key>PBXProjectModuleGUID</key>
@@ -789,18 +794,18 @@
                                                        
<key>GeometryConfiguration</key>
                                                        <dict>
                                                                <key>Frame</key>
-                                                               <string>{{8, 
0}, {773, 254}}</string>
+                                                               <string>{{0, 
217}, {781, 212}}</string>
                                                                
<key>RubberWindowFrame</key>
-                                                               <string>62 385 
781 470 0 0 1440 878 </string>
+                                                               <string>21 339 
781 470 0 0 1280 832 </string>
                                                        </dict>
                                                        <key>Module</key>
                                                        
<string>PBXProjectFindModule</string>
                                                        <key>Proportion</key>
-                                                       <string>50%</string>
+                                                       <string>212pt</string>
                                                </dict>
                                        </array>
                                        <key>Proportion</key>
-                                       <string>428pt</string>
+                                       <string>429pt</string>
                                </dict>
                        </array>
                        <key>Name</key>
@@ -810,23 +815,21 @@
                                <string>PBXProjectFindModule</string>
                        </array>
                        <key>StatusbarIsVisible</key>
-                       <integer>1</integer>
+                       <true/>
                        <key>TableOfContents</key>
                        <array>
                                <string>1C530D57069F1CE1000CFCEE</string>
-                               <string>1C530D58069F1CE1000CFCEE</string>
-                               <string>1C530D59069F1CE1000CFCEE</string>
+                               <string>00D5631E09C4789500FB787B</string>
+                               <string>00D5631F09C4789500FB787B</string>
                                <string>1CDD528C0622207200134675</string>
-                               <string>1C530D5A069F1CE1000CFCEE</string>
-                               <string>1CE0B1FE06471DED0097A5F4</string>
                                <string>1CD0528E0623707200166675</string>
                        </array>
                        <key>WindowString</key>
-                       <string>62 385 781 470 0 0 1440 878 </string>
+                       <string>21 339 781 470 0 0 1280 832 </string>
                        <key>WindowToolGUID</key>
                        <string>1C530D57069F1CE1000CFCEE</string>
                        <key>WindowToolIsVisible</key>
-                       <integer>0</integer>
+                       <false/>
                </dict>
                <dict>
                        <key>Identifier</key>
@@ -919,8 +922,8 @@
                                                                                
<string>yes</string>
                                                                                
<key>sizes</key>
                                                                                
<array>
-                                                                               
        <string>{{0, 0}, {493, 168}}</string>
-                                                                               
        <string>{{0, 173}, {493, 270}}</string>
+                                                                               
        <string>{{0, 0}, {366, 168}}</string>
+                                                                               
        <string>{{0, 173}, {366, 270}}</string>
                                                                                
</array>
                                                                        </dict>
                                                                        
<key>VerticalSplitView</key>
@@ -969,9 +972,9 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>1C0AD2B3069F1EA900FABCE6</string>
-                               <string>0054926F08E6EA1A00307083</string>
+                               <string>00D5625309C20D5D00FB787B</string>
                                <string>1CD0528B0623707200166675</string>
-                               <string>0054927008E6EA1A00307083</string>
+                               <string>00D5625409C20D5D00FB787B</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.run</string>
@@ -980,7 +983,7 @@
                        <key>WindowToolGUID</key>
                        <string>1C0AD2B3069F1EA900FABCE6</string>
                        <key>WindowToolIsVisible</key>
-                       <false/>
+                       <true/>
                </dict>
                <dict>
                        <key>Identifier</key>

Modified: KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/mick.pbxuser
===================================================================
--- KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/mick.pbxuser       2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/mick.pbxuser       2006-03-14 18:35:22 UTC (rev 102)
@@ -1,5 +1,23 @@
 // !$*UTF8*$!
 {
+       0017842B09C1E48500530D82 /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00FC4F72064837B900F2220A /* orinoco.png */;
+       };
+       0017842E09C1E48500530D82 /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 435";
+               rLen = 0;
+               rLoc = 19522;
+               rType = 0;
+               vrLen = 1580;
+               vrLoc = 0;
+       };
+       0017842F09C1E48500530D82 /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00FC4F72064837B900F2220A /* orinoco.png */;
+       };
        0054928008E6EF8800307083 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
                fRef = 00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */;
@@ -10,22 +28,96 @@
                vrLen = 1350;
                vrLoc = 0;
        };
-       0054928108E6EF8800307083 /* PBXTextBookmark */ = {
+       0054928308E6EF8800307083 /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
+               fRef = 00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */;
+               name = "BLAuthentication.h: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1350;
+               vrLoc = 0;
+       };
+       005C59CD09C1EBF30066568F /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
                fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
-               name = _installationStatus;
-               rLen = 19;
-               rLoc = 2448;
+               name = "InstallController.h: _enableMonitorModeView";
+               rLen = 0;
+               rLoc = 2343;
                rType = 0;
-               vrLen = 1597;
-               vrLoc = 1439;
+               vrLen = 1356;
+               vrLoc = 1746;
        };
-       0054928208E6EF8800307083 /* PBXBookmark */ = {
-               isa = PBXBookmark;
+       005C59CE09C1EBF30066568F /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
                fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 558";
+               rLen = 0;
+               rLoc = 23173;
+               rType = 0;
+               vrLen = 2119;
+               vrLoc = 16307;
        };
-       0054928308E6EF8800307083 /* PBXTextBookmark */ = {
+       005C59CF09C1EBF30066568F /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 747";
+               rLen = 0;
+               rLoc = 29577;
+               rType = 0;
+               vrLen = 1927;
+               vrLoc = 25398;
+       };
+       005C59D009C1EBF30066568F /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 558";
+               rLen = 0;
+               rLoc = 23173;
+               rType = 0;
+               vrLen = 2160;
+               vrLoc = 16307;
+       };
+       005C59D109C1EBF30066568F /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
+               name = "InstallController.h: _enableMonitorModeView";
+               rLen = 0;
+               rLoc = 2343;
+               rType = 0;
+               vrLen = 1356;
+               vrLoc = 1746;
+       };
+       005C59EF09C1EEF40066568F /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 575";
+               rLen = 0;
+               rLoc = 23536;
+               rType = 0;
+               vrLen = 1245;
+               vrLoc = 20027;
+       };
+       00B1200309C1F8D800AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               comments = "warning: 'NSThread' may not respond to '+sleep:'";
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               rLen = 1;
+               rLoc = 114;
+               rType = 1;
+       };
+       00B1200409C1F8D800AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 116";
+               rLen = 0;
+               rLoc = 3160;
+               rType = 0;
+               vrLen = 892;
+               vrLoc = 2728;
+       };
+       00B1200D09C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
                fRef = 00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */;
                name = "BLAuthentication.h: 1";
                rLen = 0;
@@ -34,26 +126,209 @@
                vrLen = 1350;
                vrLoc = 0;
        };
-       0054928408E6EF8800307083 /* PBXTextBookmark */ = {
+       00B1200E09C1F95C00AD6B0D /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
-               fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
-               name = _installationStatus;
-               rLen = 19;
-               rLoc = 2448;
+               fRef = 00B1200F09C1F95C00AD6B0D /* WaveDriverAirportExtreme.m 
*/;
+               name = "(null): 72";
+               rLen = 0;
+               rLoc = 4731;
                rType = 0;
-               vrLen = 1597;
-               vrLoc = 1439;
+               vrLen = 1767;
+               vrLoc = 1451;
        };
-       0054928508E6EF8800307083 /* PBXTextBookmark */ = {
+       00B1200F09C1F95C00AD6B0D /* WaveDriverAirportExtreme.m */ = {
+               isa = PBXFileReference;
+               lastKnownFileType = sourcecode.c.objc;
+               name = WaveDriverAirportExtreme.m;
+               path = 
/Users/mick/openDev/KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m;
+               sourceTree = "<absolute>";
+       };
+       00B1201009C1F95C00AD6B0D /* PBXTextBookmark */ = {
                isa = PBXTextBookmark;
+               comments = "warning: 'NSThread' may not respond to '+sleep:'";
                fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
-               name = "InstallController.m: 435";
+               rLen = 1;
+               rLoc = 114;
+               rType = 1;
+       };
+       00B1201109C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 111";
                rLen = 0;
-               rLoc = 16298;
+               rLoc = 5411;
                rType = 0;
-               vrLen = 1580;
+               vrLen = 1125;
+               vrLoc = 2438;
+       };
+       00B1201209C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B1201309C1F95C00AD6B0D /* WaveDriverAirportExtreme.m 
*/;
+               name = "(null): 60";
+               rLen = 0;
+               rLoc = 1723;
+               rType = 0;
+               vrLen = 1829;
+               vrLoc = 1451;
+       };
+       00B1201309C1F95C00AD6B0D /* WaveDriverAirportExtreme.m */ = {
+               isa = PBXFileReference;
+               lastKnownFileType = sourcecode.c.objc;
+               name = WaveDriverAirportExtreme.m;
+               path = 
/Users/mick/openDev/KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m;
+               sourceTree = "<absolute>";
+       };
+       00B1201409C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 113";
+               rLen = 0;
+               rLoc = 4867;
+               rType = 0;
+               vrLen = 1320;
+               vrLoc = 2438;
+       };
+       00B1201509C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */;
+               name = "BLAuthentication.h: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1350;
                vrLoc = 0;
        };
+       00B1201609C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B1201709C1F95C00AD6B0D /* WaveDriverAirportExtreme.m 
*/;
+               name = 
"@\"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist\"";
+               rLen = 68;
+               rLoc = 1110;
+               rType = 0;
+               vrLen = 1486;
+               vrLoc = 0;
+       };
+       00B1201709C1F95C00AD6B0D /* WaveDriverAirportExtreme.m */ = {
+               isa = PBXFileReference;
+               lastKnownFileType = sourcecode.c.objc;
+               name = WaveDriverAirportExtreme.m;
+               path = 
/Users/mick/openDev/KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m;
+               sourceTree = "<absolute>";
+       };
+       00B1201809C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 112";
+               rLen = 0;
+               rLoc = 4573;
+               rType = 0;
+               vrLen = 1673;
+               vrLoc = 2457;
+       };
+       00B1201909C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B1201A09C1F95C00AD6B0D /* WaveDriverAirportExtreme.m 
*/;
+               name = "(null): 73";
+               rLen = 0;
+               rLoc = 4731;
+               rType = 0;
+               vrLen = 1829;
+               vrLoc = 1451;
+       };
+       00B1201A09C1F95C00AD6B0D /* WaveDriverAirportExtreme.m */ = {
+               isa = PBXFileReference;
+               lastKnownFileType = sourcecode.c.objc;
+               name = WaveDriverAirportExtreme.m;
+               path = 
/Users/mick/openDev/KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m;
+               sourceTree = "<absolute>";
+       };
+       00B1201B09C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: findFile:";
+               rLen = 0;
+               rLoc = 3767;
+               rType = 0;
+               vrLen = 2398;
+               vrLoc = 2797;
+       };
+       00B1201C09C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */;
+               name = "BLAuthentication.h: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 1350;
+               vrLoc = 0;
+       };
+       00B1201D09C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B1201E09C1F95C00AD6B0D /* WaveDriverAirportExtreme.m 
*/;
+               name = "(null): 72";
+               rLen = 0;
+               rLoc = 4731;
+               rType = 0;
+               vrLen = 1767;
+               vrLoc = 1451;
+       };
+       00B1201E09C1F95C00AD6B0D /* WaveDriverAirportExtreme.m */ = {
+               isa = PBXFileReference;
+               lastKnownFileType = sourcecode.c.objc;
+               name = WaveDriverAirportExtreme.m;
+               path = 
/Users/mick/openDev/KisMACng/Sources/WaveDrivers/WaveDriverAirportExtreme.m;
+               sourceTree = "<absolute>";
+       };
+       00B1201F09C1F95C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 127";
+               rLen = 0;
+               rLoc = 3834;
+               rType = 0;
+               vrLen = 2257;
+               vrLoc = 2440;
+       };
+       00B1202709C1F9A700AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 836";
+               rLen = 0;
+               rLoc = 31875;
+               rType = 0;
+               vrLen = 1876;
+               vrLoc = 30852;
+       };
+       00B1202D09C1FA1C00AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 732";
+               rLen = 0;
+               rLoc = 28009;
+               rType = 0;
+               vrLen = 1443;
+               vrLoc = 26304;
+       };
+       00B1208E09C2064700AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 116";
+               rLen = 0;
+               rLoc = 3160;
+               rType = 0;
+               vrLen = 892;
+               vrLoc = 2728;
+       };
+       00B1209C09C2087200AD6B0D /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: enableMonitorMode:";
+               rLen = 851;
+               rLoc = 4574;
+               rType = 0;
+               vrLen = 2424;
+               vrLoc = 3111;
+       };
        00B9E5E00647B7A9009FEF35 /* KisMAC Installer */ = {
                isa = PBXExecutable;
                activeArgIndex = 2147483647;
@@ -61,10 +336,9 @@
                );
                argumentStrings = (
                );
+               autoAttachOnCrash = 1;
                configStateDict = {
                };
-               cppStopOnCatchEnabled = 0;
-               cppStopOnThrowEnabled = 0;
                customDataFormattersEnabled = 1;
                debuggerPlugin = GDBDebugging;
                disassemblyDisplayState = 0;
@@ -94,24 +368,25 @@
        };
        00B9E6130647BA2E009FEF35 /* InstallController.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1025, 1386}}";
-                       sepNavSelRange = "{2448, 19}";
-                       sepNavVisRect = "{{0, 642}, {1025, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {939, 1456}}";
+                       sepNavSelRange = "{1895, 13}";
+                       sepNavVisRect = "{{0, 770}, {939, 662}}";
                        sepNavWindowFrame = "{{15, 32}, {750, 795}}";
                };
        };
        00B9E6140647BA2E009FEF35 /* InstallController.m */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {2324, 11284}}";
-                       sepNavSelRange = "{16298, 0}";
-                       sepNavVisRect = "{{0, 0}, {1025, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {2324, 12488}}";
+                       sepNavSelRange = "{14277, 0}";
+                       sepNavVisRect = "{{0, 4940}, {939, 662}}";
+                       sepNavWindowFrame = "{{15, 62}, {945, 765}}";
                };
        };
        00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */ = {
                uiCtxt = {
-                       sepNavIntBoundsRect = "{{0, 0}, {1025, 662}}";
+                       sepNavIntBoundsRect = "{{0, 0}, {939, 662}}";
                        sepNavSelRange = "{0, 0}";
-                       sepNavVisRect = "{{0, 0}, {1025, 662}}";
+                       sepNavVisRect = "{{0, 0}, {939, 662}}";
                };
        };
        00B9E97E0647F3B8009FEF35 /* BLAuthentication.m */ = {
@@ -121,6 +396,191 @@
                        sepNavVisRect = "{{0, 3635}, {1057, 668}}";
                };
        };
+       00D5631C09C4789500FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               rLen = 7;
+               rLoc = 17773;
+               rType = 0;
+       };
+       00D5631D09C4789500FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 446";
+               rLen = 0;
+               rLoc = 17772;
+               rType = 0;
+               vrLen = 612;
+               vrLoc = 17128;
+       };
+       00D5632209C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
+               name = _installPatch;
+               rLen = 13;
+               rLoc = 1895;
+               rType = 0;
+               vrLen = 1403;
+               vrLoc = 1699;
+       };
+       00D5632309C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 794";
+               rLen = 0;
+               rLoc = 30008;
+               rType = 0;
+               vrLen = 1967;
+               vrLoc = 28273;
+       };
+       00D5632409C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
+               name = NSButtonCell;
+               rLen = 12;
+               rLoc = 1920;
+               rType = 0;
+               vrLen = 1403;
+               vrLoc = 1699;
+       };
+       00D5632509C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 776";
+               rLen = 0;
+               rLoc = 29208;
+               rType = 0;
+               vrLen = 1967;
+               vrLoc = 28273;
+       };
+       00D5632609C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
+               name = _skipPatch;
+               rLen = 10;
+               rLoc = 1936;
+               rType = 0;
+               vrLen = 1403;
+               vrLoc = 1699;
+       };
+       00D5632709C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 778";
+               rLen = 0;
+               rLoc = 29279;
+               rType = 0;
+               vrLen = 1967;
+               vrLoc = 28273;
+       };
+       00D5632809C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
+               name = _installPatch;
+               rLen = 13;
+               rLoc = 1895;
+               rType = 0;
+               vrLen = 1403;
+               vrLoc = 1699;
+       };
+       00D5632909C478C300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 133";
+               rLen = 0;
+               rLoc = 4558;
+               rType = 0;
+               vrLen = 2564;
+               vrLoc = 2560;
+       };
+       00D5632E09C4794500FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 135";
+               rLen = 0;
+               rLoc = 4558;
+               rType = 0;
+               vrLen = 2852;
+               vrLoc = 2560;
+       };
+       00D5633109C4797400FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: enableMonitorMode:";
+               rLen = 0;
+               rLoc = 4602;
+               rType = 0;
+               vrLen = 2852;
+               vrLoc = 2560;
+       };
+       00D5666C09C73AB300FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 453";
+               rLen = 0;
+               rLoc = 17772;
+               rType = 0;
+               vrLen = 472;
+               vrLoc = 17279;
+       };
+       00D5666E09C73AB900FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 129";
+               rLen = 0;
+               rLoc = 3888;
+               rType = 0;
+               vrLen = 2852;
+               vrLoc = 2560;
+       };
+       00D5667509C73B6D00FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00D5667009C73AE100FB787B /* airportExtreme.png */;
+       };
+       00D5667609C73B6D00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 129";
+               rLen = 0;
+               rLoc = 3888;
+               rType = 0;
+               vrLen = 2852;
+               vrLoc = 2560;
+       };
+       00D5667709C73B6D00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 129";
+               rLen = 0;
+               rLoc = 3888;
+               rType = 0;
+               vrLen = 2852;
+               vrLoc = 2560;
+       };
+       00D5667809C73B6D00FB787B /* PBXBookmark */ = {
+               isa = PBXBookmark;
+               fRef = 00D5667009C73AE100FB787B /* airportExtreme.png */;
+       };
+       00D5667909C73B6D00FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 377";
+               rLen = 0;
+               rLoc = 14277;
+               rType = 0;
+               vrLen = 2732;
+               vrLoc = 13330;
+       };
+       00D5667F09C73C3700FB787B /* PBXTextBookmark */ = {
+               isa = PBXTextBookmark;
+               fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+               name = "InstallController.m: 377";
+               rLen = 0;
+               rLoc = 14277;
+               rType = 0;
+               vrLen = 2687;
+               vrLoc = 13330;
+       };
        00FC4EE40647F6C800F2220A /* install.sh */ = {
                uiCtxt = {
                        sepNavIntBoundsRect = "{{0, 0}, {1025, 662}}";
@@ -218,7 +678,7 @@
                                PBXFileTableDataSourceColumnSortingKey = 
PBXFileDataSource_Filename_ColumnID;
                                PBXFileTableDataSourceColumnWidthsKey = (
                                        20,
-                                       760,
+                                       674,
                                        20,
                                        121,
                                        43,
@@ -257,7 +717,7 @@
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 149350556;
+                       PBXPerProjectTemplateStateSaveDate = 163711927;
                        PBXPrepackagedSmartGroups_v2 = (
                                {
                                        PBXTransientLocationAtTop = bottom;
@@ -736,15 +1196,60 @@
                                PBXModuleWindowStatusBarHidden = YES;
                                RubberWindowFrame = "267 358 745 464 0 0 1280 
832 ";
                        };
-                       PBXWorkspaceStateSaveDate = 149350556;
+                       PBXWorkspaceStateSaveDate = 163711927;
                };
                perUserProjectItems = {
-                       0054928008E6EF8800307083 /* PBXTextBookmark */ = 
0054928008E6EF8800307083 /* PBXTextBookmark */;
-                       0054928108E6EF8800307083 /* PBXTextBookmark */ = 
0054928108E6EF8800307083 /* PBXTextBookmark */;
-                       0054928208E6EF8800307083 /* PBXBookmark */ = 
0054928208E6EF8800307083 /* PBXBookmark */;
-                       0054928308E6EF8800307083 /* PBXTextBookmark */ = 
0054928308E6EF8800307083 /* PBXTextBookmark */;
-                       0054928408E6EF8800307083 /* PBXTextBookmark */ = 
0054928408E6EF8800307083 /* PBXTextBookmark */;
-                       0054928508E6EF8800307083 /* PBXTextBookmark */ = 
0054928508E6EF8800307083 /* PBXTextBookmark */;
+                       0017842B09C1E48500530D82 = 0017842B09C1E48500530D82 /* 
PBXBookmark */;
+                       0017842E09C1E48500530D82 = 0017842E09C1E48500530D82 /* 
PBXTextBookmark */;
+                       0017842F09C1E48500530D82 = 0017842F09C1E48500530D82 /* 
PBXBookmark */;
+                       0054928008E6EF8800307083 = 0054928008E6EF8800307083 /* 
PBXTextBookmark */;
+                       0054928308E6EF8800307083 = 0054928308E6EF8800307083 /* 
PBXTextBookmark */;
+                       005C59CD09C1EBF30066568F = 005C59CD09C1EBF30066568F /* 
PBXTextBookmark */;
+                       005C59CE09C1EBF30066568F = 005C59CE09C1EBF30066568F /* 
PBXTextBookmark */;
+                       005C59CF09C1EBF30066568F = 005C59CF09C1EBF30066568F /* 
PBXTextBookmark */;
+                       005C59D009C1EBF30066568F = 005C59D009C1EBF30066568F /* 
PBXTextBookmark */;
+                       005C59D109C1EBF30066568F = 005C59D109C1EBF30066568F /* 
PBXTextBookmark */;
+                       005C59EF09C1EEF40066568F = 005C59EF09C1EEF40066568F /* 
PBXTextBookmark */;
+                       00B1200309C1F8D800AD6B0D = 00B1200309C1F8D800AD6B0D /* 
PBXTextBookmark */;
+                       00B1200409C1F8D800AD6B0D = 00B1200409C1F8D800AD6B0D /* 
PBXTextBookmark */;
+                       00B1200D09C1F95C00AD6B0D = 00B1200D09C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1200E09C1F95C00AD6B0D = 00B1200E09C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201009C1F95C00AD6B0D = 00B1201009C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201109C1F95C00AD6B0D = 00B1201109C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201209C1F95C00AD6B0D = 00B1201209C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201409C1F95C00AD6B0D = 00B1201409C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201509C1F95C00AD6B0D = 00B1201509C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201609C1F95C00AD6B0D = 00B1201609C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201809C1F95C00AD6B0D = 00B1201809C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201909C1F95C00AD6B0D = 00B1201909C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201B09C1F95C00AD6B0D = 00B1201B09C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201C09C1F95C00AD6B0D = 00B1201C09C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201D09C1F95C00AD6B0D = 00B1201D09C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1201F09C1F95C00AD6B0D = 00B1201F09C1F95C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1202709C1F9A700AD6B0D = 00B1202709C1F9A700AD6B0D /* 
PBXTextBookmark */;
+                       00B1202D09C1FA1C00AD6B0D = 00B1202D09C1FA1C00AD6B0D /* 
PBXTextBookmark */;
+                       00B1208E09C2064700AD6B0D = 00B1208E09C2064700AD6B0D /* 
PBXTextBookmark */;
+                       00B1209C09C2087200AD6B0D = 00B1209C09C2087200AD6B0D /* 
PBXTextBookmark */;
+                       00D5631C09C4789500FB787B /* PBXTextBookmark */ = 
00D5631C09C4789500FB787B /* PBXTextBookmark */;
+                       00D5631D09C4789500FB787B /* PBXTextBookmark */ = 
00D5631D09C4789500FB787B /* PBXTextBookmark */;
+                       00D5632209C478C300FB787B /* PBXTextBookmark */ = 
00D5632209C478C300FB787B /* PBXTextBookmark */;
+                       00D5632309C478C300FB787B /* PBXTextBookmark */ = 
00D5632309C478C300FB787B /* PBXTextBookmark */;
+                       00D5632409C478C300FB787B /* PBXTextBookmark */ = 
00D5632409C478C300FB787B /* PBXTextBookmark */;
+                       00D5632509C478C300FB787B /* PBXTextBookmark */ = 
00D5632509C478C300FB787B /* PBXTextBookmark */;
+                       00D5632609C478C300FB787B /* PBXTextBookmark */ = 
00D5632609C478C300FB787B /* PBXTextBookmark */;
+                       00D5632709C478C300FB787B /* PBXTextBookmark */ = 
00D5632709C478C300FB787B /* PBXTextBookmark */;
+                       00D5632809C478C300FB787B /* PBXTextBookmark */ = 
00D5632809C478C300FB787B /* PBXTextBookmark */;
+                       00D5632909C478C300FB787B /* PBXTextBookmark */ = 
00D5632909C478C300FB787B /* PBXTextBookmark */;
+                       00D5632E09C4794500FB787B /* PBXTextBookmark */ = 
00D5632E09C4794500FB787B /* PBXTextBookmark */;
+                       00D5633109C4797400FB787B /* PBXTextBookmark */ = 
00D5633109C4797400FB787B /* PBXTextBookmark */;
+                       00D5666C09C73AB300FB787B /* PBXTextBookmark */ = 
00D5666C09C73AB300FB787B /* PBXTextBookmark */;
+                       00D5666E09C73AB900FB787B /* PBXTextBookmark */ = 
00D5666E09C73AB900FB787B /* PBXTextBookmark */;
+                       00D5667509C73B6D00FB787B /* PBXBookmark */ = 
00D5667509C73B6D00FB787B /* PBXBookmark */;
+                       00D5667609C73B6D00FB787B /* PBXTextBookmark */ = 
00D5667609C73B6D00FB787B /* PBXTextBookmark */;
+                       00D5667709C73B6D00FB787B /* PBXTextBookmark */ = 
00D5667709C73B6D00FB787B /* PBXTextBookmark */;
+                       00D5667809C73B6D00FB787B /* PBXBookmark */ = 
00D5667809C73B6D00FB787B /* PBXBookmark */;
+                       00D5667909C73B6D00FB787B /* PBXTextBookmark */ = 
00D5667909C73B6D00FB787B /* PBXTextBookmark */;
+                       00D5667F09C73C3700FB787B /* PBXTextBookmark */ = 
00D5667F09C73C3700FB787B /* PBXTextBookmark */;
                };
                sourceControlManager = 00B9E5E90647B7BD009FEF35 /* Source 
Control */;
                userBuildSettings = {

Modified: KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/project.pbxproj
===================================================================
--- KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/project.pbxproj    2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/Subprojects/KisMAC Installer/KisMAC 
Installer.xcodeproj/project.pbxproj    2006-03-14 18:35:22 UTC (rev 102)
@@ -23,6 +23,7 @@
                00B9E97A0647E715009FEF35 /* target.png in Resources */ = {isa = 
PBXBuildFile; fileRef = 00B9E9790647E715009FEF35 /* target.png */; };
                00B9E97F0647F3B8009FEF35 /* BLAuthentication.h in Headers */ = 
{isa = PBXBuildFile; fileRef = 00B9E97D0647F3B8009FEF35 /* BLAuthentication.h 
*/; };
                00B9E9800647F3B8009FEF35 /* BLAuthentication.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 00B9E97E0647F3B8009FEF35 /* BLAuthentication.m 
*/; };
+               00D5667109C73AE100FB787B /* airportExtreme.png in Resources */ 
= {isa = PBXBuildFile; fileRef = 00D5667009C73AE100FB787B /* airportExtreme.png 
*/; };
                00FC4EEB0647F6C800F2220A /* install.sh in Resources */ = {isa = 
PBXBuildFile; fileRef = 00FC4EE40647F6C800F2220A /* install.sh */; };
                00FC4EEC0647F6C800F2220A /* permissions.sh in Resources */ = 
{isa = PBXBuildFile; fileRef = 00FC4EE50647F6C800F2220A /* permissions.sh */; };
                00FC4EED0647F6C800F2220A /* remove.sh in Resources */ = {isa = 
PBXBuildFile; fileRef = 00FC4EE60647F6C800F2220A /* remove.sh */; };
@@ -70,23 +71,6 @@
                };
 /* End PBXBuildStyle section */
 
-/* Begin PBXContainerItemProxy section */
-               005EEFEC087143AC00423387 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 00F9C4B806DA9DCC00E357F0 /* 
KisMAC.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 8D1107320486CEB800E47090;
-                       remoteInfo = KisMAC;
-               };
-               005EEFEE087143AC00423387 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 00F9C4B806DA9DCC00E357F0 /* 
KisMAC.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 008AC9C007C3889400A76ADA;
-                       remoteInfo = KisMACUnitTest;
-               };
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
                00B9E6090647BA04009FEF35 /* skip_forward_active.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = 
skip_forward_active.png; sourceTree = "<group>"; };
                00B9E60A0647BA04009FEF35 /* skip_forward_blue.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = skip_forward_blue.png; 
sourceTree = "<group>"; };
@@ -104,7 +88,7 @@
                00B9E9790647E715009FEF35 /* target.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = target.png; sourceTree 
= "<group>"; };
                00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = 
BLAuthentication.h; sourceTree = "<group>"; };
                00B9E97E0647F3B8009FEF35 /* BLAuthentication.m */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; 
path = BLAuthentication.m; sourceTree = "<group>"; };
-               00F9C4B806DA9DCC00E357F0 /* KisMAC.xcodeproj */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = 
KisMAC.xcodeproj; path = ../../KisMAC.xcodeproj; sourceTree = SOURCE_ROOT; };
+               00D5667009C73AE100FB787B /* airportExtreme.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = airportExtreme.png; 
sourceTree = "<group>"; };
                00FC4EE40647F6C800F2220A /* install.sh */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = 
install.sh; sourceTree = "<group>"; };
                00FC4EE50647F6C800F2220A /* permissions.sh */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = 
permissions.sh; sourceTree = "<group>"; };
                00FC4EE60647F6C800F2220A /* remove.sh */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = 
remove.sh; sourceTree = "<group>"; };
@@ -145,18 +129,10 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-               005EEFE8087143AC00423387 /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               005EEFED087143AC00423387 /* KisMAC.app */,
-                               005EEFEF087143AC00423387 /* 
KisMACUnitTest.bundle */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
                00B9E6080647B9E5009FEF35 /* Images */ = {
                        isa = PBXGroup;
                        children = (
+                               00D5667009C73AE100FB787B /* airportExtreme.png 
*/,
                                00FC4F72064837B900F2220A /* orinoco.png */,
                                00FC4F700648361200F2220A /* opensource.png */,
                                00FC4F6E0648321500F2220A /* airport.png */,
@@ -233,7 +209,6 @@
                29B97314FDCFA39411CA2CEA /* KisMAC Installer */ = {
                        isa = PBXGroup;
                        children = (
-                               00F9C4B806DA9DCC00E357F0 /* KisMAC.xcodeproj */,
                                080E96DDFE201D6D7F000001 /* Classes */,
                                29B97315FDCFA39411CA2CEA /* Other Sources */,
                                29B97317FDCFA39411CA2CEA /* Resources */,
@@ -347,35 +322,12 @@
                        hasScannedForEncodings = 1;
                        mainGroup = 29B97314FDCFA39411CA2CEA /* KisMAC 
Installer */;
                        projectDirPath = "";
-                       projectReferences = (
-                               {
-                                       ProductGroup = 005EEFE8087143AC00423387 
/* Products */;
-                                       ProjectRef = 00F9C4B806DA9DCC00E357F0 
/* KisMAC.xcodeproj */;
-                               },
-                       );
                        targets = (
                                8D1107260486CEB800E47090 /* KisMAC Installer */,
                        );
                };
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-               005EEFED087143AC00423387 /* KisMAC.app */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = wrapper.application;
-                       path = KisMAC.app;
-                       remoteRef = 005EEFEC087143AC00423387 /* 
PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               005EEFEF087143AC00423387 /* KisMACUnitTest.bundle */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = wrapper.cfbundle;
-                       path = KisMACUnitTest.bundle;
-                       remoteRef = 005EEFEE087143AC00423387 /* 
PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
                8D1107290486CEB800E47090 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
@@ -406,6 +358,7 @@
                                00FC4F6F0648321500F2220A /* airport.png in 
Resources */,
                                00FC4F710648361200F2220A /* opensource.png in 
Resources */,
                                00FC4F73064837B900F2220A /* orinoco.png in 
Resources */,
+                               00D5667109C73AE100FB787B /* airportExtreme.png 
in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

Added: KisMACng/Subprojects/KisMAC Installer/airportExtreme.png
===================================================================
(Binary files differ)


Property changes on: KisMACng/Subprojects/KisMAC Installer/airportExtreme.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: KisMACng/Subprojects/MACJack/MACJackCard.cpp
===================================================================
--- KisMACng/Subprojects/MACJack/MACJackCard.cpp        2006-03-14 17:28:02 UTC 
(rev 101)
+++ KisMACng/Subprojects/MACJack/MACJackCard.cpp        2006-03-14 18:35:22 UTC 
(rev 102)
@@ -24,7 +24,6 @@
     along with KisMAC; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-
 #include <IOKit/IOWorkLoop.h>
 #include <IOKit/IOLib.h>
 #include <libkern/OSByteOrder.h>

Modified: KisMACng/compile.command
===================================================================
--- KisMACng/compile.command    2006-03-14 17:28:02 UTC (rev 101)
+++ KisMACng/compile.command    2006-03-14 18:35:22 UTC (rev 102)
@@ -2,22 +2,40 @@
 
 configuration=Deployment
 
+echo "Checking for required enviroment..."
+if ! [ -x /usr/bin/tar ]; then
+       echo "/usr/bin/tar not found! Make sure you installed the BSD 
subsystem!"
+       exit 1
+fi
+
+if echo $0 | grep " " > /dev/null; then
+       echo "KisMAC source path contains a space character. This will lead to 
problems!"
+       exit 1
+fi
+
 cd "`dirname "$0"`"
 
+echo "Decompressing UnitTest bundle..."
 mkdir "./build/KisMACUnitTest.bundle/Contents/Frameworks" 2>/dev/null
 cd UnitTest
 ln -s "../build/KisMACUnitTest.bundle/Contents/Frameworks" . 2>/dev/null
-tar xjf UnitKit.tbz 2>/dev/null
+tar -xjf UnitKit.tbz 2>/dev/null
 cd ..
 
+echo "Decompressing Growl framework..."
 cd Resources
-tar -xvvzf growl.tgz
+tar -xzf growl.tgz
 cd ..
 
+echo "Determine Subversion Revision..."
 val=`svnversion -n .`
 sed -e "s/\\\$Revision.*\\\$/\\\$Revision: $val\\\$/" 
Resources/Info.plist.templ > Resources/Info.plist
 sed -e "s/\\\$Revision.*\\\$/\\\$Revision: $val\\\$/" 
Resources/Strings/English.lproj/InfoPlist.strings.templ > 
Resources/Strings/English.lproj/InfoPlist.strings
 
+echo "Preparing Enviroment..."
+if [ -f compile.log ]; then
+  rm compile.log
+fi
 touch "./Sources/not public/WaveSecret.h"
 touch "./Sources/WindowControllers/CrashReportController.m"
 mkdir "./Subprojects/files" 2>/dev/null
@@ -25,22 +43,75 @@
 rm -rf *.framework 2>/dev/null
 cd ..
 
+echo -n "Building MACJack driver... "
 cd MACJack
-xcodebuild -configuration $configuration
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+       exit 1
+else
+       echo "ok"
+fi
+
+echo -n "Building Viha driver... "
 cd ../VihaDriver
-xcodebuild -configuration $configuration
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+        exit 1
+else
+        echo "ok"
+fi
+
+echo -n "Building AtheroJack driver... "
 cd ../AtheroJack
-xcodebuild -configuration $configuration
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+        exit 1
+else
+        echo "ok"
+fi
+
+echo -n "Building AiroJack driver... "
 cd ../AiroJack
-xcodebuild -configuration $configuration
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+        exit 1
+else
+        echo "ok"
+fi
+
+echo -n "Building binaervarianz openGL framework... "
 cd ../BIGL
-xcodebuild -configuration $configuration
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+        exit 1
+else
+        echo "ok"
+fi
+
+echo -n "Building generic binaervarianz framework... "
 cd ../BIGeneric
-xcodebuild -configuration $configuration
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+        exit 1
+else
+        echo "ok"
+fi
+
 cd ../AirPortMenu
-xcodebuild -configuration $configuration
-cd ../KisMAC\ Installer
-xcodebuild -configuration $configuration
+echo -n "Building AirPortMenu tool... "
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+        exit 1
+else
+        echo "ok"
+fi
 
+cd ../KisMACInstaller
+echo -n "Building KisMAC installer application... "
+if ! xcodebuild -configuration $configuration >> ../../compile.log; then
+        exit 1
+else
+        echo "ok"
+fi
+
+echo -n "Building KisMAC main application... "
 cd ../..
-xcodebuild -target KisMAC -configuration $configuration
+if ! xcodebuild -target KisMAC -configuration $configuration >> compile.log; 
then
+        exit 1
+else
+        echo "ok"
+fi
+


Other related posts:

  • » [kismac] [binaervarianz] r102 - in KisMACng: . KisMAC.xcodeproj Sources/Controller Sources/Core Sources/Obsolete Sources/Preferences/PreferencePanes Sources/Views Sources/WaveDrivers Subprojects/BIGL Subprojects/BIGL/BIGL.xcodeproj Subprojects/BIGeneric Subprojects/BIGeneric/BIGeneric.xcodeproj Subprojects/KisMAC Installer Subprojects/KisMAC Installer/English.lproj/MainMenu.nib Subprojects/KisMAC Installer/KisMAC Installer.xcodeproj Subprojects/MACJack