From 1da96792eecc4252c90c706576fbfc1f1afd3860 Mon Sep 17 00:00:00 2001
From: Otyr Ugla <otyr@mn-aeon.local>
Date: Thu, 12 Feb 2009 09:28:42 -0600
Subject: [PATCH] Added an "Add" button to the bottom of the Whitelist table,
 wired up entirely with bindings. Changed format of whitelist pref to be site
 info array-of-dictionaries to support this (and reworked the migration code).
 Removed remnants of add/remove code that isn't needed now that bindings can
 do (most of) that work.

---
 Plugin/CTFWhitelistWindowController.h   |  14 +-
 Plugin/CTFWhitelistWindowController.m   |  62 +------
 Plugin/English.lproj/WhitelistPanel.xib | 208 +++++++++++++++---------
 Plugin/Plugin.m                         |  95 ++++++++---
 4 files changed, 213 insertions(+), 166 deletions(-)

diff --git a/Plugin/CTFWhitelistWindowController.h b/Plugin/CTFWhitelistWindowController.h
index 4ac1990d..e92224d1 100755
--- a/Plugin/CTFWhitelistWindowController.h
+++ b/Plugin/CTFWhitelistWindowController.h
@@ -3,13 +3,13 @@
 
 @interface CTFWhitelistWindowController : NSWindowController {
 	IBOutlet NSArrayController				*_controller;
-	NSMutableArray							*_sites;
+//	NSMutableArray							*_sites;
 }
-
-- (IBAction) addWhitelistSite: (id) sender;
-- (IBAction) removeWhitelistSite: (id) sender;
-
-- (void) saveWhitelist: (id) sender;
-- (void) whitelistChanged: (NSNotification *) note;
+//
+//- (IBAction) addWhitelistSite: (id) sender;
+//- (IBAction) removeWhitelistSite: (id) sender;
+//
+//- (void) saveWhitelist: (id) sender;
+//- (void) whitelistChanged: (NSNotification *) note;
 @end
 
diff --git a/Plugin/CTFWhitelistWindowController.m b/Plugin/CTFWhitelistWindowController.m
index d5f8a0c1..00cb1e1e 100755
--- a/Plugin/CTFWhitelistWindowController.m
+++ b/Plugin/CTFWhitelistWindowController.m
@@ -1,75 +1,19 @@
 #import "CTFWhitelistWindowController.h"
 
-extern NSString *sHostWhitelistDefaultsKey;
-extern NSString *sCTFWhitelistAdditionMade;
-
 @implementation CTFWhitelistWindowController
 
 - (id)init
 {
-    NSBundle * myBundle = [NSBundle bundleForClass:[self class]];
-    NSString * nibPath = [myBundle pathForResource:@"WhitelistPanel" ofType:@"nib"];
-    if (nibPath == nil)
-    {
+    NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+    NSString *nibPath = [myBundle pathForResource:@"WhitelistPanel" ofType:@"nib"];
+    if (nibPath == nil) {
         [self dealloc];
         return nil;
     }
     
     self = [super initWithWindowNibPath: nibPath owner: self];
-	
-	[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(whitelistChanged:) name: sCTFWhitelistAdditionMade object: nil];
-	_sites = [[NSMutableArray array] retain];
-	
-	[self whitelistChanged: nil];
 
     return self;
 }
 
-- (void) dealloc {
-	[_sites release];
-	[super dealloc];
-}
-
-- (void) whitelistChanged: (NSNotification *) note {
-	NSArray							*currentSites = [[NSUserDefaults standardUserDefaults] valueForKey: sHostWhitelistDefaultsKey];
-	NSEnumerator					*enumerator = [currentSites objectEnumerator];
-	NSString						*site;
-	
-	[_sites removeAllObjects];
-	
-	while (site = [enumerator nextObject]) {
-		[_sites addObject: [NSMutableDictionary dictionaryWithObject: site forKey: @"description"]];
-	}
-	[_controller setContent: _sites];
-}
-
-- (IBAction) removeWhitelistSite: (id) sender {
-	[_controller remove: nil];
-	[self saveWhitelist: nil];
-}
-
-- (IBAction) addWhitelistSite: (id) sender {
-	[_controller insertObject: [NSMutableDictionary dictionaryWithObject: @"" forKey: @"description"] atArrangedObjectIndex: _sites.count];
-	[_controller setSelectionIndex: _sites.count - 1];
-	[self saveWhitelist: nil];
-}
-
-- (void) saveWhitelist: (id) sender {
-	NSMutableArray					*sites = [NSMutableArray array];
-	NSEnumerator					*enumerator = [_sites  objectEnumerator];
-	NSDictionary					*site;
-	
-	while (site = [enumerator nextObject]) {
-		[sites addObject: [site valueForKey: @"description"]];
-	}
-	
-	NSUserDefaults					*defaults = [NSUserDefaults standardUserDefaults];
-	
-	[defaults setValue: sites forKey: sHostWhitelistDefaultsKey];
-}
-
-- (void) windowWillClose: (NSNotification *) notification {
-	[self saveWhitelist: nil];
-}
-
 @end
diff --git a/Plugin/English.lproj/WhitelistPanel.xib b/Plugin/English.lproj/WhitelistPanel.xib
index 768aee34..7a1061fc 100755
--- a/Plugin/English.lproj/WhitelistPanel.xib
+++ b/Plugin/English.lproj/WhitelistPanel.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="42"/>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -36,15 +36,15 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">31</int>
+				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{80, 360}, {527, 343}}</string>
+				<string key="NSWindowRect">{{80, 361}, {527, 342}}</string>
 				<int key="NSWTFlags">-534248448</int>
 				<string type="base64-UTF8" key="NSWindowTitle">Q2xpY2sgdG8gRmxhc2gg4oCUIFNldHRpbmdzA</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<string key="NSWindowContentMinSize">{420, 200}</string>
+				<string key="NSWindowContentMinSize">{420, 250}</string>
 				<object class="NSView" key="NSWindowView" id="1006">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">274</int>
@@ -52,7 +52,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSScrollView" id="510641939">
 							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">274</int>
+							<int key="NSvFlags">8466</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSClipView" id="769633510">
@@ -63,26 +63,26 @@
 										<object class="NSTableView" id="863640153">
 											<reference key="NSNextResponder" ref="769633510"/>
 											<int key="NSvFlags">4352</int>
-											<string key="NSFrameSize">{470, 151}</string>
+											<string key="NSFrameSize">{485, 151}</string>
 											<reference key="NSSuperview" ref="769633510"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="936086174">
 												<reference key="NSNextResponder" ref="981752289"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{470, 17}</string>
+												<string key="NSFrameSize">{485, 17}</string>
 												<reference key="NSSuperview" ref="981752289"/>
 												<reference key="NSTableView" ref="863640153"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="929019191">
 												<reference key="NSNextResponder" ref="510641939"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{471, 0}, {16, 17}}</string>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="510641939"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="360546441">
-													<double key="NSWidth">4.670000e+02</double>
+													<double key="NSWidth">4.820000e+02</double>
 													<double key="NSMinWidth">4.000000e+01</double>
 													<double key="NSMaxWidth">2.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -110,7 +110,7 @@
 													</object>
 													<object class="NSTextFieldCell" key="NSDataCell" id="189227315">
 														<int key="NSCellFlags">337772096</int>
-														<int key="NSCellFlags2">2048</int>
+														<int key="NSCellFlags2">133120</int>
 														<string key="NSContents">Text Cell</string>
 														<object class="NSFont" key="NSSupport" id="651190810">
 															<string key="NSName">LucidaGrande</string>
@@ -153,7 +153,7 @@
 												</object>
 											</object>
 											<double key="NSRowHeight">1.700000e+01</double>
-											<int key="NSTvFlags">1388314624</int>
+											<int key="NSTvFlags">1119879168</int>
 											<int key="NSGridStyleMask">2</int>
 											<int key="NSColumnAutoresizingStyle">4</int>
 											<int key="NSDraggingSourceMaskForLocal">15</int>
@@ -161,7 +161,7 @@
 											<bool key="NSAllowsTypeSelect">YES</bool>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {470, 151}}</string>
+									<string key="NSFrame">{{1, 17}, {485, 151}}</string>
 									<reference key="NSSuperview" ref="510641939"/>
 									<reference key="NSNextKeyView" ref="863640153"/>
 									<reference key="NSDocView" ref="863640153"/>
@@ -170,8 +170,8 @@
 								</object>
 								<object class="NSScroller" id="839140272">
 									<reference key="NSNextResponder" ref="510641939"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{471, 17}, {15, 151}}</string>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{471, 17}, {15, 152}}</string>
 									<reference key="NSSuperview" ref="510641939"/>
 									<reference key="NSTarget" ref="510641939"/>
 									<string key="NSAction">_doScroller:</string>
@@ -195,7 +195,7 @@
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="936086174"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {470, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {485, 17}}</string>
 									<reference key="NSSuperview" ref="510641939"/>
 									<reference key="NSNextKeyView" ref="936086174"/>
 									<reference key="NSDocView" ref="936086174"/>
@@ -207,7 +207,7 @@
 							<string key="NSFrame">{{20, 47}, {487, 169}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSNextKeyView" ref="769633510"/>
-							<int key="NSsFlags">18</int>
+							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="839140272"/>
 							<reference key="NSHScroller" ref="177744705"/>
 							<reference key="NSContentView" ref="769633510"/>
@@ -217,14 +217,14 @@
 						</object>
 						<object class="NSButton" id="43744226">
 							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{345, 15}, {162, 26}}</string>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{82, 19}, {63, 26}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="13544439">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">134348800</int>
-								<string key="NSContents">Remove from Whitelist</string>
+								<string key="NSContents">Remove</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="43744226"/>
 								<int key="NSButtonFlags">-2038284033</int>
@@ -235,15 +235,35 @@
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSTextField" id="513114676">
+						<object class="NSButton" id="241393621">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">292</int>
-							<string key="NSFrame">{{18, 20}, {283, 17}}</string>
+							<string key="NSFrame">{{20, 19}, {63, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="811527510">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134348800</int>
+								<string key="NSContents">Add</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="241393621"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">162</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="513114676">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{227, 22}, {283, 17}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="363160467">
 								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">4194304</int>
+								<int key="NSCellFlags2">71303168</int>
 								<string key="NSContents">Option-click Flash to add to whitelist</string>
 								<reference key="NSSupport" ref="651190810"/>
 								<reference key="NSControlView" ref="513114676"/>
@@ -596,16 +616,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									</object>
 								</object>
 							</object>
-							<string key="NSFrame">{{65, 232}, {397, 115}}</string>
+							<string key="NSFrame">{{65, 231}, {397, 115}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<string key="NSClassName">NSView</string>
 						</object>
 					</object>
-					<string key="NSFrameSize">{527, 343}</string>
+					<string key="NSFrameSize">{527, 342}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
-				<string key="NSMinSize">{420, 216}</string>
+				<string key="NSMinSize">{420, 272}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">ClickToFlash_settingsWindow</string>
 			</object>
@@ -615,10 +635,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 			<object class="NSArrayController" id="258102979">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>description</string>
+					<string>site</string>
+					<string>kind</string>
 				</object>
-				<string key="NSObjectClassName">NSString</string>
 				<bool key="NSEditable">YES</bool>
+				<bool key="NSAutomaticallyPreparesContent">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
 				<bool key="NSAvoidsEmptySelection">YES</bool>
 				<bool key="NSPreservesSelection">YES</bool>
@@ -630,22 +651,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.description</string>
-						<reference key="source" ref="360546441"/>
-						<reference key="destination" ref="258102979"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="360546441"/>
-							<reference key="NSDestination" ref="258102979"/>
-							<string key="NSLabel">value: arrangedObjects.description</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.description</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">window</string>
@@ -696,35 +701,76 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">contentArray: values.ClickToFlash_whitelist</string>
+						<string key="label">selectedTag: values.ClickToFlash_sifrMode</string>
+						<reference key="source" ref="211748724"/>
+						<reference key="destination" ref="913882380"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="211748724"/>
+							<reference key="NSDestination" ref="913882380"/>
+							<string key="NSLabel">selectedTag: values.ClickToFlash_sifrMode</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">values.ClickToFlash_sifrMode</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">112</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">add:</string>
+						<reference key="source" ref="258102979"/>
+						<reference key="destination" ref="241393621"/>
+					</object>
+					<int key="connectionID">115</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: values.ClickToFlash_siteInfo</string>
 						<reference key="source" ref="258102979"/>
 						<reference key="destination" ref="913882380"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="258102979"/>
 							<reference key="NSDestination" ref="913882380"/>
-							<string key="NSLabel">contentArray: values.ClickToFlash_whitelist</string>
+							<string key="NSLabel">contentArray: values.ClickToFlash_siteInfo</string>
 							<string key="NSBinding">contentArray</string>
-							<string key="NSKeyPath">values.ClickToFlash_whitelist</string>
+							<string key="NSKeyPath">values.ClickToFlash_siteInfo</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSHandlesContentAsCompoundValue</string>
+								<boolean value="YES" key="NS.object.0" id="5"/>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">49</int>
+					<int key="connectionID">127</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedTag: values.ClickToFlash_sifrMode</string>
-						<reference key="source" ref="211748724"/>
-						<reference key="destination" ref="913882380"/>
+						<string key="label">value: arrangedObjects.site</string>
+						<reference key="source" ref="360546441"/>
+						<reference key="destination" ref="258102979"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="211748724"/>
-							<reference key="NSDestination" ref="913882380"/>
-							<string key="NSLabel">selectedTag: values.ClickToFlash_sifrMode</string>
-							<string key="NSBinding">selectedTag</string>
-							<string key="NSKeyPath">values.ClickToFlash_sifrMode</string>
+							<reference key="NSSource" ref="360546441"/>
+							<reference key="NSDestination" ref="258102979"/>
+							<string key="NSLabel">value: arrangedObjects.site</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">arrangedObjects.site</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMutableArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSAllowsEditingMultipleValuesSelection</string>
+									<string>NSNullPlaceholder</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<boolean value="NO"/>
+									<string>double-click to set</string>
+								</object>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">112</int>
+					<int key="connectionID">130</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -771,9 +817,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="510641939"/>
-							<reference ref="513114676"/>
-							<reference ref="43744226"/>
 							<reference ref="235344690"/>
+							<reference ref="43744226"/>
+							<reference ref="241393621"/>
+							<reference ref="513114676"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -952,6 +999,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="393278813"/>
 						<reference key="parent" ref="1020124743"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">113</int>
+						<reference key="object" ref="241393621"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="811527510"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">114</int>
+						<reference key="object" ref="811527510"/>
+						<reference key="parent" ref="241393621"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -979,6 +1040,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>106.IBPluginDependency</string>
 					<string>107.IBPluginDependency</string>
 					<string>11.IBPluginDependency</string>
+					<string>113.IBPluginDependency</string>
+					<string>114.IBPluginDependency</string>
 					<string>12.IBPluginDependency</string>
 					<string>13.IBPluginDependency</string>
 					<string>14.IBPluginDependency</string>
@@ -1001,14 +1064,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilderKit</string>
 					<string>com.apple.InterfaceBuilderKit</string>
-					<string>{{47, 390}, {527, 343}}</string>
+					<string>{{38, 380}, {527, 342}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{47, 390}, {527, 343}}</string>
+					<string>{{38, 380}, {527, 342}}</string>
 					<integer value="1"/>
 					<string>{196, 240}</string>
 					<string>{{202, 428}, {480, 270}}</string>
-					<boolean value="YES"/>
-					<string>{420, 200}</string>
+					<reference ref="5"/>
+					<string>{420, 250}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
@@ -1042,6 +1105,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
@@ -1078,7 +1143,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">112</int>
+			<int key="maxID">130</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1086,21 +1151,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<object class="IBPartialClassDescription">
 					<string key="className">CTFWhitelistWindowController</string>
 					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addWhitelistSite:</string>
-							<string>removeWhitelistSite:</string>
-							<string>saveWhitelist:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">_controller</string>
 						<string key="NS.object.0">NSArrayController</string>
diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
index e764ba18..f6dd7f6e 100644
--- a/Plugin/Plugin.m
+++ b/Plugin/Plugin.m
@@ -36,12 +36,12 @@ of this software and associated documentation files (the "Software"), to deal
 static NSString *sFlashNewMIMEType = @"application/futuresplash";
 
     // NSUserDefaults keys
-       NSString *sHostWhitelistDefaultsKey = @"ClickToFlash_whitelist";
+static NSString *sHostSiteInfoDefaultsKey = @"ClickToFlash_siteInfo";
 static NSString *sAllowSifrDefaultsKey = @"ClickToFlash_allowSifr";
 static NSString *sUseYouTubeH264DefaultsKey = @"ClickToFlash_useYouTubeH264";
 
     // NSNotification names
-	   NSString *sCTFWhitelistAdditionMade = @"CTFWhitelistAdditionMade";
+static NSString *sCTFWhitelistAdditionMade = @"CTFWhitelistAdditionMade";
 
 static NSString *sSifrModeDefaultsKey = @"ClickToFlash_sifrMode";
 static NSString *sSifr2Test		= @"sIFR != null && typeof sIFR == \"function\"";
@@ -51,13 +51,17 @@ of this software and associated documentation files (the "Software"), to deal
 static NSString *sSifr2AddOnJSFilename = @"sifr2-addons";
 static NSString *sSifr3AddOnJSFilename = @"sifr3-addons";
 
-typedef enum
-{
+typedef enum {
 	CTFSifrModeDoNothing	= 0, 
 	CTFSifrModeAllowSifr	= 1, 
 	CTFSifrModeDeSifr		= 2
 } CTFSifrMode;
 
+typedef enum {
+    CTFSiteKindWhitelist = 0
+} CTGSiteKind;
+
+
 @interface CTFClickToFlashPlugin (Internal)
 - (void) _convertTypesForFlashContainer;
 - (void) _convertTypesForContainer;
@@ -65,7 +69,7 @@ - (void) _replaceSelfWithElement: (DOMElement*) newElement;
 - (void) _drawBackground;
 - (BOOL) _isOptionPressed;
 - (BOOL) _isHostWhitelisted;
-- (NSMutableArray *)_hostWhitelist;
+- (NSMutableArray *) _mutableSiteInfo;
 - (void) _alertDone;
 - (void) _abortAlert;
 - (void) _addHostToWhitelist;
@@ -83,6 +87,47 @@ - (void) _disableSIFR;
 @end
 
 
+#pragma mark -
+#pragma mark Whitelist Utility Functions
+
+
+    // Simple ForEach macro to make life easier on those porting to Tiger
+    // than using Leopard's fast enumeration and "in" keyword:
+#define CTFForEachObject( Type, varName, container ) \
+    NSEnumerator* feoEnum_##__LINE__ = [ container objectEnumerator ]; \
+    Type* varName; \
+    while( varName = [ feoEnum_##__LINE__ nextObject ] )
+
+static NSUInteger indexOfItemForSite( NSArray* arr, NSString* site )
+{
+    int i = 0;
+    CTFForEachObject( NSDictionary, item, arr ) {
+        if( [ [ item objectForKey: @"site" ] isEqualToString: site ] )
+            return i;
+        ++i;
+    }
+    
+    return NSNotFound;
+}
+
+static NSDictionary* itemForSite( NSArray* arr, NSString* site )
+{
+    NSUInteger index = indexOfItemForSite( arr, site );
+    
+    if( index != NSNotFound )
+        return [ arr objectAtIndex: index ];
+    
+	return nil;
+}
+
+static NSDictionary* whitelistItemForSite( NSString* site )
+{
+    return [ NSDictionary dictionaryWithObjectsAndKeys: site, @"site",
+                [ NSNumber numberWithInt: CTFSiteKindWhitelist ], @"kind",
+                nil ];
+}
+
+
 @implementation CTFClickToFlashPlugin
 
 
@@ -98,6 +143,7 @@ + (NSView *)plugInViewWithArguments:(NSDictionary *)arguments
 #pragma mark -
 #pragma mark Initialization and Superclass Overrides
 
+
 - (void) _migrateWhitelist
 {
     // Migrate from the old location to the new location.  We'll leave
@@ -108,12 +154,17 @@ - (void) _migrateWhitelist
     
     id oldWhitelist = [ defaults objectForKey: @"ClickToFlash.whitelist" ];
     if( oldWhitelist ) {
-        id newWhitelist = [ defaults objectForKey: sHostWhitelistDefaultsKey ];
+        id newWhitelist = [ defaults objectForKey: sHostSiteInfoDefaultsKey ];
         
         if( newWhitelist == nil ) {
-            [ defaults setObject: oldWhitelist forKey: sHostWhitelistDefaultsKey ];
-            [ defaults removeObjectForKey: @"ClickToFlash.whitelist"];
+            NSMutableArray* newWhitelist = [ NSMutableArray arrayWithCapacity: [ oldWhitelist count ] ];
+            CTFForEachObject( NSString, site, oldWhitelist ) {
+                [ newWhitelist addObject: whitelistItemForSite( site ) ];
+            }
+            [ defaults setObject: newWhitelist forKey: sHostSiteInfoDefaultsKey ];
         }
+
+        [ defaults removeObjectForKey: @"ClickToFlash.whitelist"];
     }
 }
 
@@ -363,13 +414,13 @@ - (void)addToWhitelistAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode co
 
 - (BOOL) _isHostWhitelisted
 {
-    NSArray *hostWhitelist = [[NSUserDefaults standardUserDefaults] stringArrayForKey:sHostWhitelistDefaultsKey];
-    return hostWhitelist && [hostWhitelist containsObject:self.host];
+    NSArray *hostWhitelist = [[NSUserDefaults standardUserDefaults] arrayForKey:sHostSiteInfoDefaultsKey];
+    return hostWhitelist && itemForSite(hostWhitelist, self.host) != nil;
 }
 
-- (NSMutableArray *)_hostWhitelist
+- (NSMutableArray *) _mutableSiteInfo
 {
-    NSMutableArray *hostWhitelist = [[[[NSUserDefaults standardUserDefaults] stringArrayForKey:sHostWhitelistDefaultsKey] mutableCopy] autorelease];
+    NSMutableArray *hostWhitelist = [[[[NSUserDefaults standardUserDefaults] arrayForKey:sHostSiteInfoDefaultsKey] mutableCopy] autorelease];
     if (hostWhitelist == nil) {
         hostWhitelist = [NSMutableArray array];
     }
@@ -378,17 +429,21 @@ - (NSMutableArray *)_hostWhitelist
 
 - (void) _addHostToWhitelist
 {
-    NSMutableArray *hostWhitelist = [self _hostWhitelist];
-    [hostWhitelist addObject:self.host];
-    [[NSUserDefaults standardUserDefaults] setObject:hostWhitelist forKey:sHostWhitelistDefaultsKey];
+    NSMutableArray *siteInfo = [self _mutableSiteInfo];
+    [siteInfo addObject: whitelistItemForSite(self.host)];
+    [[NSUserDefaults standardUserDefaults] setObject: siteInfo forKey: sHostSiteInfoDefaultsKey];
     [[NSNotificationCenter defaultCenter] postNotificationName: sCTFWhitelistAdditionMade object: self];
 }
 
 - (void) _removeHostFromWhitelist
 {
-    NSMutableArray *hostWhitelist = [self _hostWhitelist];
-    [hostWhitelist removeObject:self.host];
-    [[NSUserDefaults standardUserDefaults] setObject:hostWhitelist forKey:sHostWhitelistDefaultsKey];
+    NSMutableArray *siteInfo = [self _mutableSiteInfo];
+    NSUInteger foundIndex = indexOfItemForSite(siteInfo, self.host);
+    
+    if(foundIndex != NSNotFound) {
+        [siteInfo removeObjectAtIndex: foundIndex];
+        [[NSUserDefaults standardUserDefaults] setObject: siteInfo forKey: sHostSiteInfoDefaultsKey];
+    }
 }
 
 - (void) _whitelistAdditionMade: (NSNotification*) notification
@@ -649,9 +704,7 @@ - (NSDictionary*) _flashVarDictionary: (NSString*) flashvarString
     
     NSArray* args = [ flashvarString componentsSeparatedByString: @"&" ];
     
-    NSEnumerator* objEnum = [ args objectEnumerator ];
-    NSString* oneArg;
-    while( oneArg = [ objEnum nextObject ] ) {
+    CTFForEachObject( NSString, oneArg, args ) {
         NSRange sepRange = [ oneArg rangeOfString: @"=" ];
         if( sepRange.location != NSNotFound ) {
             NSString* key = [ oneArg substringToIndex: sepRange.location ];