| -rw-r--r-- | kabc/distributionlist.cpp | 32 | ||||
| -rw-r--r-- | kabc/distributionlisteditor.cpp | 1 |
2 files changed, 20 insertions, 13 deletions
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp index 45b9dda..0735aba 100644 --- a/kabc/distributionlist.cpp +++ b/kabc/distributionlist.cpp @@ -50,8 +50,10 @@ QString DistributionList::name() const void DistributionList::insertEntry( const Addressee &a, const QString &email ) { - Entry e( a, email ); - + QString em = email; + if (em.isNull() ) + em = a.preferredEmail(); + Entry e( a, em ); QValueList<Entry>::Iterator it; for( it = mEntries.begin(); it != mEntries.end(); ++it ) { if ( (*it).addressee.uid() == a.uid() ) { @@ -59,10 +61,10 @@ void DistributionList::insertEntry( const Addressee &a, const QString &email ) We have to check if both email addresses contains no data, a simple 'email1 == email2' wont work here */ - if ( ( (*it).email.isNull() && email.isEmpty() ) || - ( (*it).email.isEmpty() && email.isNull() ) || - ( (*it).email == email ) ) { - *it = e; + if ( ( (*it).email.isNull() && em.isEmpty() ) || + ( (*it).email.isEmpty() && em.isNull() ) || + ( (*it).email == em ) ) { + //*it = e; return; } } @@ -178,9 +180,9 @@ bool DistributionListManager::load() */ cfg.setGroup( mAddressBook->identifier() ); //US we work in microkde with a list of distributionlists - QStringList distlists = cfg.readListEntry( "Lists" ); + QStringList distlists = cfg.readListEntry( "__Lists__List__" ); if ( distlists.isEmpty() ) { - kdDebug(5700) << "No distlists for '" << mAddressBook->identifier() << "'" << endl; + qDebug("no distlist for AB "); return false; } @@ -191,7 +193,7 @@ bool DistributionListManager::load() QStringList value = cfg.readListEntry( name ); - kdDebug(5700) << "DLM::load(): " << name << ": " << value.join(",") << endl; + DistributionList *list = new DistributionList( this, name ); @@ -200,7 +202,7 @@ bool DistributionListManager::load() QString id = *it2++; QString email = *it2; - kdDebug(5700) << "----- Entry " << id << endl; + Addressee a = mAddressBook->findByUid( id ); if ( !a.isEmpty() ) { @@ -217,7 +219,7 @@ bool DistributionListManager::load() bool DistributionListManager::save() { - kdDebug(5700) << "DistListManager::save()" << endl; + KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); @@ -232,7 +234,11 @@ bool DistributionListManager::save() DistributionList::Entry::List::ConstIterator it; for( it = entries.begin(); it != entries.end(); ++it ) { value.append( (*it).addressee.uid() ); - value.append( (*it).email ); + if (( *it).email.isEmpty()) + value.append( " " ); + else + value.append( (*it).email ); + // qDebug("uid *%s* email *%s* ", (*it).addressee.uid().latin1(),(*it).email.latin1() ); } cfg.writeEntry( list->name(), value ); } @@ -243,7 +249,7 @@ bool DistributionListManager::save() for( list = mLists.first(); list; list = mLists.next() ) { namelist.append( list->name() ); } - cfg.writeEntry( "Lists", namelist ); + cfg.writeEntry( "__Lists__List__", namelist ); diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp index 8b485d8..bad1efc 100644 --- a/kabc/distributionlisteditor.cpp +++ b/kabc/distributionlisteditor.cpp @@ -70,6 +70,7 @@ QString EmailSelectDialog::selected() QString EmailSelectDialog::getEmail( const QStringList &emails, const QString ¤t, QWidget *parent ) { + EmailSelectDialog *dlg = new EmailSelectDialog( emails, current, parent ); dlg->exec(); |