From 2cd00310dbcbd6c19f5eec7025915ae376d675de Mon Sep 17 00:00:00 2001
From: "steffen.wilberg%web.de"
 <steffen.wilberg%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 8 Dec 2004 16:24:40 +0000
Subject: [PATCH] Bug 272678: allowed sites/exceptions list for
 popup-blocking/software install/imges/cookies empty. also fix some leftovers
 of the tree widget refactoring (bug 221619). r=mconnor

git-svn-id: svn://10.0.0.236/trunk@166433 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../cookieviewer/content/CookieExceptions.js         | 12 ++++++------
 .../components/cookieviewer/content/treeUtils.js     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mozilla/browser/components/cookieviewer/content/CookieExceptions.js b/mozilla/browser/components/cookieviewer/content/CookieExceptions.js
index 3a4186250a5..16adf0ecc9a 100644
--- a/mozilla/browser/components/cookieviewer/content/CookieExceptions.js
+++ b/mozilla/browser/components/cookieviewer/content/CookieExceptions.js
@@ -28,9 +28,9 @@ var gPermissionManager = {
     },
     getCellText: function (aRow, aColumn)
     {
-      if (aColumn == "siteCol")
+      if (aColumn.id == "siteCol")
         return gPermissionManager._addedPermissions[aRow].rawHost;
-      else if (aColumn == "statusCol")
+      else if (aColumn.id == "statusCol")
         return gPermissionManager._addedPermissions[aRow].capability;
       return "";
     },
@@ -42,10 +42,10 @@ var gPermissionManager = {
     getImageSrc: function(aRow, aColumn) {},
     getProgressMode: function(aRow, aColumn) {},
     getCellValue: function(aRow, aColumn) {},
-    cycleHeader: function(aColId, aElt) {},
-    getRowProperties: function(aRow, aColumn, aProperty) {},
-    getColumnProperties: function(aColumn, aColumnElement, aProperty) {},
-    getCellProperties: function(aRow, aProperty) {}
+    cycleHeader: function(column) {},
+    getRowProperties: function(row,prop){},
+    getColumnProperties: function(column,prop){},
+    getCellProperties: function(row,column,prop){}
   },
   
   onOK: function ()
diff --git a/mozilla/browser/components/cookieviewer/content/treeUtils.js b/mozilla/browser/components/cookieviewer/content/treeUtils.js
index bdad4640343..9505458321e 100644
--- a/mozilla/browser/components/cookieviewer/content/treeUtils.js
+++ b/mozilla/browser/components/cookieviewer/content/treeUtils.js
@@ -43,7 +43,7 @@ function DeleteAllFromTree
 function DeleteSelectedItemFromTree
     (tree, view, table, deletedTable, removeButton, removeAllButton) {
   // Turn off tree selection notifications during the deletion
-  tree.treeBoxObject.view.selection.selectEventsSuppressed = true;
+  tree.view.selection.selectEventsSuppressed = true;
 
   // remove selected items from list (by setting them to null) and place in deleted list
   var selections = GetTreeSelections(tree);
@@ -81,7 +81,7 @@ function DeleteSelectedItemFromTree
     document.getElementById(removeAllButton).setAttribute("disabled","true");
 
   }
-  tree.treeBoxObject.view.selection.selectEventsSuppressed = false;
+  tree.view.selection.selectEventsSuppressed = false;
 }
 
 function GetTreeSelections(tree) {