[kismac] [binaervarianz] r138 - others/GTDriver others/SSIDLister trunk trunk/KisMAC.xcodeproj trunk/Resources/Nibs/English.lproj/MainMenu.nib trunk/Sources/Controller trunk/Sources/WaveDrivers trunk/Subprojects/KisMACInstaller trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj
- From: svn@xxxxxxxxxxxxxxxx
- To: kismac@xxxxxxxxxxxxx
- Date: Mon, 24 Apr 2006 23:28:09 +0200
Author: mick
Date: 2006-04-24 23:28:09 +0200 (Mon, 24 Apr 2006)
New Revision: 138
Modified:
others/GTDriver/install.command
others/SSIDLister/PacketSourcePCAP.cpp
others/SSIDLister/compile.sh
trunk/KisMAC.xcodeproj/mick.mode1
trunk/KisMAC.xcodeproj/mick.pbxuser
trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency
trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib
trunk/Resources/Nibs/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/Sources/Controller/ScanControllerScriptable.m
trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m
trunk/Subprojects/KisMACInstaller/InstallController.m
trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.mode1
trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.pbxuser
trunk/compile.command
Log:
* general cleanup
* fixed some macbook pro related bugs
Modified: others/GTDriver/install.command
===================================================================
--- others/GTDriver/install.command 2006-04-22 08:54:37 UTC (rev 137)
+++ others/GTDriver/install.command 2006-04-24 21:28:09 UTC (rev 138)
@@ -23,8 +23,8 @@
sudo cp -r "$FROM/WiFiGUI.app" $DEST/Contents/Resources
#sudo cp -r "$FROM/StartupParameters.plist" $SDEST
#sudo cp -r "$FROM/GTDriver" $SDEST
-/usr/bin/osascript $FROM/removeLoginItem.scpt
-cp $FROM/addStartupItem.scpt /tmp/addStartupItem.scpt
+/usr/bin/osascript "$FROM/removeLoginItem.scpt"
+cp "$FROM/addStartupItem.scpt" /tmp/addStartupItem.scpt
/usr/bin/osascript /tmp/addStartupItem.scpt
rm /tmp/addStartupItem.scpt
Modified: others/SSIDLister/PacketSourcePCAP.cpp
===================================================================
--- others/SSIDLister/PacketSourcePCAP.cpp 2006-04-22 08:54:37 UTC (rev
137)
+++ others/SSIDLister/PacketSourcePCAP.cpp 2006-04-24 21:28:09 UTC (rev
138)
@@ -55,6 +55,9 @@
case DLT_PRISM_HEADER:
_headerOffset = 144; //new wlanng header type
break;
+ case DLT_IEEE802_11_RADIO_AVS:
+ _headerOffset = 64;
+ break;
case DLT_IEEE802_11_RADIO:
case DLT_AIRONET_HEADER:
throw PacketSource_error("Unsupported 802.11 Datalink mode.");
Modified: others/SSIDLister/compile.sh
===================================================================
--- others/SSIDLister/compile.sh 2006-04-22 08:54:37 UTC (rev 137)
+++ others/SSIDLister/compile.sh 2006-04-24 21:28:09 UTC (rev 138)
@@ -11,7 +11,7 @@
if [ `uname` == Darwin ]; then
echo "Compiling SSIDLister for MacOS X"
- g++ *.cpp USBIntersilJack/USBIntersil.mm -framework Carbon -framework
IOKit -framework Cocoa -lncurses -lpcap -lpthread -o build/SSIDLister
+ g++ *.cpp USBIntersilJack/USBIntersil.mm -Wall -framework Carbon
-framework IOKit -framework Cocoa -lncurses -lpcap -lpthread -o build/SSIDLister
else
echo "Compiling SSIDLister for generic Unix"
g++ *.cpp -DNOMACOS -lncurses -lpcap -lpthread -o build/SSIDLister
@@ -26,4 +26,4 @@
echo "Compiling completed. ./build/SSIDLister created."
else
echo "SSIDLister not created."
-fi
\ No newline at end of file
+fi
Modified: trunk/KisMAC.xcodeproj/mick.mode1
===================================================================
--- trunk/KisMAC.xcodeproj/mick.mode1 2006-04-22 08:54:37 UTC (rev 137)
+++ trunk/KisMAC.xcodeproj/mick.mode1 2006-04-24 21:28:09 UTC (rev 138)
@@ -258,14 +258,17 @@
<array>
<string>29B97314FDCFA39411CA2CEA</string>
<string>080E96DDFE201D6D7F000001</string>
+
<string>003533A406A5DD8500AB4577</string>
<string>003533B206A5DD8500AB4577</string>
+
<string>003533D206A5DD8500AB4577</string>
+
<string>0035340E06A5DD8500AB4577</string>
<string>1C37FBAC04509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
-
<integer>19</integer>
-
<integer>7</integer>
+
<integer>15</integer>
+
<integer>6</integer>
<integer>3</integer>
<integer>0</integer>
</array>
@@ -292,7 +295,7 @@
<real>257</real>
</array>
<key>RubberWindowFrame</key>
- <string>-4 92 1280 740 0 0 1280
832 </string>
+ <string>-4 138 1280 740 0 0
1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -310,7 +313,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>WavePacket.mm</string>
+
<string>ScanControllerScriptable.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -318,17 +321,14 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>WavePacket.mm</string>
+
<string>ScanControllerScriptable.m</string>
<key>_historyCapacity</key>
<integer>20</integer>
<key>bookmark</key>
-
<string>00F7E73C09D1D5FE00055E8E</string>
+
<string>004C220909FD799B0008620D</string>
<key>history</key>
<array>
-
<string>00D5638509C4834000FB787B</string>
-
<string>00D563DD09C4948100FB787B</string>
<string>00D5662D09C7343700FB787B</string>
-
<string>00D5663B09C734DD00FB787B</string>
<string>00D5668209C73C9000FB787B</string>
<string>00D566A809C74A0700FB787B</string>
<string>00D566A909C74A0700FB787B</string>
@@ -337,21 +337,22 @@
<string>00D5671E09C7633600FB787B</string>
<string>00D5673909C764FE00FB787B</string>
<string>00D5673A09C764FE00FB787B</string>
-
<string>00D5673B09C764FE00FB787B</string>
<string>00D5673C09C764FE00FB787B</string>
<string>00D569EB09C7689100FB787B</string>
<string>00340D4909CA013100B78602</string>
<string>00340D5E09CA049700B78602</string>
<string>00F7E73609D1D5DF00055E8E</string>
<string>00F7E73709D1D5DF00055E8E</string>
-
<string>00F7E73809D1D5DF00055E8E</string>
+
<string>004C19CE09FD5DFF0008620D</string>
+
<string>004C1C9109FD776A0008620D</string>
+
<string>004C21FD09FD78DF0008620D</string>
+
<string>004C21FE09FD78DF0008620D</string>
+
<string>00D5673B09C764FE00FB787B</string>
</array>
<key>prevStack</key>
<array>
<string>0076353C09A26CAC002A5BEF</string>
-
<string>00D5634A09C47AA400FB787B</string>
<string>00D5639109C4834000FB787B</string>
-
<string>00D563DF09C4948100FB787B</string>
<string>00D5663009C7343700FB787B</string>
<string>00D5663D09C734DD00FB787B</string>
<string>00D5663E09C734DD00FB787B</string>
@@ -367,6 +368,10 @@
<string>00340D6009CA049700B78602</string>
<string>00F7E73909D1D5DF00055E8E</string>
<string>00F7E73A09D1D5DF00055E8E</string>
+
<string>004C19D009FD5DFF0008620D</string>
+
<string>004C1C9309FD776A0008620D</string>
+
<string>004C21FF09FD78DF0008620D</string>
+
<string>004C220009FD78DF0008620D</string>
</array>
</dict>
<key>SplitCount</key>
@@ -380,7 +385,7 @@
<key>Frame</key>
<string>{{0,
0}, {979, 694}}</string>
<key>RubberWindowFrame</key>
- <string>-4 92
1280 740 0 0 1280 832 </string>
+ <string>-4 138
1280 740 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -400,7 +405,7 @@
<key>Frame</key>
<string>{{0,
699}, {979, 0}}</string>
<key>RubberWindowFrame</key>
- <string>-4 92
1280 740 0 0 1280 832 </string>
+ <string>-4 138
1280 740 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -424,9 +429,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>00F7E72E09D1D57F00055E8E</string>
+ <string>004C220209FD78DF0008620D</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>00F7E72F09D1D57F00055E8E</string>
+ <string>004C220309FD78DF0008620D</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -560,10 +565,11 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>/Users/mick/openDev/KisMACng/KisMAC.xcodeproj</string>
+ <string>00A3E66608242A87003CD96A</string>
+ <string>/Users/mick/openDev/trunk/KisMAC.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>-4 92 1280 740 0 0 1280 832 </string>
+ <string>-4 138 1280 740 0 0 1440 878 </string>
<key>WindowTools</key>
<array>
<dict>
@@ -593,7 +599,7 @@
<key>Frame</key>
<string>{{0,
0}, {1280, 341}}</string>
<key>RubberWindowFrame</key>
- <string>0 93
1280 739 0 0 1280 832 </string>
+ <string>160 139
1280 739 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -601,8 +607,6 @@
<string>341pt</string>
</dict>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBuildLogShowsTranscriptDefaultKey</key>
@@ -621,7 +625,7 @@
<key>Frame</key>
<string>{{0,
346}, {1280, 352}}</string>
<key>RubberWindowFrame</key>
- <string>0 93
1280 739 0 0 1280 832 </string>
+ <string>160 139
1280 739 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@@ -644,14 +648,14 @@
<key>TableOfContents</key>
<array>
<string>00A3E66608242A87003CD96A</string>
- <string>00340D3A09CA009600B78602</string>
+ <string>004C220409FD78DF0008620D</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.build</string>
<key>WindowString</key>
- <string>0 93 1280 739 0 0 1280 832 </string>
+ <string>160 139 1280 739 0 0 1440 878 </string>
<key>WindowToolGUID</key>
<string>00A3E66608242A87003CD96A</string>
<key>WindowToolIsVisible</key>
Modified: trunk/KisMAC.xcodeproj/mick.pbxuser
===================================================================
--- trunk/KisMAC.xcodeproj/mick.pbxuser 2006-04-22 08:54:37 UTC (rev 137)
+++ trunk/KisMAC.xcodeproj/mick.pbxuser 2006-04-24 21:28:09 UTC (rev 138)
@@ -439,8 +439,8 @@
003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1064, 7616}}";
- sepNavSelRange = "{5097, 36}";
- sepNavVisRect = "{{0, 1970}, {932, 662}}";
+ sepNavSelRange = "{2975, 0}";
+ sepNavVisRect = "{{0, 1076}, {938, 662}}";
sepNavWindowFrame = "{{15, 32}, {750, 795}}";
};
};
@@ -460,9 +460,9 @@
};
003533B306A5DD8500AB4577 /* 80211b.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {933, 3234}}";
+ sepNavIntBoundsRect = "{{0, 0}, {938, 3248}}";
sepNavSelRange = "{3491, 0}";
- sepNavVisRect = "{{0, 1583}, {933, 662}}";
+ sepNavVisRect = "{{0, 1583}, {938, 662}}";
sepNavWindowFrame = "{{15, 32}, {750, 795}}";
};
};
@@ -545,7 +545,7 @@
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {2096, 12824}}";
sepNavSelRange = "{1686, 0}";
- sepNavVisRect = "{{0, 1318}, {932, 662}}";
+ sepNavVisRect = "{{0, 1316}, {938, 662}}";
sepNavWindowFrame = "{{15, 32}, {750, 795}}";
};
};
@@ -1116,6 +1116,96 @@
modificationTime = 164235313.164996;
state = 1;
};
+ 004C19CE09FD5DFF0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533C206A5DD8500AB4577 /* WavePacket.mm */;
+ name = "WavePacket.mm: 56";
+ rLen = 0;
+ rLoc = 1686;
+ rType = 0;
+ vrLen = 1293;
+ vrLoc = 2877;
+ };
+ 004C19D009FD5DFF0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533C206A5DD8500AB4577 /* WavePacket.mm */;
+ name = "WavePacket.mm: 56";
+ rLen = 0;
+ rLoc = 1686;
+ rType = 0;
+ vrLen = 1293;
+ vrLoc = 2877;
+ };
+ 004C1C9109FD776A0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00875DA907097D8D00CACFCB /* WaveWeakContainer.m */;
+ name = "WaveWeakContainer.m: 56";
+ rLen = 0;
+ rLoc = 1541;
+ rType = 0;
+ vrLen = 1050;
+ vrLoc = 1285;
+ };
+ 004C1C9309FD776A0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00875DA907097D8D00CACFCB /* WaveWeakContainer.m */;
+ name = "WaveWeakContainer.m: 56";
+ rLen = 0;
+ rLoc = 1541;
+ rType = 0;
+ vrLen = 1050;
+ vrLoc = 1285;
+ };
+ 004C21FD09FD78DF0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m
*/;
+ name = "WaveDriverAirportExtreme.m: 131";
+ rLen = 0;
+ rLoc = 5481;
+ rType = 0;
+ vrLen = 2229;
+ vrLoc = 3544;
+ };
+ 004C21FE09FD78DF0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533B306A5DD8500AB4577 /* 80211b.h */;
+ name = "80211b.h: IEEE80211_VERSION_MASK";
+ rLen = 0;
+ rLoc = 3491;
+ rType = 0;
+ vrLen = 2095;
+ vrLoc = 2840;
+ };
+ 004C21FF09FD78DF0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m
*/;
+ name = "WaveDriverAirportExtreme.m: 131";
+ rLen = 0;
+ rLoc = 5481;
+ rType = 0;
+ vrLen = 2229;
+ vrLoc = 3544;
+ };
+ 004C220009FD78DF0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533B306A5DD8500AB4577 /* 80211b.h */;
+ name = "80211b.h: IEEE80211_VERSION_MASK";
+ rLen = 0;
+ rLoc = 3491;
+ rType = 0;
+ vrLen = 2095;
+ vrLoc = 2840;
+ };
+ 004C220909FD799B0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m
*/;
+ name = "ScanControllerScriptable.m: 104";
+ rLen = 0;
+ rLoc = 2975;
+ rType = 0;
+ vrLen = 1337;
+ vrLoc = 2193;
+ };
005B12660730051A00906C36 /* MapControlItem.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {964, 825}}";
@@ -1250,10 +1340,10 @@
0083C8EE0880633E00D895CB /* MapView.m:232 */,
0083C8FF088063B500D895CB /* BIView.m:58 */,
0083C90E088064F700D895CB /* MapView.m:233 */,
- 00DF45D208B1FFC1003F3C7E /*
WaveDriverAirportExtreme.m:134 */,
+ 00DF45D208B1FFC1003F3C7E /*
WaveDriverAirportExtreme.m:148 */,
00DF45E108B202D6003F3C7E /* WaveDriverAtheros.m:208 */,
- 00DF480508B23BB2003F3C7E /*
WaveDriverAirportExtreme.m:131 */,
- 00DF481908B23DC8003F3C7E /*
WaveDriverAirportExtreme.m:101 */,
+ 00DF480508B23BB2003F3C7E /*
WaveDriverAirportExtreme.m:145 */,
+ 00DF481908B23DC8003F3C7E /*
WaveDriverAirportExtreme.m:97 */,
000C1A4108B8BAC800464DAB /* WaveScanner.mm:217 */,
0093D1EE09B08C370046F830 /*
ScanControllerScriptable.m:508 */,
00D5629009C2151100FB787B /* GrowlController.m:1 */,
@@ -1273,8 +1363,8 @@
00875D1A0708ADB300CACFCB /* WaveHelper.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1268, 10010}}";
- sepNavSelRange = "{9370, 0}";
- sepNavVisRect = "{{0, 4028}, {705, 666}}";
+ sepNavSelRange = "{5976, 18}";
+ sepNavVisRect = "{{0, 2364}, {938, 662}}";
sepNavWindowFrame = "{{15, 32}, {750, 795}}";
};
};
@@ -1287,9 +1377,9 @@
};
00875DA907097D8D00CACFCB /* WaveWeakContainer.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {939, 2030}}";
- sepNavSelRange = "{1319, 0}";
- sepNavVisRect = "{{0, 614}, {939, 453}}";
+ sepNavIntBoundsRect = "{{0, 0}, {938, 2030}}";
+ sepNavSelRange = "{1541, 0}";
+ sepNavVisRect = "{{0, 642}, {938, 662}}";
sepNavWindowFrame = "{{15, 32}, {750, 795}}";
};
};
@@ -1757,26 +1847,6 @@
modificationTime = 164235196.43352;
state = 2;
};
- 00D5634A09C47AA400FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
- name = "WaveDriver.h: 19";
- rLen = 0;
- rLoc = 703;
- rType = 0;
- vrLen = 1388;
- vrLoc = 0;
- };
- 00D5638509C4834000FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 0035340F06A5DD8500AB4577 /* WaveDriver.h */;
- name = deviceName;
- rLen = 10;
- rLoc = 1818;
- rType = 0;
- vrLen = 1082;
- vrLoc = 1434;
- };
00D5639109C4834000FB787B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 003533AD06A5DD8500AB4577 /* ScanControllerPrivate.m */;
@@ -1787,26 +1857,6 @@
vrLen = 1865;
vrLoc = 1412;
};
- 00D563DD09C4948100FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
- name = deviceName;
- rLen = 10;
- rLoc = 2666;
- rType = 0;
- vrLen = 1503;
- vrLoc = 3361;
- };
- 00D563DF09C4948100FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 0035341606A5DD8500AB4577 /* WaveDriverAtheros.m */;
- name = deviceName;
- rLen = 10;
- rLoc = 2666;
- rType = 0;
- vrLen = 1503;
- vrLoc = 3361;
- };
00D5662D09C7343700FB787B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 87CEBA8009AEF03700AEB0B8 /* GrowlController.h */;
@@ -1827,16 +1877,6 @@
vrLen = 1950;
vrLoc = 0;
};
- 00D5663B09C734DD00FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m
*/;
- name = "WaveDriverAirportExtreme.m: 114";
- rLen = 0;
- rLoc = 4748;
- rType = 0;
- vrLen = 2586;
- vrLoc = 3297;
- };
00D5663D09C734DD00FB787B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 87CEBA8109AEF03700AEB0B8 /* GrowlController.m */;
@@ -1872,7 +1912,7 @@
fRef = 00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m
*/;
name = "WaveDriverAirportExtreme.m: 114";
rLen = 0;
- rLoc = 4748;
+ rLoc = 4598;
rType = 0;
vrLen = 2586;
vrLoc = 3297;
@@ -1940,7 +1980,7 @@
fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m
*/;
name = "[_mappingView loadFromFile:filename]";
rLen = 36;
- rLoc = 5097;
+ rLoc = 5092;
rType = 0;
vrLen = 1561;
vrLoc = 3843;
@@ -1990,7 +2030,7 @@
fRef = 003533AF06A5DD8500AB4577 /* ScanControllerScriptable.m
*/;
name = "[_mappingView loadFromFile:filename]";
rLen = 36;
- rLoc = 5097;
+ rLoc = 5092;
rType = 0;
vrLen = 1526;
vrLoc = 3878;
@@ -2045,13 +2085,13 @@
};
00DF456208B1E969003F3C7E /* WaveDriverAirportExtreme.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1220, 5082}}";
- sepNavSelRange = "{4748, 0}";
- sepNavVisRect = "{{0, 1284}, {932, 662}}";
- sepNavWindowFrame = "{{15, 32}, {750, 795}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1688, 5306}}";
+ sepNavSelRange = "{5481, 0}";
+ sepNavVisRect = "{{0, 1284}, {938, 662}}";
+ sepNavWindowFrame = "{{15, 69}, {1335, 809}}";
};
};
- 00DF45D208B1FFC1003F3C7E /* WaveDriverAirportExtreme.m:134 */ = {
+ 00DF45D208B1FFC1003F3C7E /* WaveDriverAirportExtreme.m:148 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -2060,7 +2100,7 @@
fileReference = 00DF456208B1E969003F3C7E /*
WaveDriverAirportExtreme.m */;
functionName = "+initBackend";
hitCount = 1;
- lineNumber = 134;
+ lineNumber = 148;
modificationTime = 164235196.43342;
state = 2;
};
@@ -2076,7 +2116,7 @@
modificationTime = 164235196.433434;
state = 2;
};
- 00DF480508B23BB2003F3C7E /* WaveDriverAirportExtreme.m:131 */ = {
+ 00DF480508B23BB2003F3C7E /* WaveDriverAirportExtreme.m:145 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -2085,11 +2125,11 @@
fileReference = 00DF456208B1E969003F3C7E /*
WaveDriverAirportExtreme.m */;
functionName = "+initBackend";
hitCount = 1;
- lineNumber = 131;
+ lineNumber = 145;
modificationTime = 164235196.433448;
state = 2;
};
- 00DF481908B23DC8003F3C7E /* WaveDriverAirportExtreme.m:101 */ = {
+ 00DF481908B23DC8003F3C7E /* WaveDriverAirportExtreme.m:97 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -2098,7 +2138,7 @@
fileReference = 00DF456208B1E969003F3C7E /*
WaveDriverAirportExtreme.m */;
functionName = "+setMonitorMode:";
hitCount = 1;
- lineNumber = 101;
+ lineNumber = 97;
modificationTime = 164235196.433463;
state = 2;
};
@@ -2193,16 +2233,6 @@
vrLen = 2736;
vrLoc = 0;
};
- 00F7E73809D1D5DF00055E8E /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 003533C206A5DD8500AB4577 /* WavePacket.mm */;
- name = IEEE80211_TYPE_MASK;
- rLen = 19;
- rLoc = 4702;
- rType = 0;
- vrLen = 1759;
- vrLoc = 4132;
- };
00F7E73909D1D5DF00055E8E /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 003533BA06A5DD8500AB4577 /* WaveContainer.m */;
@@ -2223,16 +2253,6 @@
vrLen = 2736;
vrLoc = 0;
};
- 00F7E73C09D1D5FE00055E8E /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 003533C206A5DD8500AB4577 /* WavePacket.mm */;
- name = "WavePacket.mm: 56";
- rLen = 0;
- rLoc = 1686;
- rType = 0;
- vrLen = 1293;
- vrLoc = 2877;
- };
00FF593C06C630CC006C7F1E /* WaveDriverPrismGT.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {964, 587}}";
@@ -2271,10 +2291,10 @@
0083C8EE0880633E00D895CB /* MapView.m:232 */,
0083C8FF088063B500D895CB /* BIView.m:58 */,
0083C90E088064F700D895CB /* MapView.m:233 */,
- 00DF45D208B1FFC1003F3C7E /*
WaveDriverAirportExtreme.m:134 */,
+ 00DF45D208B1FFC1003F3C7E /*
WaveDriverAirportExtreme.m:148 */,
00DF45E108B202D6003F3C7E /* WaveDriverAtheros.m:208 */,
- 00DF480508B23BB2003F3C7E /*
WaveDriverAirportExtreme.m:131 */,
- 00DF481908B23DC8003F3C7E /*
WaveDriverAirportExtreme.m:101 */,
+ 00DF480508B23BB2003F3C7E /*
WaveDriverAirportExtreme.m:145 */,
+ 00DF481908B23DC8003F3C7E /*
WaveDriverAirportExtreme.m:97 */,
000C1A4108B8BAC800464DAB /* WaveScanner.mm:217 */,
0093D1EE09B08C370046F830 /*
ScanControllerScriptable.m:508 */,
00D5629009C2151100FB787B /* GrowlController.m:1 */,
@@ -2441,7 +2461,7 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 164746613;
+ PBXPerProjectTemplateStateSaveDate = 167606427;
PBXPrepackagedSmartGroups_v2 = (
{
PBXTransientLocationAtTop = bottom;
@@ -2872,22 +2892,26 @@
PBXModuleWindowStatusBarHidden = YES;
RubberWindowFrame = "267 358 745 464 0 0 1280
832 ";
};
- PBXWorkspaceStateSaveDate = 164746613;
+ PBXWorkspaceStateSaveDate = 167606427;
};
perUserProjectItems = {
00340D4909CA013100B78602 /* PBXTextBookmark */ =
00340D4909CA013100B78602 /* PBXTextBookmark */;
00340D4B09CA013100B78602 /* PBXTextBookmark */ =
00340D4B09CA013100B78602 /* PBXTextBookmark */;
00340D5E09CA049700B78602 /* PBXTextBookmark */ =
00340D5E09CA049700B78602 /* PBXTextBookmark */;
00340D6009CA049700B78602 /* PBXTextBookmark */ =
00340D6009CA049700B78602 /* PBXTextBookmark */;
+ 004C19CE09FD5DFF0008620D /* PBXTextBookmark */ =
004C19CE09FD5DFF0008620D /* PBXTextBookmark */;
+ 004C19D009FD5DFF0008620D /* PBXTextBookmark */ =
004C19D009FD5DFF0008620D /* PBXTextBookmark */;
+ 004C1C9109FD776A0008620D /* PBXTextBookmark */ =
004C1C9109FD776A0008620D /* PBXTextBookmark */;
+ 004C1C9309FD776A0008620D /* PBXTextBookmark */ =
004C1C9309FD776A0008620D /* PBXTextBookmark */;
+ 004C21FD09FD78DF0008620D /* PBXTextBookmark */ =
004C21FD09FD78DF0008620D /* PBXTextBookmark */;
+ 004C21FE09FD78DF0008620D /* PBXTextBookmark */ =
004C21FE09FD78DF0008620D /* PBXTextBookmark */;
+ 004C21FF09FD78DF0008620D /* PBXTextBookmark */ =
004C21FF09FD78DF0008620D /* PBXTextBookmark */;
+ 004C220009FD78DF0008620D /* PBXTextBookmark */ =
004C220009FD78DF0008620D /* PBXTextBookmark */;
+ 004C220909FD799B0008620D /* PBXTextBookmark */ =
004C220909FD799B0008620D /* PBXTextBookmark */;
0076353C09A26CAC002A5BEF /* PBXTextBookmark */ =
0076353C09A26CAC002A5BEF /* PBXTextBookmark */;
- 00D5634A09C47AA400FB787B /* PBXTextBookmark */ =
00D5634A09C47AA400FB787B /* PBXTextBookmark */;
- 00D5638509C4834000FB787B /* PBXTextBookmark */ =
00D5638509C4834000FB787B /* PBXTextBookmark */;
00D5639109C4834000FB787B /* PBXTextBookmark */ =
00D5639109C4834000FB787B /* PBXTextBookmark */;
- 00D563DD09C4948100FB787B /* PBXTextBookmark */ =
00D563DD09C4948100FB787B /* PBXTextBookmark */;
- 00D563DF09C4948100FB787B /* PBXTextBookmark */ =
00D563DF09C4948100FB787B /* PBXTextBookmark */;
00D5662D09C7343700FB787B /* PBXTextBookmark */ =
00D5662D09C7343700FB787B /* PBXTextBookmark */;
00D5663009C7343700FB787B /* PBXTextBookmark */ =
00D5663009C7343700FB787B /* PBXTextBookmark */;
- 00D5663B09C734DD00FB787B /* PBXTextBookmark */ =
00D5663B09C734DD00FB787B /* PBXTextBookmark */;
00D5663D09C734DD00FB787B /* PBXTextBookmark */ =
00D5663D09C734DD00FB787B /* PBXTextBookmark */;
00D5663E09C734DD00FB787B /* PBXTextBookmark */ =
00D5663E09C734DD00FB787B /* PBXTextBookmark */;
00D5663F09C734DD00FB787B /* PBXTextBookmark */ =
00D5663F09C734DD00FB787B /* PBXTextBookmark */;
@@ -2911,10 +2935,8 @@
00D569ED09C7689100FB787B /* PBXTextBookmark */ =
00D569ED09C7689100FB787B /* PBXTextBookmark */;
00F7E73609D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73609D1D5DF00055E8E /* PBXTextBookmark */;
00F7E73709D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73709D1D5DF00055E8E /* PBXTextBookmark */;
- 00F7E73809D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73809D1D5DF00055E8E /* PBXTextBookmark */;
00F7E73909D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73909D1D5DF00055E8E /* PBXTextBookmark */;
00F7E73A09D1D5DF00055E8E /* PBXTextBookmark */ =
00F7E73A09D1D5DF00055E8E /* PBXTextBookmark */;
- 00F7E73C09D1D5FE00055E8E /* PBXTextBookmark */ =
00F7E73C09D1D5FE00055E8E /* PBXTextBookmark */;
};
sourceControlManager = 009F5C6006A5C8FF004BB18E /* Source
Control */;
userBuildSettings = {
Modified: trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency
===================================================================
--- trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency
2006-04-22 08:54:37 UTC (rev 137)
+++ trunk/Resources/Nibs/English.lproj/MainMenu.nib/data.dependency
2006-04-24 21:28:09 UTC (rev 138)
@@ -4,8 +4,8 @@
<dict>
<key>IBPaletteDependency</key>
<array>
+ <string>RollOverButtonPalette</string>
<string>ASKPalette</string>
- <string>RollOverButtonPalette</string>
</array>
</dict>
</plist>
Modified: trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib 2006-04-22
08:54:37 UTC (rev 137)
+++ trunk/Resources/Nibs/English.lproj/MainMenu.nib/info.nib 2006-04-24
21:28:09 UTC (rev 138)
@@ -17,16 +17,16 @@
<key>1290</key>
<string>352 338 576 461 0 0 1280 832 </string>
<key>1446</key>
- <string>502 483 185 263 0 0 1024 746 </string>
+ <string>655 569 185 263 0 0 1280 832 </string>
<key>29</key>
- <string>59 615 530 44 0 0 1024 746 </string>
+ <string>90 690 530 44 0 0 1280 832 </string>
<key>501</key>
<string>521 414 237 309 0 0 1280 832 </string>
<key>719</key>
<string>383 329 258 339 0 0 1024 746 </string>
</dict>
<key>IBFramework Version</key>
- <string>439.0</string>
+ <string>443.0</string>
<key>IBLockedObjects</key>
<array>
<integer>1353</integer>
@@ -39,6 +39,6 @@
<integer>29</integer>
</array>
<key>IBSystem Version</key>
- <string>8H14</string>
+ <string>8I127</string>
</dict>
</plist>
Modified: trunk/Resources/Nibs/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Sources/Controller/ScanControllerScriptable.m
===================================================================
--- trunk/Sources/Controller/ScanControllerScriptable.m 2006-04-22 08:54:37 UTC
(rev 137)
+++ trunk/Sources/Controller/ScanControllerScriptable.m 2006-04-24 21:28:09 UTC
(rev 138)
@@ -89,11 +89,11 @@
[_scanButton setTitle:@" Stop Scan "];
[_scanButton setState: NSOnState];
result=[scanner startScanning];
- }
+ [GrowlController notifyGrowlStartScan];
+ }
[self updateChannelMenu];
- [GrowlController notifyGrowlStartScan];
- return YES;
+ return YES;
}
- (BOOL)stopScan {
Modified: trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m
===================================================================
--- trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m 2006-04-22
08:54:37 UTC (rev 137)
+++ trunk/Sources/WaveDrivers/WaveDriverAirportExtreme.m 2006-04-24
21:28:09 UTC (rev 138)
@@ -28,10 +28,6 @@
#import "WaveHelper.h"
#import <BIGeneric/BIGeneric.h>
-//#define devicePath @"wlt1"
-#define optionsFile
@"/System/Library/Extensions/AppleAirPort2.kext/Contents/Info.plist"
-//#define devFile @"/dev/bpf0"
-
static bool explicitlyLoadedAirportExtremeDriver = NO;
@implementation WaveDriverAirportExtreme
@@ -119,7 +115,25 @@
NSUserDefaults *defs;
- defs = [NSUserDefaults standardUserDefaults];
+ if([WaveHelper isServiceAvailable:"AirPort_Athr5424"]) {
+ NSLog(@"User has a Atheros card.");
+ NSRunCriticalAlertPanel(
+ NSLocalizedString(@"Could not enable Monitor Mode for Airport
Extreme.", "Error dialog title"),
+ NSLocalizedString(@"Passive mode for Airport Extreme does not
work with MacBookPros and recent Mac Minis, as they have different Airport
Extreme Hardware.", "Error dialog description"),
+ OK, nil, nil);
+ return 2;
+ }
+
+ if(![WaveHelper isServiceAvailable:"AirPortPCI_MM"]) {
+ NSLog(@"User has no Broadcom card.");
+ NSRunCriticalAlertPanel(
+ NSLocalizedString(@"Could not enable Monitor Mode for Airport
Extreme.", "Error dialog title"),
+ NSLocalizedString(@"Your Airport Extreme driver has not been
found.", "Error dialog description"),
+ OK, nil, nil);
+ return 2;
+ }
+
+ defs = [NSUserDefaults standardUserDefaults];
if ([WaveDriverAirportExtreme deviceAvailable]) return 0;
if (![[defs objectForKey:@"aeForever"] boolValue]){
NSLog(@"Loading AE Passive for this session only!");
@@ -162,7 +176,7 @@
NSLog(@"Could not enable monitor mode for Airport Extreme.");
NSRunCriticalAlertPanel(
NSLocalizedString(@"Could not enable Monitor Mode for Airport
Extreme.", "Error dialog title"),
- 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"),
+ NSLocalizedString(@"Could not load Monitor Mode for Airport
Extreme. Drivers were not found. If you just enabled Monitor Mode permanently,
you must reboot. Please note that passive mode does not work with MacBookPros
and recent Mac Minis.", "Error dialog description"),
OK, nil, nil);
return 2;
Modified: trunk/Subprojects/KisMACInstaller/InstallController.m
===================================================================
--- trunk/Subprojects/KisMACInstaller/InstallController.m 2006-04-22
08:54:37 UTC (rev 137)
+++ trunk/Subprojects/KisMACInstaller/InstallController.m 2006-04-24
21:28:09 UTC (rev 138)
@@ -374,9 +374,11 @@
[_selectedDriver addItemWithTitle:@"Apple Airport Card, active mode"];
[[_selectedDriver lastItem] setTag: 2];
}
- if ([self isServiceAvailable:"AirPortPCI"] || [self
isServiceAvailable:"AirPortPCI_MM"]) {
+ if ([self isServiceAvailable:"AirPortPCI"] || [self
isServiceAvailable:"AirPortPCI_MM"] || [self
isServiceAvailable:"AirPort_Athr5424"] ) {
[_selectedDriver addItemWithTitle:@"Apple Airport Extreme Card, active
mode"];
[[_selectedDriver lastItem] setTag: 2];
+ }
+ if ([self isServiceAvailable:"AirPortPCI"] || [self
isServiceAvailable:"AirPortPCI_MM"]) {
[_selectedDriver addItemWithTitle:@"Apple Airport Extreme Card,
passive mode"];
[[_selectedDriver lastItem] setTag: 8];
}
Modified: trunk/Subprojects/KisMACInstaller/KisMAC
Installer.xcodeproj/mick.mode1
===================================================================
--- trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.mode1
2006-04-22 08:54:37 UTC (rev 137)
+++ trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.mode1
2006-04-24 21:28:09 UTC (rev 138)
@@ -219,8 +219,6 @@
<key>Layout</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -271,9 +269,8 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
-
<integer>29</integer>
-
<integer>28</integer>
-
<integer>7</integer>
+
<integer>5</integer>
+
<integer>1</integer>
<integer>0</integer>
</array>
</array>
@@ -299,7 +296,7 @@
<real>250</real>
</array>
<key>RubberWindowFrame</key>
- <string>0 92 1280 740 0 0 1280
832 </string>
+ <string>160 138 1280 740 0 0
1440 878 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -310,12 +307,14 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>airportExtreme.png</string>
+
<string>InstallController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -323,19 +322,25 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
-
<string>airportExtreme.png</string>
+
<string>InstallController.m</string>
+
<key>_historyCapacity</key>
+
<integer>0</integer>
+
<key>bookmark</key>
+
<string>004C1F4E09FD781D0008620D</string>
<key>history</key>
<array>
<string>0017842B09C1E48500530D82</string>
<string>00B1200D09C1F95C00AD6B0D</string>
-
<string>00D5632209C478C300FB787B</string>
<string>00D5667809C73B6D00FB787B</string>
+
<string>004C1F4B09FD781D0008620D</string>
+
<string>004C1F4C09FD781D0008620D</string>
</array>
<key>prevStack</key>
<array>
<string>0054928308E6EF8800307083</string>
<string>0017842F09C1E48500530D82</string>
<string>00D5632409C478C300FB787B</string>
+
<string>004C1F4D09FD781D0008620D</string>
</array>
</dict>
<key>SplitCount</key>
@@ -349,7 +354,7 @@
<key>Frame</key>
<string>{{0,
0}, {986, 694}}</string>
<key>RubberWindowFrame</key>
- <string>0 92
1280 740 0 0 1280 832 </string>
+ <string>160 138
1280 740 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -369,7 +374,7 @@
<key>Frame</key>
<string>{{0,
699}, {986, 0}}</string>
<key>RubberWindowFrame</key>
- <string>0 92
1280 740 0 0 1280 832 </string>
+ <string>160 138
1280 740 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -393,9 +398,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>00D5674909C765E600FB787B</string>
+ <string>004C1F4F09FD781D0008620D</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>00D5674A09C765E600FB787B</string>
+ <string>004C1F5009FD781D0008620D</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -529,11 +534,10 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>1C0AD2B3069F1EA900FABCE6</string>
-
<string>/Users/mick/openDev/KisMACng/Subprojects/KisMACInstaller/KisMAC
Installer.xcodeproj</string>
+
<string>/Users/mick/openDev/trunk/Subprojects/KisMACInstaller/KisMAC
Installer.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>0 92 1280 740 0 0 1280 832 </string>
+ <string>160 138 1280 740 0 0 1440 878 </string>
<key>WindowTools</key>
<array>
<dict>
Modified: trunk/Subprojects/KisMACInstaller/KisMAC
Installer.xcodeproj/mick.pbxuser
===================================================================
--- trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.pbxuser
2006-04-22 08:54:37 UTC (rev 137)
+++ trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj/mick.pbxuser
2006-04-24 21:28:09 UTC (rev 138)
@@ -8,6 +8,40 @@
isa = PBXBookmark;
fRef = 00FC4F72064837B900F2220A /* orinoco.png */;
};
+ 004C1F4B09FD781D0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
+ name = _installPatch;
+ rLen = 13;
+ rLoc = 1895;
+ rType = 0;
+ vrLen = 1403;
+ vrLoc = 1699;
+ };
+ 004C1F4C09FD781D0008620D /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+ };
+ 004C1F4D09FD781D0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
+ name = _installPatch;
+ rLen = 13;
+ rLoc = 1895;
+ rType = 0;
+ vrLen = 1403;
+ vrLoc = 1699;
+ };
+ 004C1F4E09FD781D0008620D /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 00B9E6140647BA2E009FEF35 /* InstallController.m */;
+ name = "InstallController.m: isDeviceAvailable:";
+ rLen = 618;
+ rLoc = 13095;
+ rType = 0;
+ vrLen = 1652;
+ vrLoc = 12217;
+ };
0054928308E6EF8800307083 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 00B9E97D0647F3B8009FEF35 /* BLAuthentication.h */;
@@ -67,17 +101,17 @@
};
00B9E6130647BA2E009FEF35 /* InstallController.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {939, 1456}}";
+ sepNavIntBoundsRect = "{{0, 0}, {945, 1456}}";
sepNavSelRange = "{1895, 13}";
- sepNavVisRect = "{{0, 770}, {939, 662}}";
+ sepNavVisRect = "{{0, 770}, {945, 662}}";
sepNavWindowFrame = "{{15, 32}, {750, 795}}";
};
};
00B9E6140647BA2E009FEF35 /* InstallController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {2324, 12488}}";
- sepNavSelRange = "{14277, 0}";
- sepNavVisRect = "{{0, 4940}, {939, 662}}";
+ sepNavIntBoundsRect = "{{0, 0}, {2324, 12516}}";
+ sepNavSelRange = "{13095, 618}";
+ sepNavVisRect = "{{0, 4492}, {945, 662}}";
sepNavWindowFrame = "{{15, 62}, {945, 765}}";
};
};
@@ -95,16 +129,6 @@
sepNavVisRect = "{{0, 3635}, {1057, 668}}";
};
};
- 00D5632209C478C300FB787B /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
- name = _installPatch;
- rLen = 13;
- rLoc = 1895;
- rType = 0;
- vrLen = 1403;
- vrLoc = 1699;
- };
00D5632409C478C300FB787B /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 00B9E6130647BA2E009FEF35 /* InstallController.h */;
@@ -255,7 +279,7 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 164061357;
+ PBXPerProjectTemplateStateSaveDate = 167605953;
PBXPrepackagedSmartGroups_v2 = (
{
PBXTransientLocationAtTop = bottom;
@@ -734,14 +758,17 @@
PBXModuleWindowStatusBarHidden = YES;
RubberWindowFrame = "267 358 745 464 0 0 1280
832 ";
};
- PBXWorkspaceStateSaveDate = 164061357;
+ PBXWorkspaceStateSaveDate = 167605953;
};
perUserProjectItems = {
0017842B09C1E48500530D82 /* PBXBookmark */ =
0017842B09C1E48500530D82 /* PBXBookmark */;
0017842F09C1E48500530D82 /* PBXBookmark */ =
0017842F09C1E48500530D82 /* PBXBookmark */;
+ 004C1F4B09FD781D0008620D /* PBXTextBookmark */ =
004C1F4B09FD781D0008620D /* PBXTextBookmark */;
+ 004C1F4C09FD781D0008620D /* PBXBookmark */ =
004C1F4C09FD781D0008620D /* PBXBookmark */;
+ 004C1F4D09FD781D0008620D /* PBXTextBookmark */ =
004C1F4D09FD781D0008620D /* PBXTextBookmark */;
+ 004C1F4E09FD781D0008620D /* PBXTextBookmark */ =
004C1F4E09FD781D0008620D /* PBXTextBookmark */;
0054928308E6EF8800307083 /* PBXTextBookmark */ =
0054928308E6EF8800307083 /* PBXTextBookmark */;
00B1200D09C1F95C00AD6B0D /* PBXTextBookmark */ =
00B1200D09C1F95C00AD6B0D /* PBXTextBookmark */;
- 00D5632209C478C300FB787B /* PBXTextBookmark */ =
00D5632209C478C300FB787B /* PBXTextBookmark */;
00D5632409C478C300FB787B /* PBXTextBookmark */ =
00D5632409C478C300FB787B /* PBXTextBookmark */;
00D5667809C73B6D00FB787B /* PBXBookmark */ =
00D5667809C73B6D00FB787B /* PBXBookmark */;
};
Modified: trunk/compile.command
===================================================================
--- trunk/compile.command 2006-04-22 08:54:37 UTC (rev 137)
+++ trunk/compile.command 2006-04-24 21:28:09 UTC (rev 138)
@@ -72,6 +72,10 @@
echo -n "Decompressing Growl framework... "
cd Resources
+if [ -d Growl.framework ]; then
+ rm -rf Growl.framework
+fi
+
tar -xzf growl.tgz
if ! [ -d Growl.framework ]; then
echo "*FAILED*"
Other related posts:
- » [kismac] [binaervarianz] r138 - others/GTDriver others/SSIDLister trunk trunk/KisMAC.xcodeproj trunk/Resources/Nibs/English.lproj/MainMenu.nib trunk/Sources/Controller trunk/Sources/WaveDrivers trunk/Subprojects/KisMACInstaller trunk/Subprojects/KisMACInstaller/KisMAC Installer.xcodeproj