From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kaddressbook/ldapsearchdialog.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'kaddressbook/ldapsearchdialog.cpp') diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index fc99562d..c42ff669 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -576,7 +576,14 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); addr.setResource( resource ); mCore->addressBook()->insertAddressee( addr ); - importedAddrs.append( addr.fullEmail() ); + TQString displayString; + if ( !addr.fullEmail().isEmpty() ) { + displayString = addr.fullEmail(); + } + else { + displayString = addr.formattedName(); + } + importedAddrs.append( displayString ); localAddrs.append( addr ); } else { localAddrs.append( existing.first() ); @@ -595,14 +602,15 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV void LDAPSearchDialog::slotUser2() { #ifdef KDEPIM_NEW_DISTRLISTS - KABC::Resource *resource = mCore->requestResource( this ); - if ( !resource ) return; - const TQValueList selectedItems = d->selectedItems( mResultListView ); if ( selectedItems.isEmpty() ) { KMessageBox::information( this, i18n( "Please select the contacts you want to add to the distribution list." ), i18n( "No Contacts Selected" ) ); return; } + + KABC::Resource *resource = mCore->requestResource( this ); + if ( !resource ) return; + KPIM::DistributionList dist = selectDistributionList(); if ( dist.isEmpty() ) return; @@ -628,6 +636,8 @@ void LDAPSearchDialog::slotUser1() KABC::Resource *resource = mCore->requestResource( this ); if ( !resource ) return; const TQValueList selectedItems = d->selectedItems( mResultListView ); + if( selectedItems.isEmpty() ) + return; importContactsUnlessTheyExist( selectedItems, resource ); } -- cgit v1.2.3