From 53cf29d48d84ec8b4bfaca31e107a930fbc0d13e Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 20 May 2008 22:12:09 +0000
Subject: [PATCH] Monotone-Parent: e0ce68cefe0f0cfcd77e9154b801fa154c153a18
 Monotone-Revision: e44082eaf7ba9712f1ef3e53fa4b3d3bab1c52c7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-20T22:12:09
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/ContactsUI.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 4e3410519..2d804b7d2 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -626,17 +626,18 @@ function onAddressBookRemove(event) {
   if (nodes.length > 0) {
     nodes[0].deselect();
     var owner = nodes[0].getAttribute("owner");
-    if (owner != UserLogin) {
-      var folderId = nodes[0].getAttribute("id");
-      unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
-    }
-    else {
+    if (owner == UserLogin) {
+      var folderIdElements = nodes[0].getAttribute("id").split(":");
       var abId = folderIdElements[0].substr(1);
       deletePersonalAddressBook(abId);
       var personal = $("/personal");
       personal.selectElement();
       onFolderSelectionChange();
     }
+    else {
+      var folderId = nodes[0].getAttribute("id");
+      unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
+    }
   }
 
   preventDefault(event);
@@ -650,7 +651,7 @@ function deletePersonalAddressBook(folderId) {
       document.deletePersonalABAjaxRequest.aborted = true;
       document.deletePersonalABAjaxRequest.abort();
     }
-    var url = ApplicationBaseURL + "/" + folderId + "/deleteFolder";
+    var url = ApplicationBaseURL + folderId + "/deleteFolder";
     document.deletePersonalABAjaxRequest
       = triggerAjaxRequest(url, deletePersonalAddressBookCallback,
 			   folderId);