Bug 322575 Address Book preferences not removed on deletion of Address Book -...

Bug 322575 Address Book preferences not removed on deletion of Address Book - fix regression from bug 226005. r/sr=bienvenu

mailnews/addrbook/src/nsDirPrefs.cpp

@@ -670,7 +670,8 @@ nsresult DIR_CopyServer (DIR_Server *in, DIR_Server **out)
        if (NS_FAILED(rv))
          return PR_FALSE;
 
-       pPref->ClearUserPref(server->prefName);
+       pPref->DeleteBranch(server->prefName);
+
        // mark the server as deleted by setting its position to 0
        DIR_SetIntPref(server->prefName, "position", 0, -1);
      }