From 92cbd9f20d0e97f551e13e1477636896bc6ff587 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 21 Jul 2010 13:57:24 +0000
Subject: [PATCH] Monotone-Parent: 9db82412ca8b860c427e66329c7aad43fc24aea4
 Monotone-Revision: 3147ad3a58e41e30a98c3efa7f7da7421d6aed2a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-07-21T13:57:24
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           | 5 +++++
 UI/WebServerResources/ContactsUI.js | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba867bdc1..64fb4a900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js: (dropSelectedContacts):
+	reenabled copying contacts from system (LDAP) addressbooks.
+
 2010-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserFolder.m (_subFoldersFromFolder:): we
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index b8942ddc7..40cb83ea0 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1272,8 +1272,9 @@ function startDragging (itm, e) {
     
     handle.show();
     handle.update (count);
-    if (e.shiftKey || currentFolderIsRemote ())
+    if (e.shiftKey || currentFolderIsRemote ()) {
       handle.addClassName ("copy");
+    }
 }
 
 function whileDragging (itm, e) {
@@ -1311,7 +1312,8 @@ function dropSelectedContacts (action, toId) {
             }
         }
         var fromId = $(selectedFolders[0]).id;
-        if (!currentFolderIsRemote () && fromId.substring(1) != toId) {
+        if ((!currentFolderIsRemote () || action != "move")
+            && fromId.substring(1) != toId) {
             var url = ApplicationBaseURL + fromId + "/" + action 
               + "?folder=" + toId + "&uid="
               + contactIds.join("&uid=");