Backport r833907 by tmcguire to the 4.1 branch:
Backport r833907 by tmcguire to the 4.1 branch:

Merged revisions 829052 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r829052 | tilladam | 2008-07-07 13:26:28 +0200 (Mon, 07 Jul 2008) | 14 lines
  
  Merged revisions 829034 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r829034 | tilladam | 2008-07-07 12:14:25 +0200 (Mon, 07 Jul 2008) | 7 lines
    
    Check if the added contact actually made it into the addressbook, after
    the insert (as libkabc provides no other error handling) and don't 
    remove the original if it didn't. This happens when the resource
    or subresource selection dialog is cancelled.
    
    kolab/issue2522
  ........
................

svn path=/branches/KDE/4.1/kdepim/; revision=833916

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi