From 9897ce2f053d87285cf3d2486e08032a413b1e03 Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.plus.com"
 <bugzilla%standard8.plus.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 16 Jun 2008 11:02:53 +0000
Subject: [PATCH] Bug 433202 Crash when trying to search in a deleted address
 book. p=Boying Lu <brian.lu@sun.com>,r=me

git-svn-id: svn://10.0.0.236/trunk@252369 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mail/components/addrbook/content/abCommon.js        | 2 +-
 mozilla/mail/components/addrbook/content/abContactsPanel.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/mail/components/addrbook/content/abCommon.js b/mozilla/mail/components/addrbook/content/abCommon.js
index 7623f2551cc..a5cbebcc3dc 100644
--- a/mozilla/mail/components/addrbook/content/abCommon.js
+++ b/mozilla/mail/components/addrbook/content/abCommon.js
@@ -44,7 +44,7 @@ var abList = 0;
 var gAbResultsTree = null;
 var gAbView = null;
 var gAddressBookBundle;
-var gCurDirectory;
+var gCurDirectory = null;
 
 var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
 var gPrefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
diff --git a/mozilla/mail/components/addrbook/content/abContactsPanel.js b/mozilla/mail/components/addrbook/content/abContactsPanel.js
index f3bda12c3b1..51ff773ea32 100644
--- a/mozilla/mail/components/addrbook/content/abContactsPanel.js
+++ b/mozilla/mail/components/addrbook/content/abContactsPanel.js
@@ -85,7 +85,7 @@ var gAddressBookPanelAbListener = {
       // check if the item being removed is the directory
       // that we are showing in the addressbook sidebar
       // if so, select the person addressbook (it can't be removed)
-      if (directory == GetAbView().directory) {
+      if (directory.URI == gCurDirectory) {
           var abPopup = document.getElementById('addressbookList');
           abPopup.value = kPersonalAddressbookURI;
           LoadPreviouslySelectedAB();
@@ -156,7 +156,7 @@ function AbPanelLoad()
   // This listener only cares when a directory is removed or modified.
   Components.classes["@mozilla.org/abmanager;1"]
             .getService(Components.interfaces.nsIAbManager)
-            .addAddressBookListener(gAddressBookAbListener,
+            .addAddressBookListener(gAddressBookPanelAbListener,
                                     nsIAbListener.directoryRemoved |
                                     nsIAbListener.itemChanged);