Camino only - Bug 411197: Share more code in the Privacy pane (and do some rearranging/cleanup at the same time). r/sr=mento

camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/classes.nib

@@ -22,7 +22,6 @@
                 clickAskAboutCookies = id; 
                 clickCookieBehavior = id; 
                 clickStorePasswords = id; 
-                cookieFilterChanged = id; 
                 editCookies = id; 
                 editCookiesDone = id; 
                 editKeychainExclusions = id; 
@@ -30,9 +29,8 @@
                 editPermissions = id; 
                 editPermissionsDone = id; 
                 expandCookiePermission = id; 
-                keychainExclusionsFilterChanged = id; 
+                filterChanged = id; 
                 launchKeychainAccess = id; 
-                permissionFilterChanged = id; 
                 removeAllCookiePermissions = id; 
                 removeAllCookies = id; 
                 removeAllKeychainExclusions = id; 

camino/PreferencePanes/Privacy/English.lproj/Privacy.nib/info.nib

@@ -17,10 +17,6 @@
 	<string>446.1</string>
 	<key>IBOldestOS</key>
 	<integer>3</integer>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>401</integer>
-	</array>
 	<key>IBSystem Version</key>
 	<string>8S2167</string>
 </dict>

camino/PreferencePanes/Privacy/PrivacyPane.h

@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
- 
+
 #import <Cocoa/Cocoa.h>
 #import <PreferencePanes/NSPreferencePane.h>
 
@@ -64,7 +64,7 @@ typedef enum ECookiePolicyPopupIndex
   // pane
   IBOutlet NSMatrix*          mCookieBehavior;
   IBOutlet NSButton*          mAskAboutCookies;
-  
+
   IBOutlet NSButton*          mStorePasswords;
 
   BOOL                        mSortedAscending;   // sort direction for tables in sheets
@@ -74,8 +74,8 @@ typedef enum ECookiePolicyPopupIndex
   IBOutlet ExtendedTableView* mPermissionsTable;
   IBOutlet NSTableColumn*     mPermissionColumn;
   IBOutlet NSSearchField*     mPermissionFilterField;
-  NSMutableArray*             mCachedPermissions;  // strong
-      
+  NSMutableArray*             mPermissions;        // strong
+
   // cookie sheet
   IBOutlet id                 mCookiesPanel;
   IBOutlet ExtendedTableView* mCookiesTable;
@@ -90,40 +90,34 @@ typedef enum ECookiePolicyPopupIndex
 }
 
 // main panel button actions
--(IBAction) clickCookieBehavior:(id)aSender;
--(IBAction) clickAskAboutCookies:(id)sender;
--(IBAction) clickStorePasswords:(id)sender;
--(IBAction) launchKeychainAccess:(id)sender;
--(IBAction) editKeychainExclusions:(id)sender;
+- (IBAction)clickCookieBehavior:(id)aSender;
+- (IBAction)clickAskAboutCookies:(id)sender;
+- (IBAction)clickStorePasswords:(id)sender;
+- (IBAction)launchKeychainAccess:(id)sender;
+- (IBAction)editKeychainExclusions:(id)sender;
 
 // cookie editing functions
--(void) populateCookieCache;
--(IBAction) editCookies:(id)aSender;
--(IBAction) editCookiesDone:(id)aSender;
--(IBAction) removeCookies:(id)aSender;
--(IBAction) removeAllCookies:(id)aSender;
--(IBAction) allowCookiesFromSites:(id)aSender;
--(IBAction) blockCookiesFromSites:(id)aSender;
--(IBAction) removeCookiesAndBlockSites:(id)aSender;
+- (IBAction)editCookies:(id)aSender;
+- (IBAction)editCookiesDone:(id)aSender;
+- (IBAction)removeCookies:(id)aSender;
+- (IBAction)removeAllCookies:(id)aSender;
+- (IBAction)allowCookiesFromSites:(id)aSender;
+- (IBAction)blockCookiesFromSites:(id)aSender;
+- (IBAction)removeCookiesAndBlockSites:(id)aSender;
 
 // permission editing functions
-- (void)populatePermissionCache;
 - (IBAction)editPermissions:(id)aSender;
 - (IBAction)editPermissionsDone:(id)aSender;
 - (IBAction)expandCookiePermission:(id)aSender;
 - (IBAction)removeCookiePermissions:(id)aSender;
 - (IBAction)removeAllCookiePermissions:(id)aSender;
-- (int)rowForPermissionWithHost:(NSString *)aHost;
 
 // keychain exclusion list editing functions
-- (void)loadKeychainExclusions;
 - (IBAction)editKeychainExclusions:(id)sender;
 - (IBAction)editKeychainExclusionsDone:(id)sender;
 - (IBAction)removeKeychainExclusions:(id)sender;
 - (IBAction)removeAllKeychainExclusions:(id)sender;
 
--(void) mapCookiePrefToGUI:(int)pref;
-
 // data source informal protocol (NSTableDataSource)
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView;
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
@@ -132,13 +126,9 @@ typedef enum ECookiePolicyPopupIndex
 // NSTableView delegate methods
 - (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)aTableColumn;
 
-// filtering methods
-- (IBAction)cookieFilterChanged:(id)sender;
-- (IBAction)permissionFilterChanged:(id)sender;
-- (IBAction)keychainExclusionsFilterChanged:(id)sender;
-- (void) filterCookiesPermissionsWithString: (NSString*) inFilterString;
-- (void) filterCookiesWithString: (NSString*) inFilterString;
-- (void) filterKeychainExclusionsWithString: (NSString*)filterString;
+// Filtering delegate
+- (IBAction)filterChanged:(id)sender;
+
 @end
 
 // custom formatter for cookies list to handle session cookie expiration sanely