Windows import fixes

1 files changed, 3 insertions, 2 deletions

diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index 5fbeec3..5807dc0 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -27,25 +27,25 @@
 #include <qclipboard.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kabc/addressbook.h>
 
 #include "addresseeutil.h"
 #include "addresseeconfig.h"
 #include "kabcore.h"
 
 #include "undocmds.h"
-
+extern bool pasteWithNewUid;
 /////////////////////////////////
 // PwDelete Methods
 
 PwDeleteCommand::PwDeleteCommand(KABC::AddressBook *doc, 
                                  const QStringList &uidList)
   : Command(), mDocument(doc), mAddresseeList(), mUidList(uidList)
 {
   redo();
 }
 
 PwDeleteCommand::~PwDeleteCommand()
 {
@@ -103,25 +103,26 @@ void PwPasteCommand::undo()
   for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) 
     mCore->addressBook()->removeAddressee( *it );
 }
 
 void PwPasteCommand::redo()
 {
   QStringList uids;
   KABC::Addressee::List::Iterator it;
   for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) {
     /* we have to set a new uid for the contact, otherwise insertAddressee()
        ignore it.
      */ 
-    (*it).setUid( KApplication::randomString( 10 ) );
+    if ( pasteWithNewUid )
+      (*it).setUid( KApplication::randomString( 10 ) );
     uids.append( (*it).uid() );
     mCore->addressBook()->insertAddressee( *it );
   }
   if ( uids.count() < 4 ) {
       QStringList::Iterator uidIt;
       for ( uidIt = uids.begin(); uidIt != uids.end(); ++uidIt )
           mCore->editContact( *uidIt );
   }
 }
 
 /////////////////////////////////
 // PwNew Methods