From 79267d40ce098e8b6d1181ac5ee022aba2bbcb9d Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 10 Jan 2008 22:09:09 +0000
Subject: [PATCH] Monotone-Parent: 85be663651298be4dd015db0e4001aeb980665f9
 Monotone-Revision: 0f4484bf642d11bc96f9672226ec495c99e2301f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-01-10T22:09:09
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/UIxContactsUserFolders.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index 7ad090869..57fc1a342 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -133,8 +133,10 @@ function onConfirmFolderSelection(event) {
 	 folderName = spans1[0].innerHTML + ' (' + email + ')';
       }
       var data = { folderName: folderName, folder: folder, window: window };
-      if (!window.opener.subscribeToFolder(window.opener.userFolderCallback, data))
+      if (parent$(accessToSubscribedFolder(folder)))
 	window.alert(clabels["You have already subscribed to that folder!"]);
+      else
+	window.opener.subscribeToFolder(window.opener.userFolderCallback, data);
    }
 }