some mail fixes and warnings removed

12 files changed, 46 insertions, 35 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index d651224..c339244 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2490,513 +2490,513 @@ KABC::Addressee KABCore::getLastSyncAddressee()
     Addressee lse; 
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
 
     //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
     lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
     if (lse.isEmpty()) {
         qDebug("Creating new last-syncAddressee ");
         lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
         QString sum = "";
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
             sum = "E: ";
         lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse.setRevision( mLastAddressbookSync );
         lse.setCategories( i18n("SyncEvent") );
         mAddressBook->insertAddressee( lse );
     }
     return lse;
 }
 int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full )
 {
  
     //void setZaurusId(int id);
     // int zaurusId() const;
     //  void setZaurusUid(int id);
    // int zaurusUid() const;
    // void setZaurusStat(int id);
    // int zaurusStat() const;
     // 0 equal
     // 1 take local
     // 2 take remote
     // 3 cancel 
     QDateTime lastSync = mLastAddressbookSync;
     QDateTime localMod = local->revision();
     QDateTime remoteMod = remote->revision();
 
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
 
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
         //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastAddressbookSync );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
             lastSync = localMod.addDays(1);
             if ( mode <= SYNC_PREF_ASK )
                 return 0;
         } else {
             if ( locCh ) {
                 //qDebug("loc changed %s %s",  localMod.toString().latin1(), mLastAddressbookSync.toString().latin1());
                 lastSync = localMod.addDays( -1 );
                 if ( !remCh )
                     remoteMod =( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
                 lastSync = localMod.addDays( 1 );
                 if ( remCh ) {
                     //qDebug("rem changed ");
                     remoteMod =( lastSync.addDays( 1 ) );
                 }
                 
             }
         }
         full = true;  
         if ( mode < SYNC_PREF_ASK )
             mode = SYNC_PREF_ASK;
     } else {
           if ( localMod == remoteMod )
                 return 0;
         
     }
     //qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec());  
     //qDebug("lastsync %s ", lastSync.toString().latin1()    );
     //full = true; //debug only
     if ( full ) {
         bool equ = ( (*local) == (*remote) );
         if ( equ ) {
             //qDebug("equal ");
             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
             }
             if ( mode < SYNC_PREF_FORCE_LOCAL )
                 return 0;
               
         }//else //debug only
         //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
     }
     int result;
     bool localIsNew;
     //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  local->lastModified().toString().latin1() , remote->lastModified().toString().latin1()  );
 
     if ( full && mode < SYNC_PREF_NEWEST )
         mode = SYNC_PREF_ASK;
 
     switch( mode ) {
     case SYNC_PREF_LOCAL:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 1;
         break;
     case SYNC_PREF_REMOTE:
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         return 2;
         break;
     case SYNC_PREF_NEWEST:
         if ( localMod > remoteMod )
             return 1;
         else
             return 2;
         break;
     case SYNC_PREF_ASK: 
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
         if ( lastSync > remoteMod )
             return 1;
         if ( lastSync > localMod )
             return 2;
         localIsNew = localMod >= remoteMod;
         //qDebug("conflict! ************************************** ");
         {
             KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this );
             result = acd.executeD(localIsNew);
             return result;
         }
         break;
     case SYNC_PREF_FORCE_LOCAL:
         return 1;
         break;
     case SYNC_PREF_FORCE_REMOTE:
         return 2;
         break;
        
     default:
         // SYNC_PREF_TAKE_BOTH not implemented
         break;
     }
     return 0;
 }
 
 
 bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode)
 {
     bool syncOK = true;
     int addedAddressee = 0;
     int addedAddresseeR = 0;
     int deletedAddresseeR = 0;
     int deletedAddresseeL = 0;
     int changedLocal = 0;
     int changedRemote = 0;
 
     QString mCurrentSyncName = syncManager->getCurrentSyncName();
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
 
     //QPtrList<Addressee> el = local->rawAddressees(); 
     Addressee addresseeR;
     QString uid;
     int take;
     Addressee addresseeL;
     Addressee addresseeRSync;
     Addressee addresseeLSync;
     // KABC::Addressee::List  addresseeRSyncSharp = remote->getExternLastSyncAddressees();
     //KABC::Addressee::List  addresseeLSyncSharp = local->getExternLastSyncAddressees();
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastAddressbookSync = QDateTime::currentDateTime();
     if ( syncManager->syncWithDesktop() ) {
         // remote->removeSyncInfo( QString());//remove all info
         if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
             mLastAddressbookSync = KSyncManager::mRequestedSyncEvent;
             qDebug("using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() );
         } else {
             qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime ");
         }
     }
     QDateTime modifiedCalendar = mLastAddressbookSync;
     addresseeLSync = getLastSyncAddressee();
     qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1());
     addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName );
     if ( !addresseeR.isEmpty() ) {
         addresseeRSync = addresseeR;
         remote->removeAddressee(addresseeR );
 
     } else {
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
             addresseeRSync = addresseeLSync         ;
         } else {
             //qDebug("FULLDATE 1");
             fullDateRange = true;
             Addressee newAdd;
             addresseeRSync = newAdd;
             addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee"));
             addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); 
             addresseeRSync.setRevision( mLastAddressbookSync );
             addresseeRSync.setCategories( i18n("SyncAddressee") );
         }
     }
     if ( addresseeLSync.revision() == mLastAddressbookSync ) {
         // qDebug("FULLDATE 2");
         fullDateRange = true;
     }
     if ( ! fullDateRange  ) {
         if ( addresseeLSync.revision() != addresseeRSync.revision() ) {
             
             // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
             //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
             fullDateRange = true;
             //qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() );
         } 
     }
     // fullDateRange = true; // debug only!
     if ( fullDateRange )
         mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastAddressbookSync = addresseeLSync.revision();
     // for resyncing if own file has changed
     // PENDING fixme later when implemented
 #if 0
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastAddressbookSync = loadedFileVersion;
         qDebug("setting mLastAddressbookSync ");
     }
 #endif
 
     //qDebug("*************************** ");
     // qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
     QStringList er = remote->uidList(); 
     Addressee inR ;//= er.first();
     Addressee  inL;
 
     syncManager->showProgressBar(0, i18n("Syncing - close to abort!"), er.count());
 
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( incCounter < er.count()) {
 	if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
 	  syncManager->showProgressBar(incCounter);
 
         uid = er[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         QString idS,OidS;
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->findByUid( uid );
             inR = remote->findByUid( uid );
             //inL.setResource( 0 );
             //inR.setResource( 0 );
             if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
                 if ( !inL.resource() || inL.resource()->includeInSync() ) {
-                    if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
+                    if ( (take = takeAddressee( &inL, &inR, mode, fullDateRange )) ) {
                         //qDebug("take %d %s ", take, inL.summary().latin1());
                         if ( take == 3 )
                             return false;
                         if ( take == 1  ) {// take local **********************
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                                 inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                                 local->insertAddressee(  inL, false );
                                 idS = inR.externalUID();
                                 OidS = inR.originalExternalUID();
                             }
                             else
                                 idS = inR.IDStr();
                             remote->removeAddressee( inR );
                             inR = inL;
                             inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inR.setOriginalExternalUID( OidS );
                                 inR.setExternalUID( idS );
                                 if ( syncManager->syncWithDesktop() ) {
                                     inR.setIDStr("changed" );
                                 }
                                     //inR.insertCustom( "KADDRESSBOOK", "X-KDESYNC","changed" );
                             } else {
                                 inR.setIDStr( idS );
                             }
                             inR.setResource( 0 );
                             remote->insertAddressee(  inR , false);
                             ++changedRemote;
                         } else { // take == 2  take remote **********************
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 if ( inR.revision().date().year() < 2004 )
                                     inR.setRevision( modifiedCalendar );
                             }
                             idS = inL.IDStr();
                             local->removeAddressee( inL );
                             inL = inR;
                             inL.setIDStr( idS );
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                                 inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                             }
                             inL.setResource( 0 );
                             local->insertAddressee(  inL , false );
                             ++changedLocal;
                         }
                     }
                 }
             } else { //  no conflict ********** add or delete remote 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = addresseeLSync.note(); 
                     if ( des.find( inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                         inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         remote->insertAddressee( inR, false );
                         ++deletedAddresseeR; 
                     } else {
                         inR.setRevision( modifiedCalendar );
                         remote->insertAddressee( inR, false );
                         inL = inR; 
                         inL.setIDStr( ":" );
                         inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
                         inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
                         inL.setResource( 0 );
                         local->insertAddressee( inL , false);
                         ++addedAddressee;
                     }
                 } else {
                     if ( inR.revision() > mLastAddressbookSync || mode == 5 ) {
                         inR.setRevision( modifiedCalendar );
                         remote->insertAddressee( inR, false );
                         inR.setResource( 0 );
                         local->insertAddressee( inR, false );
                         ++addedAddressee;
                     } else {
                         // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
                         remote->removeAddressee( inR );
                         ++deletedAddresseeR; 
                     }
                 }
             }
         }
         ++incCounter;
     }
     er.clear();
     QStringList el = local->uidList(); 
     modulo = (el.count()/10)+1;
 
     syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count());
     incCounter = 0;
     while ( incCounter < el.count()) {
         qApp->processEvents();
 	if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
 	  syncManager->showProgressBar(incCounter);
         uid = el[ incCounter ]; 
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
             if ( !inL.resource() || inL.resource()->includeInSync() ) {
                 inR = remote->findByUid( uid );
                 if ( inR.isEmpty() ) { //  no conflict ********** add or delete local
                     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                         if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                             // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                             local->removeAddressee( inL );
                             ++deletedAddresseeL; 
                         } else {
                             if ( ! syncManager->mWriteBackExistingOnly ) {
                                 inL.removeID(mCurrentSyncDevice );
                                 ++addedAddresseeR;
                                 inL.setRevision( modifiedCalendar );
                                 local->insertAddressee( inL, false );
                                 inR = inL;
                                 inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
                                 inR.setResource( 0 );
                                 remote->insertAddressee( inR, false );
                             }
                         }
                     } else {
                         if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
                             //qDebug("data %s ", inL.revision().toString().latin1());
                             // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                             local->removeAddressee( inL );
                             ++deletedAddresseeL; 
                         } else {
                             if ( ! syncManager->mWriteBackExistingOnly ) {
                                 ++addedAddresseeR; 
                                 inL.setRevision( modifiedCalendar );
                                 local->insertAddressee( inL, false );
                                 inR = inL;
                                 inR.setIDStr( ":" );
                                 inR.setResource( 0 );
                                 remote->insertAddressee( inR, false );
                             }
                         }
                     }
                 }
             }
         }
         ++incCounter;
     }
     el.clear();
     syncManager->hideProgressBar();
     mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
     // get rid of micro seconds
     QTime t =  mLastAddressbookSync.time();
     mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
     addresseeLSync.setRevision( mLastAddressbookSync );
     addresseeRSync.setRevision( mLastAddressbookSync );
     addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
     addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
     addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
     addresseeLSync.setGivenName(i18n("!DO NOT EDIT!")   );
     addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
     addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
     addresseeRSync.setNote( "" ) ;
     addresseeLSync.setNote( "" );
 
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
         remote->insertAddressee( addresseeRSync, false );
     local->insertAddressee( addresseeLSync, false );
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
     qDebug( mes );
     mes = i18n("Local addressbook changed!\n") +mes;
     if ( syncManager->mShowSyncSummary ) { 
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                                        i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
             qDebug("cancelled ");
             return false;
         }
     }
     return syncOK;
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
 { 
 
     //pending prepare addresseeview for output
     //pending detect, if remote file has REV field. if not switch to external sync
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal(filename,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode );
         bool external = false;
         bool isXML = false;
         if ( filename.right(4) == ".xml") {
             mGlobalSyncMode = SYNC_MODE_EXTERNAL;
             isXML = true;
             abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
         } else {
             external = !manager->mIsKapiFile;
             if ( external ) {
                 qDebug("Setting vcf mode to external ");
                 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
                 AddressBook::Iterator it;  
                 for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
                     (*it).setID( mCurrentSyncDevice, (*it).uid() );
                     (*it).computeCsum( mCurrentSyncDevice );
                 }
             }
         }
         //AddressBook::Iterator it;
         //QStringList vcards;
         //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
         //  qDebug("Name %s ", (*it).familyName().latin1());
         //}
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
                     qDebug("Saving remote AB ");
                     if ( ! abLocal.saveAB()) 
                         qDebug("Error writing back AB to file ");
                     if (  external ) {
                         // afterwrite processing
                         abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML);
                     }
                 }
         }
         setModified();
         
     }
     abLocal.removeResources();
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
 void  KABCore::removeSyncInfo( QString syncProfile) 
 {
     qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1());
     mAddressBook->removeSyncInfo( syncProfile );
     setModified();
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
     if (  resource == "phone" )
         return syncPhone();
     disableBR( true );
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index da552c3..03df444 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -1,462 +1,462 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 //BEGIN Includes
 #include "cardview.h"
 
 #include <limits.h>
 
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qdatetime.h>
 #include <qlabel.h>
 #include <qstyle.h>
 #include <qcursor.h>
 #include <qtooltip.h>
 
 #include "kabprefs.h"
 #include <kdebug.h>
 #include <kglobalsettings.h>
 //END includes
 
 #define MIN_ITEM_WIDTH 80
 
 //BEGIN Helpers
 //////////////////////////////////////
 // CardViewTip
 class CardViewTip : public QLabel {
   public:
     CardViewTip(QWidget *parent=0, const char *name=0) : QLabel( parent, name )
     {
       setPalette( QToolTip::palette() );
       setFrameStyle( Panel|Plain );
       setMidLineWidth(0);
       setIndent(1);
     }
 
     ~CardViewTip() {};
   protected:
     void leaveEvent( QEvent * )
     {
       hide();
     }
 };
 
 //////////////////////////////////////
 // CardViewItemList
 
 
 //
 // Warning: make sure you use findRef() instead of find() to find an
 //          item! Only the pointer value is unique in the list.
 //
 class CardViewItemList : public QPtrList<CardViewItem>
 {
   protected:
     virtual int compareItems(QPtrCollection::Item item1,
                              QPtrCollection::Item item2)
     {
       CardViewItem *cItem1 = (CardViewItem*)item1;
       CardViewItem *cItem2 = (CardViewItem*)item2;
 
       if ( cItem1 == cItem2 )
           return 0;
 
       if ((cItem1 == 0) || (cItem2 == 0))
           return cItem1 ? -1 : 1;
 
       if (cItem1->caption() < cItem2->caption())
         return -1;
 
       else if (cItem1->caption() > cItem2->caption())
         return 1;
 
       return 0;
     }
 
   private:
     /*int find( const CardViewItem * )
     {
       qDebug("DON'T USE CardViewItemList::find( item )! Use findRef( item )!");
     }*/
 };
 
 //////////////////////////////////////
 // CardViewSeparator
 class CardViewSeparator
 {
   friend class CardView;
 
   public:
     CardViewSeparator(CardView *view)
       : mView(view)
     {
       mRect = QRect(0, 0, view->separatorWidth(), 0);
     }
 
     ~CardViewSeparator() {}
 
     void paintSeparator(QPainter *p, QColorGroup &cg)
     {
       p->fillRect(0, 0, mRect.width(), mRect.height(),
                   cg.brush(QColorGroup::Button));
     }
 
     void repaintSeparator()
     {
       mView->repaintContents(mRect);
     }
 
   private:
     CardView *mView;
     QRect mRect;
 };
 
 //END Helpers
 
 //BEGIN Private Data
 
 class CardViewPrivate
 {
   public:
     CardViewPrivate()
      : mSelectionMode( CardView::Multi ),
        mDrawCardBorder( true ),
        mDrawFieldLabels( true ),
        mDrawSeparators( true),
        mSepWidth( 2 ),
        mShowEmptyFields( false ),
        mLayoutDirty( true ),
        mLastClickOnItem( false ),
        mItemMargin( 0 ),
        mItemSpacing( 10 ),
        mItemWidth( 200 ),
        mMaxFieldLines( INT_MAX ),
        mCurrentItem( 0L ),
        mLastClickPos( QPoint(0, 0) ),
+       mResizeAnchor(0),
        mRubberBandAnchor( 0 ),
-       mCompText( QString::null ),
-       mResizeAnchor(0)
+       mCompText( QString::null )
     {};
 
     CardViewItemList mItemList;
     QPtrList<CardViewSeparator> mSeparatorList;
     QFontMetrics *mFm;
     QFontMetrics *mBFm;         // bold font
     QFont mHeaderFont;           // custom header font
     CardView::SelectionMode mSelectionMode;
     bool mDrawCardBorder;
     bool mDrawFieldLabels;
     bool mDrawSeparators;
     int mSepWidth;
     bool mShowEmptyFields;
     bool mLayoutDirty;
     bool mLastClickOnItem;
     uint mItemMargin;           // internal margin in items
     uint mItemSpacing;          // spacing between items, column seperators and border
     int mItemWidth;             // width of all items
     uint mMaxFieldLines;        // Max lines to dispaly pr field
     CardViewItem *mCurrentItem;
     QPoint mLastClickPos;
     QTimer *mTimer;             // times out if mouse rests for more than 500 msecs
     CardViewTip *mTip;          // passed to the item under a resting cursor to display full text
     bool mOnSeparator;          // set/reset on mouse movement
     // for resizing by dragging the separators
     int mResizeAnchor;          // uint, ulong? the mouse down separator left
     int mRubberBandAnchor;      // for erasing rubber bands
     // data used for resizing.
     // as they are beeded by each mouse move while resizing, we store them here,
     // saving 8 calculations in each mouse move.
     int colspace;               // amount of space between items pr column
     uint first;                 // the first col to anchor at for painting rubber bands
     int firstX;                 // X position of first in pixel
     int pressed;                // the colummn that was pressed on at resizing start
     int span;                   // pressed - first
     // key completion
     QString mCompText;          // current completion string
     QDateTime mCompUpdated;     // ...was updated at this time
 };
 
 class CardViewItemPrivate
 {
   public:
     CardViewItemPrivate() :
-    x( 0 ),
-    y( 0 ),
-    mSelected( false ){};
+        mSelected( false ),
+        x( 0 ),
+        y( 0 ){};
         
 
     QString mCaption;
     QPtrList< CardViewItem::Field > mFieldList;
     bool mSelected;
     int x;                      // horizontal position, set by the view
     int y;                      // vertical position, set by the view
     int maxLabelWidth;          // the width of the widest label, according to the view font.
     int hcache;                 // height cache
 };
 //END Private Data
 
 //BEGIN CardViewItem
 
 CardViewItem::CardViewItem(CardView *parent, QString caption)
   : d(new CardViewItemPrivate()), mView(parent)
 {
   d->mCaption = caption;
 
   initialize();
 }
 
 CardViewItem::~CardViewItem()
 {
   // Remove ourself from the view
   if (mView != 0)
     mView->takeItem(this);
 
   delete d;
   d = 0;
 }
 
 void CardViewItem::initialize()
 {
   d->mSelected = false;
   d->mFieldList.setAutoDelete(true);
   d->maxLabelWidth = 0;
   d->hcache=0;
 
   //calcRect();
 
  // Add ourself to the view
   if (mView != 0)
     mView->insertItem(this);
 }
 
 void CardViewItem::paintCard(QPainter *p, QColorGroup &cg)
 {
 
   if (!mView)
     return;
 
   QPen pen;
   QBrush brush;
   QFontMetrics fm = *(mView->d->mFm);
   QFontMetrics bFm = *(mView->d->mBFm);
   bool drawLabels = mView->d->mDrawFieldLabels;
   bool drawBorder = mView->d->mDrawCardBorder;
   int mg = mView->itemMargin();
   int w = mView->itemWidth() - (mg*2);
   int h = height() - (mg*2);
   const int colonWidth( fm.width(":") );
   int labelXPos = 2 + mg;
   int labelWidth = QMIN( w/2 - 4 - mg, d->maxLabelWidth + colonWidth + 4 );
   int valueXPos = labelWidth + 4 + mg;
   int valueWidth = w - labelWidth - 4 - mg;
 
   p->setFont( mView->font() );
   labelWidth -= colonWidth; // extra space for the colon
 
   if (!drawLabels)
   {
     valueXPos = labelXPos;
     valueWidth = w - 4;
   }
 
   // Draw a simple box
   if (isSelected())
     pen = QPen(cg.highlight(), 1);
   else
     pen = QPen(cg.button(), 1);
   p->setPen(pen);
 
   // Draw the border - this is only draw if the user asks for it.
   if (drawBorder)
     p->drawRect( mg, mg, w, h );
 
   // set the proper pen color for the caption box
   if (isSelected())
     brush = cg.brush(QColorGroup::Highlight);
   else
     brush = cg.brush(QColorGroup::Button);
 
   p->fillRect(mg, mg, w, 4 + bFm.height(), brush);
 
   // Now paint the caption
   p->save();
   QFont bFont = mView->headerFont();
   //bFont.setBold(true);
   p->setFont(bFont);
   if (isSelected())
     p->setPen(cg.highlightedText());
   else
     p->setPen(cg.buttonText());
   p->drawText(2+mg, 2+mg + bFm.ascent()/*bFm.height()*//*-bFm.descent()*//*-bFm.leading()*/, trimString(d->mCaption, w-4, bFm));
   p->restore();
 
   // Go through the fields and draw them
   QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
   QString label, value;
   int yPos = mg + 4 + bFm.height()/* + 1*/ + fm.height(); // why the + 1 ??? (anders)
   p->setPen(cg.text());
 
   int fh = fm.height();
   int cln( 0 );
   QString tmp;
   int maxLines = mView->maxFieldLines();
   for (iter.toFirst(); iter.current(); ++iter)
   {
     value = (*iter)->second;
     if ( value.isEmpty() && ! mView->d->mShowEmptyFields )
       continue;
 
     if (drawLabels)
     {
       label = trimString((*iter)->first, labelWidth, fm);
       p->drawText(labelXPos, yPos, label + ":");
     }
 /* US original     
     for (cln=0; cln <= maxLines; cln++)
     {
       tmp = value.section('\n',cln,cln);
       if ( !tmp.isEmpty() ) p->drawText( valueXPos, yPos + cln*fh, trimString( tmp, valueWidth, fm ) );
       else break;
     }
 */
 
 //US new implementation
     QStringList strlst = QStringList::split('\n', value, true);
 
     for (cln=0; cln <= maxLines && cln <= (int)strlst.count(); cln++)
     {
         tmp = strlst[cln];
         
         if ( !tmp.isEmpty() )
           p->drawText( valueXPos, yPos + cln*fh, trimString( tmp, valueWidth, fm ) );
         else
           break;
         
     }
     
     if ( cln == 0 ) cln = 1;
     yPos += cln * fh + 2;
   }    
   
   // if we are the current item and the view has focus, draw focus rect
   if ( mView->currentItem() == this && mView->hasFocus() )
   {
 /*US  
     mView->style().drawPrimitive( QStyle::PE_FocusRect, p,
         QRect(0, 0, mView->itemWidth(), h+(2*mg)), cg,
         QStyle::Style_FocusAtBorder,
         QStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
 */        
         
       const QColor pHighl = isSelected() ? cg.highlight() : cg.base();
       const QRect r(0, 0, mView->itemWidth(), h+(2*mg));
 #ifndef DESKTOP_VERSION
       mView->style().drawFocusRect(p, r, cg, &pHighl, true);
 #endif
    }
 }
 
 const QString &CardViewItem::caption() const
 {
   return d->mCaption;
 }
 
 
 int CardViewItem::height( bool allowCache ) const
 {
   // use cache
   if ( allowCache && d->hcache )
     return d->hcache;
 
   // Base height:
   //  2 for line width
   //  2 for top caption pad
   //  2 for bottom caption pad
   //   2 pad for the end
   // + 2 times the advised margin
   int baseHeight = 8 + ( 2 * mView->itemMargin() );
 
   //  size of font for each field
   //  2 pad for each field
 
   // anders: if the view does not show empty fields, check for value
   bool sef = mView->showEmptyFields();
   int fh = mView->d->mFm->height();//lineSpacing(); // font height
   //int sp = QMAX( 0, 2- mView->d->mFm->leading() ); // field spacing NOTE make a property
   int fieldHeight = 0;
   int lines;
   int maxLines( mView->maxFieldLines() );
   QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     if ( !sef && (*iter)->second.isEmpty() )
       continue;
     lines = QMIN( (*iter)->second.contains('\n') + 1, maxLines );
     fieldHeight += ( lines * fh ) + 2;//sp;
   }
 
   // height of caption font (bold)
   fieldHeight += mView->d->mBFm->height();
   d->hcache = baseHeight + fieldHeight;
   return d->hcache;
 }
 
 bool CardViewItem::isSelected() const
 {
   return d->mSelected;
 }
 
 void CardViewItem::setSelected(bool selected)
 {
   d->mSelected = selected;
 }
 
 void CardViewItem::insertField(const QString &label, const QString &value)
 {
   CardViewItem::Field *f = new CardViewItem::Field(label, value);
   d->mFieldList.append(f);
   d->hcache=0;
 
   if (mView)
   {
     mView->setLayoutDirty(true);
     d->maxLabelWidth = QMAX( mView->d->mFm->width( label ), d->maxLabelWidth );
   }
 }
 
 void CardViewItem::removeField(const QString &label)
 {
   CardViewItem::Field *f;
 
   QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     f = *iter;
     if (f->first == label)
       break;
   }
 
   if (*iter)
     d->mFieldList.remove(*iter);
   d->hcache = 0;
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 4abf859..13d6681 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -1,464 +1,465 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #include <kdialog.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
 #include <qapplication.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 
 #include <klineedit.h>
 
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
 //#include <kprefswidget.h>
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
   setCaption( i18n("Settings - some need a restart (nr)"));
   setupGlobalTab();
   setupMainTab();
   setupMailTab();;
   setupFontsTab();
   readConfig();
 
 #if 0
 
   setupMainTab();
   setupLocaleTab();
   setupTimeZoneTab();
   setupTimeTab();
   setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 #endif
 }
 
 #include "kpimglobalprefs.h"
 
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
    QFrame *topFrame = addPage(i18n("Global"),0,0);
    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
    topLayout->addWidget( kdelibcfg );
 
 
 } 
 void KOPrefsDialog::setupMainTab() 
 {
     QFrame *topFrame = addPage(i18n("General"),0,0);
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
 
   mNameEdit = new QLineEdit(topFrame);
   mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
   topLayout->addWidget(mNameLabel,0,0);
   topLayout->addWidget(mNameEdit,0,1);
 
   mEmailEdit = new QLineEdit(topFrame);
   mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
   topLayout->addWidget(mEmailLabel,1,0);
   topLayout->addWidget(mEmailEdit,1,1); 
   QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame);
   topLayout->addMultiCellWidget(lab,2,2,0,1);
   KPrefsDialogWidBool*  ttt =  addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"),
                                     &(KOPrefs::instance()->mUseKapi),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1);
 }
 
 void KOPrefsDialog::setupMailTab()
 {
  QFrame *topFrame = addPage(i18n("Mail"),0,0);
 
   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
   KPrefsDialogWidBool*  ttt =  addWidBool(i18n("View mail as html"),
                  &(KOPrefs::instance()->mViewAsHtml),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
   
   
   ttt =  addWidBool(i18n("Send mails later"),
                     &(KOPrefs::instance()->mSendLater),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
+  /*
   mCodecEdit = new QLineEdit(topFrame);
   topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1);
   topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1);
   topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1);
-
+  */
 }
 void KOPrefsDialog::setupFontsTab()
 {
 
     QFrame *topFrame = addPage(i18n("Fonts"),0,0);
     //  DesktopIcon("fonts",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
   KPrefsDialogWidFont * tVFont;
   int i = 0;
   KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("OK"),i18n("Application(nr)"),
                  &(KOPrefs::instance()->mAppFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
 
   timeLabelsFont =
       addWidFont(i18n("Dear Mr."),i18n("Compose mail:"),
                  &(KOPrefs::instance()->mComposeFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
   KPrefsDialogWidFont *timeBarFont =
       addWidFont(i18n("Hello"),i18n("Read mail:"),
                  &(KOPrefs::instance()->mReadFont),topFrame);
   topLayout->addWidget(timeBarFont->label(),i,0);
   topLayout->addWidget(timeBarFont->preview(),i,1);
   topLayout->addWidget(timeBarFont->button(),i,2);
   ++i;
 
   topLayout->setColStretch(1,1);
   topLayout->setRowStretch(4,1);
 
 }
 void KOPrefsDialog::usrReadConfig()
 {
  
   mNameEdit->setText(KOPrefs::instance()->mName);
   mEmailEdit->setText(KOPrefs::instance()->mEmail);
-  mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
+  //mCodecEdit->setText(KOPrefs::instance()->mSendCodec);
   kdelibcfg->readConfig();
 }
 void KOPrefsDialog::usrWriteConfig()
 {
     KOPrefs::instance()->mName = mNameEdit->text();
     KOPrefs::instance()->mEmail = mEmailEdit->text();
-    KOPrefs::instance()->mSendCodec = mCodecEdit->text();
+    //KOPrefs::instance()->mSendCodec = mCodecEdit->text();
     kdelibcfg->writeConfig();
  
     
 }
 
 #if 0
 void KOPrefsDialog::setupLocaleDateTab()
 {
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
 
    
    KPrefsWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
    else 
        format = "(%d.%m.%Y|%A %d %B %Y)";
    syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%m.%d.%Y)";
    else 
        format = "(%m.%d.%Y|%A %B %d %Y)";
    syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%Y-%m-%d)";
    else 
        format = "(%Y-%m-%d|%A %Y %B %d)";
    syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
    syncPrefsGroup->addRadio(i18n("User defined"));
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    ++iii;
    QLabel * lab;
    mUserDateFormatLong = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatLong,iii,1);
    ++iii;
    mUserDateFormatShort = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatShort,iii,1);
    ++iii;
    lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
    lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;  
    lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
  QFrame *topFrame = addPage(i18n("Locale"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
  KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
    syncPrefsGroup->addRadio(i18n("German")); 
    syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
    if (  QApplication::desktop()->width() <  300   ) 
        ;//   syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
    if (  QApplication::desktop()->width() >  300   )
        syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    syncPrefsGroup->addRadio(i18n("24:00"));
    syncPrefsGroup->addRadio(i18n("12:00am"));
    syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    KPrefsDialogWidBool *sb;
   if ( QApplication::desktop()->width() <  300 ) {
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
        ++iii;   
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
    }
    else {
        QWidget * hb = new QWidget( topFrame );
        QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),hb);
        hbLayout->addWidget(sb->checkBox()  );
        topLayout->addMultiCellWidget(hb, iii,iii,0,1);
 
    }
   //#ifndef DESKTOP_VERSION
 #if 0
   ++iii;
   sb =
            addWidBool(i18n("Quick load/save (w/o Unicode)"), 
                       &(KOPrefs::instance()->mUseQuicksave),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
 }
 void KOPrefsDialog::showSyncPage()
 {
     showPage ( 2 ) ;
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
 {
 #if 0
   QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
    mSetupSyncAlgTab = topFrame;
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;  
    
    KPrefsDialogWidBool *sb =
        addWidBool(i18n("Ask for preferences before syncing"),
                   &(KOPrefs::instance()->mAskForPreferences),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 
    KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
                    topFrame);
    syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Force take local entry always"));
    syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
   sb =
        addWidBool(i18n("Show summary after syncing"),
                   &(KOPrefs::instance()->mShowSyncSummary),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 #endif
 
 
 
 }
 
 
 void KOPrefsDialog::setupSyncTab()
 {
 #if 0
     QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());
    lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
    int iii = 0;
    topLayout->addMultiCellWidget(lab , iii,iii,0,1);
    ++iii;
 
    mRemoteIPEdit = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mRemoteIPEdit,iii,1);
    ++iii;
    mRemoteUser = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mRemoteUser, iii,1); 
    ++iii;
 
    mRemoteFile = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mRemoteFile,iii,1);
    ++iii;
  
    mLocalTempFile = new QLineEdit(topFrame);
    lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mLocalTempFile,iii,1);
    ++iii;
  
    KPrefsDialogWidBool *wb =
        addWidBool(i18n("Write back synced file"),
                   &(KOPrefs::instance()->mWriteBackFile),topFrame);
    topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
    ++iii;
    wb =
        addWidBool(i18n("Write back existing entries only"),
                   &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame);
    topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
    ++iii;
  
 #endif
 }
 
 void KOPrefsDialog::setupMainTab()
 {
     QFrame *topFrame = addPage(i18n("General"),0,0);
     // DesktopIcon("identity",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
  //  KPrefsDialogWidBool *emailControlCenter =
 //       addWidBool(i18n("&Use email settings from Control Center"),
 //                  &(KOPrefs::instance()->mEmailControlCenter),topFrame);
 //   topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
   // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
   //      SLOT(toggleEmailSettings(bool)));
 
   mNameEdit = new QLineEdit(topFrame);
   mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
   topLayout->addWidget(mNameLabel,0,0);
   topLayout->addWidget(mNameEdit,0,1);
 
   mEmailEdit = new QLineEdit(topFrame);
   mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
   topLayout->addWidget(mEmailLabel,1,0);
   topLayout->addWidget(mEmailEdit,1,1);
   KPrefsDialogWidBool *wb;
   QHBox *dummy;
   if ( QApplication::desktop()->width() >  480 ) {
       dummy = new QHBox(topFrame);
   } else {
       dummy = new QVBox(topFrame);
   }
 
   topLayout->addMultiCellWidget(dummy, 2,2,0,1); 
   addWidBool(i18n("Full menu bar(nr)"),
              &(KOPrefs::instance()->mShowFullMenu),dummy);
   
diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp
index 32311d7..2d213fe 100644
--- a/kmicromail/libmailwrapper/generatemail.cpp
+++ b/kmicromail/libmailwrapper/generatemail.cpp
@@ -1,461 +1,467 @@
 #include "generatemail.h"
 #include "mailwrapper.h"
 
 #include <libetpan/libetpan.h>
 
 //#include <qt.h>
 
 #include <stdlib.h>
 #include <qfileinfo.h>
 
 using namespace Opie::Core;
 const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
 
 Generatemail::Generatemail()
 {
+    mCharset = "iso-8859-1";
 }
 
 Generatemail::~Generatemail()
 {
 }
 
 void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) {
     clistiter *it, *it2;
 
     for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) {
         mailimf_address *addr;
         addr = (mailimf_address *) it->data;
 
         if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) {
             esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL );
         } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) {
             clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list;
             for ( it2 = clist_begin( l ); it2; it2 = it2->next ) {
                 mailimf_mailbox *mbox;
                 mbox = (mailimf_mailbox *) it2->data;
                 esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL );
             }
         }
     }
 }
 
 char *Generatemail::getFrom( mailimf_field *ffrom) {
     char *from = NULL;
     if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM)
             && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
         clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
         clistiter *it;
         for ( it = clist_begin( cl ); it; it = it->next ) {
             mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
             from = strdup( mb->mb_addr_spec );
         }
     }
 
     return from;
 }
 
 char *Generatemail::getFrom( mailmime *mail ) {
     /* no need to delete - its just a pointer to structure content */
     mailimf_field *ffrom = 0;
     ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
     return getFrom(ffrom);
 }
 
 mailimf_field *Generatemail::getField( mailimf_fields *fields, int type ) {
     mailimf_field *field;
     clistiter *it;
 
     it = clist_begin( fields->fld_list );
     while ( it ) {
         field = (mailimf_field *) it->data;
         if ( field->fld_type == type ) {
             return field;
         }
         it = it->next;
     }
 
     return NULL;
 }
 
 mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
     mailimf_address_list *addresses;
 
     if ( addr.isEmpty() )
         return NULL;
 
     addresses = mailimf_address_list_new_empty();
 
     bool literal_open = false;
     unsigned int startpos = 0;
     QStringList list;
     QString s;
     unsigned int i = 0;
     for (; i < addr.length();++i) {
         switch (addr[i]) {
         case '\"':
             literal_open = !literal_open;
             break;
         case ',':
             if (!literal_open) {
                 s = addr.mid(startpos,i-startpos);
                 if (!s.isEmpty()) {
                     list.append(s);
                 }
                 // !!!! this is a MUST BE!
                 startpos = ++i;
             }
             break;
         default:
             break;
         }
     }
     s = addr.mid(startpos,i-startpos);
     if (!s.isEmpty()) {
         list.append(s);
     }
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); it++ ) {
         int err = mailimf_address_list_add_parse( addresses, (char*)(*it).latin1() );
         if ( err != MAILIMF_NO_ERROR ) {
             qDebug(" Error parsing"); // *it
         } else {
         }
     }
     return addresses;
 }
 
 mailmime *Generatemail::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent ) {
     mailmime * filePart = 0;
     mailmime_fields * fields = 0;
     mailmime_content * content = 0;
     mailmime_parameter * param = 0;
     char*name = 0;
     char*file = 0;
     int err;
     int pos = filename.findRev( '/' );
 
     if (filename.length()>0) {
         QString tmp = filename.right( filename.length() - ( pos + 1 ) );
         name = strdup( tmp.latin1() );        // just filename
         file = strdup( filename.latin1() );   // full name with path
     }
 
     int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
     int mechanism = MAILMIME_MECHANISM_BASE64;
 
     if ( mimetype.startsWith( "text/" ) ) {
         param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );
+                                        strdup( mCharset.latin1() ) );
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
     }
 
     fields = mailmime_fields_new_filename(
                  disptype, name,
                  mechanism );
     content = mailmime_content_new_with_str( (char*)mimetype.latin1() );
     if (content!=0 && fields != 0) {
         if (param) {
             clist_append(content->ct_parameters,param);
             param = 0;
         }
         if (filename.length()>0) {
             QFileInfo f(filename);
             param = mailmime_parameter_new(strdup("name"),strdup(f.fileName().latin1()));
             clist_append(content->ct_parameters,param);
             param = 0;
         }
         filePart = mailmime_new_empty( content, fields );
     }
     if (filePart) {
         if (filename.length()>0) {
             err = mailmime_set_body_file( filePart, file );
         } else {
-            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8()),TextContent.utf8().length());
+            err = mailmime_set_body_text(filePart,strdup( TextContent.utf8().data()),TextContent.utf8().length()); 
+            //err = mailmime_set_body_text(filePart,strdup( TextContent.latin1()),TextContent.length());
         }
         if (err != MAILIMF_NO_ERROR) {
             qDebug("Error setting body with file "); 
             mailmime_free( filePart );
             filePart = 0;
         }
     }
 
     if (!filePart) {
         if ( param != NULL ) {
             mailmime_parameter_free( param );
         }
         if (content) {
             mailmime_content_free( content );
         }
         if (fields) {
             mailmime_fields_free( fields );
         } else {
             if (name) {
                 free( name );
             }
             if (file) {
                 free( file );
             }
         }
     }
     return filePart;        // Success :)
 
 }
 
 void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files ) {
     const Attachment *it;
     unsigned int count = files.count();
     for ( unsigned int i = 0; i < count; ++i ) {
         mailmime *filePart;
         int err;
         it = ((QList<Attachment>)files).at(i);
 
         filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" );
         if ( filePart == NULL ) {
             continue;
         }
         err = mailmime_smart_add_part( message, filePart );
         if ( err != MAILIMF_NO_ERROR ) {
             mailmime_free( filePart );
         }
     }
 }
 
 mailmime *Generatemail::buildTxtPart(const QString&str ) {
     mailmime *txtPart;
     mailmime_fields *fields;
     mailmime_content *content;
     mailmime_parameter *param;
     int err;
     QCString __str;
+    //qDebug(" Generatemail::buildTxtPart %s", str.latin1());
     param = mailmime_parameter_new( strdup( "charset" ),
-                                    strdup( "iso-8859-1" ) );
+                                    strdup( mCharset.latin1() ) );
     if ( param == NULL )
         goto err_free;
 
     content = mailmime_content_new_with_str( "text/plain" );
     if ( content == NULL )
         goto err_free_param;
 
     err = clist_append( content->ct_parameters, param );
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_content;
 
     fields = mailmime_fields_new_encoding(MAILMIME_MECHANISM_8BIT);
     if ( fields == NULL )
         goto err_free_content;
 
     txtPart = mailmime_new_empty( content, fields );
     if ( txtPart == NULL )
         goto err_free_fields;
     {
-        __str = str.utf8();
-        err = mailmime_set_body_text( txtPart, __str.data(), __str.length() );
+        //__str = str.utf8();
+        __str = QCString (str.latin1());
+        err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() );
     }
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_txtPart;
 
     return txtPart;     // Success :)
 
 err_free_txtPart:
     mailmime_free( txtPart );
 err_free_fields:
     mailmime_fields_free( fields );
 err_free_content:
     mailmime_content_free( content );
 err_free_param:
     mailmime_parameter_free( param );
 err_free:
     ;
 
     return NULL;        // Error :(
 }
 
 mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) {
     return mailimf_mailbox_new( strdup( name.latin1() ),
                                 strdup( mail.latin1() ) );
 }
 
 mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Mail>&mail )
 {
     mailimf_fields *fields = NULL;
     mailimf_field *xmailer = NULL;
     mailimf_mailbox *sender=0,*fromBox=0;
     mailimf_mailbox_list *from=0;
     mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0;
     clist*in_reply_to = 0;
     char *subject = strdup( mail->getSubject().latin1() );
     int err;
     int res = 1;
 
     sender = newMailbox( mail->getName(), mail->getMail() );
     if ( sender == NULL ) {
         res = 0;
     }
 
     if (res) {
         fromBox = newMailbox( mail->getName(), mail->getMail() );
     }
     if ( fromBox == NULL ) {
         res = 0;
     }
 
     if (res) {
         from = mailimf_mailbox_list_new_empty();
     }
     if ( from == NULL ) {
         res = 0;
     }
 
     if (res && from) {
         err = mailimf_mailbox_list_add( from, fromBox );
         if ( err != MAILIMF_NO_ERROR ) {
             res = 0;
         }
     }
 
     if (res) to = parseAddresses( mail->getTo() );
     if (res) cc = parseAddresses( mail->getCC() );
     if (res) bcc = parseAddresses( mail->getBCC() );
     if (res) reply = parseAddresses( mail->getReply() );
 
     if (res && mail->Inreply().count()>0) {
         in_reply_to = clist_new();
         char*c_reply;
         unsigned int nsize = 0;
         for (QStringList::ConstIterator it=mail->Inreply().begin();
              it != mail->Inreply().end();++it) {
             if ((*it).isEmpty())
                 continue;
             QString h((*it));
             while (h.length()>0 && h[0]=='<') {
                 h.remove(0,1);
             }
             while (h.length()>0 && h[h.length()-1]=='>') {
                 h.remove(h.length()-1,1);
             }
             if (h.isEmpty()) continue;
             nsize = strlen(h.latin1());
             /* yes! must be malloc! */
             c_reply = (char*)malloc( (nsize+1)*sizeof(char));
             memset(c_reply,0,nsize+1);
             memcpy(c_reply,h.latin1(),nsize);
             clist_append(in_reply_to,c_reply);
         }
     }
 
     if (res) {
         fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc,
                                            in_reply_to, NULL, subject );
         if ( fields == NULL ) {
             res = 0;
         }
     }
     if (res) xmailer = mailimf_field_new_custom( strdup( "User-Agent" ),
                                         strdup( USER_AGENT ) );
     if ( xmailer == NULL ) {
         res = 0;
     } else {
         err = mailimf_fields_add( fields, xmailer );
         if ( err != MAILIMF_NO_ERROR ) {
             res = 0;
         }
     }
     if (!res ) {
         if (xmailer) {
             mailimf_field_free( xmailer );
             xmailer = NULL;
         }
         if (fields) {
             mailimf_fields_free( fields );
             fields = NULL;
         } else {
             if (reply)
                 mailimf_address_list_free( reply );
             if (bcc)
                 mailimf_address_list_free( bcc );
             if (cc)
                 mailimf_address_list_free( cc );
             if (to)
                 mailimf_address_list_free( to );
             if (fromBox) {
                 mailimf_mailbox_free( fromBox );
             } else if (from) {
                 mailimf_mailbox_list_free( from );
             }
             if (sender) {
                 mailimf_mailbox_free( sender );
             }
             if (subject) {
                 free( subject );
             }
         }
     }
     return fields;
 }
 
 mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &mail ) {
     mailmime *message, *txtPart;
     mailimf_fields *fields;
     int err;
 
+    //LR disabled for now
+    //mCharset = mail->getCharset().lower();
     fields = createImfFields( mail );
     if ( fields == NULL )
         goto err_free;
 
     message = mailmime_new_message_data( NULL );
     if ( message == NULL )
         goto err_free_fields;
 
     mailmime_set_imf_fields( message, fields );
 
     txtPart = buildTxtPart( mail->getMessage() );
 
     if ( txtPart == NULL )
         goto err_free_message;
 
     err = mailmime_smart_add_part( message, txtPart );
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_txtPart;
 
     addFileParts( message, mail->getAttachments() );
 
     return message;         // Success :)
 
 err_free_txtPart:
     mailmime_free( txtPart );
 err_free_message:
     mailmime_free( message );
 err_free_fields:
     mailimf_fields_free( fields );
 err_free:
     ;
 
     return NULL;            // Error :(
 }
 
 clist *Generatemail::createRcptList( mailimf_fields *fields ) {
     clist *rcptList;
     mailimf_field *field;
 
     rcptList = esmtp_address_list_new();
 
     field = getField( fields, MAILIMF_FIELD_TO );
     if ( field && (field->fld_type == MAILIMF_FIELD_TO)
             && field->fld_data.fld_to->to_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_to->to_addr_list );
     }
 
     field = getField( fields, MAILIMF_FIELD_CC );
     if ( field && (field->fld_type == MAILIMF_FIELD_CC)
             && field->fld_data.fld_cc->cc_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list );
     }
 
     field = getField( fields, MAILIMF_FIELD_BCC );
     if ( field && (field->fld_type == MAILIMF_FIELD_BCC)
             && field->fld_data.fld_bcc->bcc_addr_list ) {
         addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list );
     }
 
     return rcptList;
 }
diff --git a/kmicromail/libmailwrapper/generatemail.h b/kmicromail/libmailwrapper/generatemail.h
index b9f8285..a9fb648 100644
--- a/kmicromail/libmailwrapper/generatemail.h
+++ b/kmicromail/libmailwrapper/generatemail.h
@@ -1,47 +1,48 @@
 #ifndef __GENERATE_MAIL_H
 #define __GENERATE_MAIL_H
 
 //#include <qpe/applnk.h>
 
 #include <qobject.h>
 #include <libetpan/clist.h>
 #include "mailwrapper.h"
 
 #include <opie2/osmartpointer.h>
 
 class Mail;
 class RecMail;
 
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
 class progressMailSend;
 struct mailsmtp;
 
 class Generatemail : public QObject
 {
     Q_OBJECT
 public:
     Generatemail();
     virtual ~Generatemail();
 
 protected:
     static void addRcpts( clist *list, mailimf_address_list *addr_list );
     static char *getFrom( mailmime *mail );
     static char *getFrom( mailimf_field *ffrom);
     static mailimf_field *getField( mailimf_fields *fields, int type );
     mailimf_address_list *parseAddresses(const QString&addr );
     void addFileParts( mailmime *message,const QList<Attachment>&files );
     mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
     mailmime *buildTxtPart(const QString&str );
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_fields *createImfFields(const Opie::Core::OSmartPointer<Mail> &mail );
     mailmime *createMimeMail(const Opie::Core::OSmartPointer<Mail>&mail );
     clist *createRcptList( mailimf_fields *fields );
 
     static const char* USER_AGENT;
+    QString mCharset;
 };
 
 #endif
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index 28d45ce..eac05e5 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -1,484 +1,485 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #include "genericwrapper.h"
 #include <libetpan/libetpan.h>
 #include "mailtypes.h"
 
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
 
 using namespace Opie::Core;
 Genericwrapper::Genericwrapper()
     : AbstractMail()
 {
     bodyCache.clear();
     m_storage = 0;
     m_folder = 0;
 }
 
 Genericwrapper::~Genericwrapper()
 {
     if (m_folder) {
         mailfolder_free(m_folder);
     }
     if (m_storage) {
         mailstorage_free(m_storage);
     }
     cleanMimeCache();
 }
 const QDateTime Genericwrapper::parseDateTime( mailimf_date_time *date )
 {
 
     QDate da (date->dt_year,date->dt_month, date->dt_day );
     QTime ti ( date->dt_hour, date->dt_min, date->dt_sec );
     QDateTime dt ( da ,ti );
     int addsec = -date->dt_zone*36;
     //qDebug("adsec1 %d ",addsec );
     dt = dt.addSecs( addsec );
     int off = KGlobal::locale()->localTimeOffset( dt );
     //qDebug("adsec2 %d ",off*60 );
 
     dt = dt.addSecs( off*60 );
     return dt;
 #if 0
     QString ret;
     if ( dt.date() ==  QDate::currentDate () )
         ret = KGlobal::locale()->formatTime( dt.time(),true);
 
     else {
         ret = KGlobal::locale()->formatDateTime( dt,true,true);
     }
 #endif
 #if 0
     if (  off < 0 )
         ret += " -";
     else
         ret += " +";
     ret += QString::number( off / 60 );
     ret += "h";
 #endif
 #if 0
     char tmp[23];
    
     //   snprintf( tmp, 23,  "%02i.%02i.%04i %02i:%02i:%02i %+05i",
     //  date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
      snprintf( tmp, 23,  "%04i-%02i-%02i %02i:%02i:%02i %+05i",
                date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
 
 
     return QString( tmp );
 #endif
     //return ret;
 }
 
 void Genericwrapper::fillSingleBody(RecPartP&target,mailmessage*,mailmime*mime)
 {
     if (!mime) {
         return;
     }
     mailmime_field*field = 0;
     mailmime_single_fields fields;
     memset(&fields, 0, sizeof(struct mailmime_single_fields));
     if (mime->mm_mime_fields != NULL) {
         mailmime_single_fields_init(&fields, mime->mm_mime_fields,
             mime->mm_content_type);
     }
 
     mailmime_content*type = fields.fld_content;
     clistcell*current;
     if (!type) {
         target->setType("text");
         target->setSubtype("plain");
     } else {
         target->setSubtype(type->ct_subtype);
         switch(type->ct_type->tp_data.tp_discrete_type->dt_type) {
         case MAILMIME_DISCRETE_TYPE_TEXT:
             target->setType("text");
             break;
         case MAILMIME_DISCRETE_TYPE_IMAGE:
             target->setType("image");
             break;
         case MAILMIME_DISCRETE_TYPE_AUDIO:
             target->setType("audio");
             break;
         case MAILMIME_DISCRETE_TYPE_VIDEO:
             target->setType("video");
             break;
         case MAILMIME_DISCRETE_TYPE_APPLICATION:
             target->setType("application");
             break;
         case MAILMIME_DISCRETE_TYPE_EXTENSION:
         default:
             if (type->ct_type->tp_data.tp_discrete_type->dt_extension) {
                 target->setType(type->ct_type->tp_data.tp_discrete_type->dt_extension);
             }
             break;
         }
         if (type->ct_parameters) {
             fillParameters(target,type->ct_parameters);
         }
     }
     if (mime->mm_mime_fields && mime->mm_mime_fields->fld_list) {
         for (current=clist_begin(mime->mm_mime_fields->fld_list);current!=0;current=clist_next(current)) {
             field = (mailmime_field*)current->data;
             switch(field->fld_type) {
             case MAILMIME_FIELD_TRANSFER_ENCODING:
                 target->setEncoding(getencoding(field->fld_data.fld_encoding));
                 break;
             case MAILMIME_FIELD_ID:
                 target->setIdentifier(field->fld_data.fld_id);
                 break;
             case MAILMIME_FIELD_DESCRIPTION:
                 target->setDescription(field->fld_data.fld_description);
                 break;
             default:
                 break;
             }
         }
     }
 }
 
 void Genericwrapper::fillParameters(RecPartP&target,clist*parameters)
 {
     if (!parameters) {return;}
     clistcell*current=0;
     mailmime_parameter*param;
     for (current=clist_begin(parameters);current!=0;current=clist_next(current)) {
         param = (mailmime_parameter*)current->data;
         if (param) {
             target->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
         }
     }
 }
 
 QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
 {
     QString enc="7bit";
     if (!aEnc) return enc;
     switch(aEnc->enc_type) {
     case MAILMIME_MECHANISM_7BIT:
         enc = "7bit";
         break;
     case MAILMIME_MECHANISM_8BIT:
         enc = "8bit";
         break;
     case MAILMIME_MECHANISM_BINARY:
         enc = "binary";
         break;
     case MAILMIME_MECHANISM_QUOTED_PRINTABLE:
         enc = "quoted-printable";
         break;
     case MAILMIME_MECHANISM_BASE64:
         enc = "base64";
         break;
     case MAILMIME_MECHANISM_TOKEN:
     default:
         if (aEnc->enc_token) {
             enc = QString(aEnc->enc_token);
         }
         break;
     }
     return enc;
 }
 
 void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
 {
     if (current_rec >= 10) {
         ; // odebug << "too deep recursion!" << oendl; 
     }
     if (!message || !mime) {
         return;
     }
     int r;
     char*data = 0;
     size_t len;
     clistiter * cur = 0;
     QString b;
     RecPartP part = new RecPart();
 
     switch (mime->mm_type) {
     case MAILMIME_SINGLE:
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         r = mailmessage_fetch_section(message,mime,&data,&len);
         part->setSize(len);
         part->setPositionlist(countlist);
         b = gen_attachment_id();
         part->setIdentifier(b);
         fillSingleBody(part,message,mime);
         if (part->Type()=="text" && target->Bodytext().isNull()) {
             encodedString*rs = new encodedString();
             rs->setContent(data,len);
             encodedString*res = decode_String(rs,part->Encoding());
             if (countlist.count()>2) {
                 bodyCache[b]=rs;
                 target->addPart(part);
             } else {
                 delete rs;
             }
             b = QString(res->Content());
             delete res;
             size_t index = 0;
             char*resu = 0;
             int err = MAILIMF_NO_ERROR;
             QString charset = part->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
-            if ( !charset.isEmpty() ) {
+            if (false ) {
+                //if ( !charset.isEmpty() ) {
                 target->setCharset( charset );
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
                                                     b.latin1(), b.length(),&index, "utf-8",&resu);
                 if (err == MAILIMF_NO_ERROR && resu && strlen(resu)) {
                     //qDebug("res %d %s ", index, resu);
                     b = QString::fromUtf8(resu);
                 }
                 if (resu) free(resu);
             }
             target->setBodytext(b);
             target->setDescription(part);
         } else {
             bodyCache[b]=new encodedString(data,len);
             target->addPart(part);
         }
     }
     break;
     case MAILMIME_MULTIPLE:
     {
         unsigned int ccount = 1;
         mailmime*cbody=0;
         QValueList<int>countlist = recList;
         for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
             cbody = (mailmime*)clist_content(cur);
             if (cbody->mm_type==MAILMIME_MULTIPLE) {
                 RecPartP targetPart = new RecPart();
                 targetPart->setType("multipart");
                 countlist.append(current_count);
                 targetPart->setPositionlist(countlist);
                 target->addPart(targetPart);
             }
             traverseBody(target,message, cbody,countlist,current_rec+1,ccount);
             if (cbody->mm_type==MAILMIME_MULTIPLE) {
                 countlist = recList;
             }
             ++ccount;
         }
     }
     break;
     case MAILMIME_MESSAGE:
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         /* the own header is always at recursion 0 - we don't need that */
         if (current_rec > 0) {
             part->setPositionlist(countlist);
             r = mailmessage_fetch_section(message,mime,&data,&len);
             part->setSize(len);
             part->setPositionlist(countlist);
             b = gen_attachment_id();
             part->setIdentifier(b);
             part->setType("message");
             part->setSubtype("rfc822");
             bodyCache[b]=new encodedString(data,len);
             target->addPart(part);
         }
         if (mime->mm_data.mm_message.mm_msg_mime != NULL) {
             traverseBody(target,message,mime->mm_data.mm_message.mm_msg_mime,countlist,current_rec+1);
         }
     }
     break;
     }
 }
 
 RecBodyP Genericwrapper::parseMail( mailmessage * msg )
 {
     int err = MAILIMF_NO_ERROR;
     //mailmime_single_fields fields;
     /* is bound to msg and will be freed there */
     mailmime * mime=0;
     RecBodyP body = new RecBody();
     //memset(&fields, 0, sizeof(struct mailmime_single_fields));
     err = mailmessage_get_bodystructure(msg,&mime);
     QValueList<int>recList;
     traverseBody(body,msg,mime,recList);
     return body;
 }
 
 
 QString Genericwrapper::parseAddressList( mailimf_address_list *list )
 {
     QString result( "" );
 
     bool first = true;
     if (list == 0) return result;
     for ( clistiter *current = clist_begin( list->ad_list ); current != NULL; current = current->next ) {
         mailimf_address *addr = (mailimf_address *) current->data;
 
         if ( !first ) {
             result.append( "," );
         } else {
             first = false;
         }
 
         switch ( addr->ad_type ) {
             case MAILIMF_ADDRESS_MAILBOX:
                 result.append( parseMailbox( addr->ad_data.ad_mailbox ) );
                 break;
             case MAILIMF_ADDRESS_GROUP:
                 result.append( parseGroup( addr->ad_data.ad_group ) );
                 break;
             default:
                 ; // odebug << "Generic: unkown mailimf address type" << oendl; 
                 break;
         }
     }
 
     return result;
 }
 
 QString Genericwrapper::parseGroup( mailimf_group *group )
 {
     QString result( "" );
 
     result.append( group->grp_display_name );
     result.append( ": " );
 
     if ( group->grp_mb_list != NULL ) {
         result.append( parseMailboxList( group->grp_mb_list ) );
     }
 
     result.append( ";" );
 
     return result;
 }
 
 QString Genericwrapper::parseMailbox( mailimf_mailbox *box )
 {
     QString result( "" );
 
     if ( box->mb_display_name == NULL ) {
         result.append( box->mb_addr_spec );
     } else {
         result.append( convert_String(box->mb_display_name) );
         result.append( " <" );
         result.append( box->mb_addr_spec );
         result.append( ">" );
     }
 
     return result;
 }
 
 QString Genericwrapper::parseMailboxList( mailimf_mailbox_list *list )
 {
     QString result( "" );
 
     bool first = true;
     for ( clistiter *current = clist_begin( list->mb_list ); current != NULL; current = current->next ) {
         mailimf_mailbox *box = (mailimf_mailbox *) current->data;
 
         if ( !first ) {
             result.append( "," );
         } else {
             first = false;
         }
 
         result.append( parseMailbox( box ) );
     }
 
     return result;
 }
 
 encodedString* Genericwrapper::fetchDecodedPart(const RecMailP&,const RecPartP&part)
 {
     QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
     if (it==bodyCache.end()) return new encodedString();
     encodedString*t = decode_String(it.data(),part->Encoding());
     return t;
 }
 
 encodedString* Genericwrapper::fetchRawPart(const RecMailP&,const RecPartP&part)
 {
     QMap<QString,encodedString*>::ConstIterator it = bodyCache.find(part->Identifier());
     if (it==bodyCache.end()) return new encodedString();
     encodedString*t = it.data();
     return t;
 }
 
 QString Genericwrapper::fetchTextPart(const RecMailP&mail,const RecPartP&part)
 {
     encodedString*t = fetchDecodedPart(mail,part);
     QString text=t->Content();
     delete t;
     return text;
 }
 
 void Genericwrapper::cleanMimeCache()
 {
     QMap<QString,encodedString*>::Iterator it = bodyCache.begin();
     for (;it!=bodyCache.end();++it) {
         encodedString*t = it.data();
         //it.setValue(0);
         if (t) delete t;
     }
     bodyCache.clear();
     ; // odebug << "Genericwrapper: cache cleaned" << oendl; 
 }
 
 QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
 {
     QStringList res;
     if (!in_replies || !in_replies->mid_list) return res;
     clistiter * current = 0;
     for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) {
         QString h((char*)current->data);
         while (h.length()>0 && h[0]=='<') {
             h.remove(0,1);
         }
         while (h.length()>0 && h[h.length()-1]=='>') {
             h.remove(h.length()-1,1);
         }
         if (h.length()>0) {
             res.append(h);
         }
     }
     return res;
 }
 
 void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to, int maxSizeInKb)
 {
     int r;
     mailmessage_list * env_list = 0;
     r = mailsession_get_messages_list(session,&env_list);
     if (r != MAIL_NO_ERROR) {
         ; // odebug << "Error message list" << oendl; 
         return;
     }
     r = mailsession_get_envelopes_list(session, env_list);
     if (r != MAIL_NO_ERROR) {
         ; // odebug << "Error filling message list" << oendl; 
         if (env_list) {
             mailmessage_list_free(env_list);
         }
         return;
     }
     mailimf_references * refs = 0;
     mailimf_in_reply_to * in_replies = 0;
     uint32_t i = 0;
     for(; i < carray_count(env_list->msg_tab) ; ++i) {
         mailmessage * msg;
         QBitArray mFlags(7);
         msg = (mailmessage*)carray_get(env_list->msg_tab, i);
         if (msg->msg_fields == NULL) {
             //; // odebug << "could not fetch envelope of message " << i << "" << oendl; 
             continue;
         }
         RecMailP mail = new RecMail();
         mail->setWrapper(this);
         mail_flags * flag_result = 0;
         r = mailmessage_get_flags(msg,&flag_result);
         if (r == MAIL_ERROR_NOT_IMPLEMENTED) {
             mFlags.setBit(FLAG_SEEN);
         }
         mailimf_single_fields single_fields;
         mailimf_single_fields_init(&single_fields, msg->msg_fields);
         mail->setMsgsize(msg->msg_size);
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 2a54381..da7065f 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -506,514 +506,514 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
                 m->setSubject(convert_String((const char*)head->env_subject));
             //m->setSubject(head->env_subject);
             if (head->env_from!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_from->frm_list);
                 if (addresslist.count()) {
                     m->setFrom(addresslist.first());
                 }
             }
             if (head->env_to!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_to->to_list);
                 m->setTo(addresslist);
             }
             if (head->env_cc!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_cc->cc_list);
                 m->setCC(addresslist);
             }
             if (head->env_bcc!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_bcc->bcc_list);
                 m->setBcc(addresslist);
             }
             /* reply to address, eg. email. */
             if (head->env_reply_to!=NULL) {
                 addresslist = address_list_to_stringlist(head->env_reply_to->rt_list);
                 if (addresslist.count()) {
                     m->setReplyto(addresslist.first());
                 }
             }
             if (head->env_in_reply_to!=NULL) {
                 QString h(head->env_in_reply_to);
                 while (h.length()>0 && h[0]=='<') {
                     h.remove(0,1);
                 }
                 while (h.length()>0 && h[h.length()-1]=='>') {
                     h.remove(h.length()-1,1);
                 }
                 if (h.length()>0) {
                     m->setInreply(QStringList(h));
                 }
             }
             if (head->env_message_id != NULL) {
                 m->setMsgid(QString(head->env_message_id));
             }
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_INTERNALDATE) {
 #if 0
             mailimap_date_time*d = item->att_data.att_static->att_data.att_internal_date;
             QDateTime da(QDate(d->dt_year,d->dt_month,d->dt_day),QTime(d->dt_hour,d->dt_min,d->dt_sec));
             qDebug("time %s ",da.toString().latin1() );
 #endif
         } else if (item->att_data.att_static->att_type==MAILIMAP_MSG_ATT_RFC822_SIZE) {
             size = item->att_data.att_static->att_data.att_rfc822_size;
         }
     }
     /* msg is already deleted */
     if (mFlags.testBit(FLAG_DELETED) && m) {
         delete m;
         m = 0;
     }
     if (m) {
         m->setFlags(mFlags);
         m->setMsgsize(size);
     }
     return m;
 }
 
 RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
 {
     RecBodyP body = new RecBody();
     const char *mb;
     int err = MAILIMAP_NO_ERROR;
     clist *result = 0;
     clistcell *current;
     mailimap_fetch_att *fetchAtt = 0;
     mailimap_fetch_type *fetchType = 0;
     mailimap_set *set = 0;
     mailimap_body*body_desc = 0;
 
     mb = mail->getMbox().latin1();
 
     login();
     if (!m_imap) {
         return body;
     }
     err = selectMbox(mail->getMbox());
     if ( err != MAILIMAP_NO_ERROR ) {
         return body;
     }
 
     /* the range has to start at 1!!! not with 0!!!! */
     set = mailimap_set_new_interval( mail->getNumber(),mail->getNumber() );
     fetchAtt = mailimap_fetch_att_new_bodystructure();
     fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt);
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
         QValueList<int> path;
         body_desc = item->att_data.att_static->att_data.att_body;
         traverseBody(mail,body_desc,body,0,path);
     } else {
         //odebug << "error fetching body: " << m_imap->imap_response << "" << oendl; 
     }
     if (result) mailimap_fetch_list_free(result);
     return body;
 }
 
 QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
 {
     QStringList l;
     QString from;
     bool named_from;
     clistcell *current = NULL;
     mailimap_address * current_address=NULL;
     if (!list) {
         return l;
     }
     unsigned int count = 0;
     for (current=clist_begin(list);current!= NULL;current=clist_next(current)) {
         from = "";
         named_from = false;
         current_address=(mailimap_address*)current->data;
         if (current_address->ad_personal_name){
             from+=convert_String((const char*)current_address->ad_personal_name);
             from+=" ";
             named_from = true;
         }
         if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
             from+="<";
         }
         if (current_address->ad_mailbox_name) {
             from+=QString(current_address->ad_mailbox_name);
             from+="@";
         }
         if (current_address->ad_host_name) {
              from+=QString(current_address->ad_host_name);
         }
         if (named_from && (current_address->ad_mailbox_name || current_address->ad_host_name)) {
            from+=">";
         }
         l.append(QString(from));
         if (++count > 99) {
             break;
         }
     }
     return l;
 }
 
 encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call)
 {
     encodedString*res=new encodedString;
     int err;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     clistcell*current,*cur;
     mailimap_section_part * section_part =  0;
     mailimap_section_spec * section_spec =  0;
     mailimap_section * section = 0;
     mailimap_fetch_att * fetch_att = 0;
 
     login();
     if (!m_imap) {
         return res;
     }
     if (!internal_call) {
         err = selectMbox(mail->getMbox());
         if ( err != MAILIMAP_NO_ERROR ) {
             return res;
         }
     }
     set = mailimap_set_new_single(mail->getNumber());
 
     clist*id_list = 0;
 
     /* if path == empty then its a request for the whole rfc822 mail and generates
        a "fetch <id> (body[])" statement on imap server */
     if (path.count()>0 ) {
         id_list = clist_new();
         for (unsigned j=0; j < path.count();++j) {
             uint32_t * p_id = (uint32_t *)malloc(sizeof(*p_id));
             *p_id = path[j];
             clist_append(id_list,p_id);
         }
         section_part =  mailimap_section_part_new(id_list);
         section_spec =  mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL);
     }
 
     section =  mailimap_section_new(section_spec);
     fetch_att = mailimap_fetch_att_new_body_section(section);
     fetchType = mailimap_fetch_type_new_fetch_att(fetch_att);
 
     clist*result = 0;
 
     err = mailimap_fetch( m_imap, set, fetchType, &result );
     mailimap_set_free( set );
     mailimap_fetch_type_free( fetchType );
 
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*msg_att_item;
         for(cur = clist_begin(msg_att->att_list) ; cur != NULL ; cur = clist_next(cur)) {
             msg_att_item = (mailimap_msg_att_item*)clist_content(cur);
             if (msg_att_item->att_type == MAILIMAP_MSG_ATT_ITEM_STATIC) {
                 if (msg_att_item->att_data.att_static->att_type == MAILIMAP_MSG_ATT_BODY_SECTION) {
                     char*text = msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part;
                     /* detach - we take over the content */
                     msg_att_item->att_data.att_static->att_data.att_body_section->sec_body_part = 0L;
                     res->setContent(text,msg_att_item->att_data.att_static->att_data.att_body_section->sec_length);
                 }
             }
         }
     } else {
         ;//odebug << "error fetching text: " << m_imap->imap_response << "" << oendl; 
     }
     if (result) mailimap_fetch_list_free(result);
     return res;
 }
 
 /* current_recursion is for recursive calls.
    current_count means the position inside the internal loop! */
 void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,
     int current_recursion,QValueList<int>recList,int current_count)
 {
     if (!body || current_recursion>=10) {
         return;
     }
     switch (body->bd_type) {
     case MAILIMAP_BODY_1PART:
     {
         QValueList<int>countlist = recList;
         countlist.append(current_count);
         RecPartP currentPart = new RecPart();
         mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part;
         QString id("");
         currentPart->setPositionlist(countlist);
         for (unsigned int j = 0; j < countlist.count();++j) {
             id+=(j>0?" ":"");
             id+=QString("%1").arg(countlist[j]);
         }
         //odebug << "ID = " << id.latin1() << "" << oendl; 
         currentPart->setIdentifier(id);
         fillSinglePart(currentPart,part1);
         /* important: Check for is NULL 'cause a body can be empty!
            And we put it only into the mail if it is the FIRST part */
         if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_TEXT && target_body->Bodytext().isNull() && countlist[0]==1) {
             QString body_text = fetchTextPart(mail,countlist,true,currentPart->Encoding());
 
             size_t index = 0;
             char*res = 0;
             int err = MAILIMF_NO_ERROR;
             
             QString charset = currentPart->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
-            //if ( false ) {
-            if ( !charset.isEmpty() ) {
+            if ( false ) {
+            //if ( !charset.isEmpty() ) {
                 target_body->setCharset( charset );
                 //err = mailmime_encoded_phrase_parse("iso-8859-1",
                 //                                      text, strlen(text),&index, "iso-8859-1",&res);
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
                                                     body_text.latin1(), body_text.length(),&index, "utf-8",&res);
                 if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
                     //qDebug("res %d %s ", index, res);
                     body_text = QString::fromUtf8(res);
                 }
                 if (res) free(res);
             }
             //qDebug("encoding %d text %s ",currentPart->Encoding().latin1(), body_text.latin1() );
             target_body->setDescription(currentPart);
             target_body->setBodytext(body_text);
             if (countlist.count()>1) {
                 target_body->addPart(currentPart);
             }
         } else {
             target_body->addPart(currentPart);
         }
         if (part1->bd_type==MAILIMAP_BODY_TYPE_1PART_MSG) {
             traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist);
         }
     }
     break;
     case MAILIMAP_BODY_MPART:
     {
         QValueList<int>countlist = recList;
         clistcell*current=0;
         mailimap_body*current_body=0;
         unsigned int ccount = 1;
         mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart;
         for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) {
             current_body = (mailimap_body*)current->data;
             if (current_body->bd_type==MAILIMAP_BODY_MPART) {
                 RecPartP targetPart = new RecPart();
                 targetPart->setType("multipart");
                 fillMultiPart(targetPart,mailDescription);
                 countlist.append(current_count);
                 targetPart->setPositionlist(countlist);
                 target_body->addPart(targetPart);
                 QString id("");
                 for (unsigned int j = 0; j < countlist.count();++j) {
                     id+=(j>0?" ":"");
                     id+=QString("%1").arg(countlist[j]);
                 }
                 // odebug << "ID(mpart) = " << id.latin1() << "" << oendl; 
             }
             traverseBody(mail,current_body,target_body,current_recursion+1,countlist,ccount);
             if (current_body->bd_type==MAILIMAP_BODY_MPART) {
                 countlist = recList;
             }
             ++ccount;
         }
     }
     break;
     default:
     break;
     }
 }
 
 void IMAPwrapper::fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description)
 {
     if (!Description) {
         return;
     }
     switch (Description->bd_type) {
         case MAILIMAP_BODY_TYPE_1PART_TEXT:
             target_part->setType("text");
             fillSingleTextPart(target_part,Description->bd_data.bd_type_text);
             break;
         case MAILIMAP_BODY_TYPE_1PART_BASIC:
             fillSingleBasicPart(target_part,Description->bd_data.bd_type_basic);
             break;
         case MAILIMAP_BODY_TYPE_1PART_MSG:
             target_part->setType("message");
             fillSingleMsgPart(target_part,Description->bd_data.bd_type_msg);
             break;
         default:
             break;
     }
 }
 
 void IMAPwrapper::fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which)
 {
     if (!which) {
         return;
     }
     QString sub;
     sub = which->bd_media_text;
     //odebug << "Type= text/" << which->bd_media_text << "" << oendl; 
     target_part->setSubtype(sub.lower());
     target_part->setLines(which->bd_lines);
     fillBodyFields(target_part,which->bd_fields);
 }
 
 void IMAPwrapper::fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which)
 {
     if (!which) {
         return;
     }
     target_part->setSubtype("rfc822");
     //odebug << "Message part" << oendl; 
     /* we set this type to text/plain */
     target_part->setLines(which->bd_lines);
     fillBodyFields(target_part,which->bd_fields);
 }
 
 void IMAPwrapper::fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which)
 {
     if (!which) return;
     QString sub = which->bd_media_subtype;
     target_part->setSubtype(sub.lower());
     if (which->bd_ext_mpart && which->bd_ext_mpart->bd_parameter && which->bd_ext_mpart->bd_parameter->pa_list) {
         clistcell*cur = 0;
         mailimap_single_body_fld_param*param=0;
         for (cur = clist_begin(which->bd_ext_mpart->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
             param = (mailimap_single_body_fld_param*)cur->data;
             if (param) {
                 target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
             }
         }
     }
 }
 
 void IMAPwrapper::fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which)
 {
     if (!which) {
         return;
     }
     QString type,sub;
     switch (which->bd_media_basic->med_type) {
     case MAILIMAP_MEDIA_BASIC_APPLICATION:
         type = "application";
         break;
     case MAILIMAP_MEDIA_BASIC_AUDIO:
         type = "audio";
         break;
     case MAILIMAP_MEDIA_BASIC_IMAGE:
         type = "image";
         break;
     case MAILIMAP_MEDIA_BASIC_MESSAGE:
         type = "message";
         break;
     case MAILIMAP_MEDIA_BASIC_VIDEO:
         type = "video";
         break;
     case MAILIMAP_MEDIA_BASIC_OTHER:
     default:
         if (which->bd_media_basic->med_basic_type) {
             type = which->bd_media_basic->med_basic_type;
         } else {
             type = "";
         }
         break;
     }
     if (which->bd_media_basic->med_subtype) {
         sub = which->bd_media_basic->med_subtype;
     } else {
         sub = "";
     }
     // odebug << "Type = " << type.latin1() << "/" << sub.latin1() << "" << oendl; 
     target_part->setType(type.lower());
     target_part->setSubtype(sub.lower());
     fillBodyFields(target_part,which->bd_fields);
 }
 
 void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which)
 {
     if (!which) return;
     if (which->bd_parameter && which->bd_parameter->pa_list && which->bd_parameter->pa_list->count>0) {
         clistcell*cur;
         mailimap_single_body_fld_param*param=0;
         for (cur = clist_begin(which->bd_parameter->pa_list);cur!=NULL;cur=clist_next(cur)) {
             param = (mailimap_single_body_fld_param*)cur->data;
             if (param) {
                 target_part->addParameter(QString(param->pa_name).lower(),QString(param->pa_value));
             }
         }
     }
     mailimap_body_fld_enc*enc = which->bd_encoding;
     QString encoding("");
     switch (enc->enc_type) {
     case MAILIMAP_BODY_FLD_ENC_7BIT:
         encoding = "7bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_8BIT:
         encoding = "8bit";
         break;
     case MAILIMAP_BODY_FLD_ENC_BINARY:
         encoding="binary";
         break;
     case MAILIMAP_BODY_FLD_ENC_BASE64:
         encoding="base64";
         break;
     case MAILIMAP_BODY_FLD_ENC_QUOTED_PRINTABLE:
         encoding="quoted-printable";
         break;
     case MAILIMAP_BODY_FLD_ENC_OTHER:
     default:
         if (enc->enc_value) {
             char*t=enc->enc_value;
             encoding=QString(enc->enc_value);
             enc->enc_value=0L;
             free(t);
         }
     }
     if (which->bd_description) {
         target_part->setDescription(QString(which->bd_description));
     }
     target_part->setEncoding(encoding);
     target_part->setSize(which->bd_size);
 }
 void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
 {
     //#if 0
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
     login();
     //#endif
     if (!m_imap) {
         return;
     }
     int iii = 0;
     int count = target.count();
     // qDebug("imap remove count %d ", count); 
 
     
     mMax = count;
     progress( i18n("Delete")); 
 
     QProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
     while (iii < count ) {
         Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
         qApp->processEvents();
         RecMailP mail = (*target.at( iii ));
         //#if 0
         //qDebug("IMAP remove %d %d ", iii, mail->getNumber() );
         err = selectMbox(mail->getMbox());
         if ( err != MAILIMAP_NO_ERROR ) {
             return;
         }
         flist = mailimap_flag_list_new_empty();
         mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
         store_flags = mailimap_store_att_flags_new_set_flags(flist);
         set = mailimap_set_new_single(mail->getNumber());
         err = mailimap_store(m_imap,set,store_flags);
         mailimap_set_free( set );
         mailimap_store_att_flags_free(store_flags);
 
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index ea6bf36..3e8b51f 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -1,131 +1,131 @@
 #ifndef MAILWRAPPER_H
 #define MAILWRAPPER_H
 
 //#include <qpe/applnk.h>
 
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <qfileinfo.h>
 #include <kiconloader.h>
 
 #include "settings.h"
 
 #include <opie2/osmartpointer.h>
 /*
 class Attachment
 {
 public:
     Attachment( DocLnk lnk );
     virtual ~Attachment(){}
     const QString getFileName()const{ return doc.file(); }
     const QString getName()const{ return doc.name(); }
     const QString getMimeType()const{ return doc.type(); }
     const QPixmap getPixmap()const{ return doc.pixmap(); }
     const int getSize()const { return size; }
     DocLnk  getDocLnk() { return doc; }
 
 protected:
     DocLnk doc;
     int size;
 
 };
 */
 
 class Attachment
 {
 public:
     Attachment( QString lnk );
     virtual ~Attachment(){}
     const QString getFileName()const{ return  doc; }
     const QString getName()const{ return QFileInfo( doc ).baseName (); }
     const QString getMimeType()const{ return QFileInfo( doc ).extension(false); }
     const QPixmap getPixmap()const{ return mPix; }
     const int getSize()const { return size; }
     QString  getDocLnk() { return doc; }
 
 protected:
     QPixmap mPix;
     QString doc;
     int size;
 
 };
 
 class Mail:public Opie::Core::ORefCount
 {
 public:
     Mail();
     /* Possible that this destructor must not be declared virtual
      * 'cause it seems that it will never have some child classes.
      * in this case this object will not get a virtual table -> memory and
      * speed will be a little bit better?
      */
     virtual ~Mail(){}
     void addAttachment( Attachment *att ) { attList.append( att ); }
     const QList<Attachment>& getAttachments()const { return attList; }
     void removeAttachment( Attachment *att ) { attList.remove( att ); }
     const QString&getName()const { return name; }
     void setName( QString s ) { name = s; }
     const QString&getMail()const{ return mail; }
     void setMail( const QString&s ) { mail = s; }
     const QString&getTo()const{ return to; }
     void setTo( const QString&s ) { to = s; }
     const QString&getCC()const{ return cc; }
     void setCC( const QString&s ) { cc = s; }
     const QString&getBCC()const { return bcc; }
     void setBCC( const QString&s ) { bcc = s; }
     const QString&getMessage()const { return message; }
     void setMessage( const QString&s ) { message = s; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getReply()const{ return reply; }
     void setReply( const QString&a ) { reply = a; }
     void setInreply(const QStringList&list){m_in_reply_to = list;}
     const QStringList&Inreply()const{return m_in_reply_to;}
 
     void setCharset( const QString&a ) { charset= a; }
-    const QString& getCharset() { return charset; }
+    const QString& getCharset() const { return charset; }
 
 private:
     QList<Attachment> attList;
     QString name, mail, to, cc, bcc, reply, subject, message, charset;
     QStringList m_in_reply_to;
 };
 
 class Folder:public Opie::Core::ORefCount
 {
 public:
     Folder( const QString&init_name,const QString&sep );
     virtual ~Folder();
     const QString&getDisplayName()const { return nameDisplay; }
     const QString&getName()const { return name; }
     const QString&getPrefix()const{return prefix; }
     virtual bool may_select()const{return true;}
     virtual bool no_inferior()const{return true;}
     const QString&Separator()const;
 
 protected:
     QString nameDisplay, name, separator,prefix;
 };
 
 typedef Opie::Core::OSmartPointer<Folder> FolderP;
 
 class MHFolder : public Folder
 {
 public:
     MHFolder(const QString&disp_name,const QString&mbox);
     virtual ~MHFolder();
 };
 
 class IMAPFolder : public Folder
 {
     public:
         IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" );
         virtual ~IMAPFolder();
         virtual bool may_select()const{return m_MaySelect;}
         virtual bool no_inferior()const{return m_NoInferior;}
         static QString decodeFolderName( const QString &name );
     private:
         bool m_MaySelect,m_NoInferior;
 };
 
 #endif
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 3013931..8c0a4cb 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,353 +1,354 @@
 
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 //#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #include <qstatusbar.h> 
 #include <kabc/stdaddressbook.h>
 extern QStatusBar* globalSstatusBarMainWindow;
 #else
 #include <qpe/qpeapplication.h>
 #endif
 #include "defines.h"
 #include "mainwindow.h"
 #include <KDGanttMinimizeSplitter.h>
 
 #include "koprefs.h"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name ) //, flags )
 {
 #ifdef DESKTOP_VERSION
     globalSstatusBarMainWindow = statusBar();
 #endif
     setCaption( i18n( "KOpieMail/Pi" ) );
     setToolBarsMovable( false ); 
     //KABC::StdAddressBook::self();
     toolBar = new QToolBar( this );
     menuBar = new QPEMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( i18n( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( i18n( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
     QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"),
                                0, 0, this );
     connect(getMail, SIGNAL( activated() ),
             SLOT( slotGetAllMail() ) );
     getMail->addTo( mailMenu );
 
     getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"),
                                0, 0, this );
     getMail->addTo( toolBar );
     getMail->addTo( mailMenu );
     connect(getMail, SIGNAL( activated() ),
             SLOT( slotGetMail() ) );
 
     composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"),
                                0, 0, this );
     composeMail->addTo( toolBar );
     composeMail->addTo( mailMenu );
 
     sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") ,
                               0, 0, this );
     sendQueued->addTo( toolBar );
     sendQueued->addTo( mailMenu );
 
     /*
     syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC,
                                0, 0, this );
     syncFolders->addTo( toolBar );
     syncFolders->addTo( mailMenu );
     */
 
     showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") ,
                                0, 0, this, 0, true );
     showFolders->addTo( toolBar );
     showFolders->addTo( mailMenu );
     showFolders->setOn( true );
     connect(showFolders, SIGNAL( toggled(bool) ),
             SLOT( slotShowFolders(bool) ) );
 
     /*
       searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ),
                                0, 0, this );
     searchMails->addTo( toolBar );
     searchMails->addTo( mailMenu );
     */
 
     deleteMails = new QAction(i18n("Delete Mail"),  SmallIcon("trash"), 0, 0, this);
     deleteMails->addTo( toolBar );
     deleteMails->addTo( mailMenu );
     connect( deleteMails, SIGNAL( activated() ),
              SLOT( slotDeleteMail() ) );
 
     editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon")  ,
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
     connect( editSettings, SIGNAL( activated() ),
              SLOT( slotEditSettings() ) );
     editAccounts = new QAction( i18n( "Configure accounts" ),  SmallIcon("editaccounts")  ,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
     codecMenu = new QPopupMenu( menuBar );
     codecMenu->insertItem( "Western (iso-8859-1)",0,0);
     codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1);
     codecMenu->insertItem( "Western (iso-8859-15)",2,2);
     codecMenu->insertItem( "Chinese (big-5)",3,3);
     codecMenu->insertItem( "Unicode (utf-8)",4,4);
     codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
-    settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
+    //disabled
+    //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
     //setCentralWidget( view );
 
     QVBox* wrapperBox = new QVBox( this );
     setCentralWidget( wrapperBox );
 
     // QWidget *view = new QWidget( wrapperBox );
     KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, wrapperBox);
     split->setMinimizeDirection( KDGanttMinimizeSplitter::Left);
     //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
 
     folderView = new AccountView( split );
     folderView->header()->hide();
     folderView->setRootIsDecorated( false );
     folderView->addColumn( i18n( "Mailbox" ) );
 
     //layout->addWidget( folderView );
 
     mailView = new QListView( split );
     mailView->addColumn( i18n( " " ) );
     mailView->addColumn( i18n( "Subject" ),QListView::Manual );
     mailView->addColumn( i18n( "Sender" ),QListView::Manual );
     mailView->addColumn( i18n( "Size" ),QListView::Manual);
     mailView->addColumn( i18n( "Date" ),QListView::Manual);
     mailView->setAllColumnsShowFocus(true);
     //mailView->setSorting(-1);
     mailView->setRootIsDecorated( false );
     statusWidget = new StatusWidget( wrapperBox );
     statusWidget->hide();
 
     //layout->addWidget( mailView );
     //layout->setStretchFactor( folderView, 1 );
     //layout->setStretchFactor( mailView, 2 );
 
     slotAdjustLayout();
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
 #endif
     connect( mailView, SIGNAL(  doubleClicked (QListViewItem* )),this,
              SLOT( mailLeftClicked(QListViewItem*) ) );
     connect( mailView, SIGNAL(  returnPressed (QListViewItem* )),this,
              SLOT( mailLeftClicked(QListViewItem*) ) );
     connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
              SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) );
     connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
             this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
     connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
     connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
     //mailView->setMultiSelection ( true );
     mailView->setSelectionMode( QListView::Extended );
     QValueList<int> list;
     int fw = 100;
     if ( QApplication::desktop()->width() > 320 )
         fw = 50;
     list.append( fw );
     list.append( 100 );
     split->setSizes( list );
     QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
     mailView->setShowSortIndicator ( true ); 
     QLabel *spacer = new QLabel( toolBar );
     spacer->setBackgroundMode( QWidget::PaletteButton );
     toolBar->setStretchableWidget( spacer );
 
     QAction* closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); 
     connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
     if ( QApplication::desktop()->width() > 320 )
         closeMail->addTo(toolBar);
 	closeMail->addTo(mailMenu);
 
 
    QPopupMenu* helpMenu = new QPopupMenu( menuBar );
    menuBar->insertItem( i18n( "Help" ), helpMenu ); 
    QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
    li->addTo(helpMenu);
    li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
    li->addTo(helpMenu); 
    li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
    li->addTo(helpMenu);
    connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) );
    slotSetCodec( KOPrefs::instance()->mCurrentCodec );
 #ifdef DESKTOP_VERSION
    resize ( 640, 480 );
 #endif
 }
 
 MainWindow::~MainWindow()
 {
 }
 
 void MainWindow::slotSetCodec( int codec )
 { 
     codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false  );
     //qDebug("codec %d ", codec);
     KOPrefs::instance()->mCurrentCodec = codec;
     KOPrefs::instance()->isDirty = true;
     QString name;
     switch ( codec ) {
     case 0:
         name = "iso-8859-1";
         break;
     case 1:
         name = "iso-8859-5";
         break;
     case 2:
         name = "iso-8859-15";
         break;
     case 3:
         name = "big-5";
         break;
     case 4:
         name = "utf-8";
         break;
     case 5:
         name = KOPrefs::instance()->mSendCodec.lower();
         break;
     }
     KOPrefs::instance()->mCurrentCodeName = name ;
     codecMenu->changeItem ( 5, "Userdefined ("+KOPrefs::instance()->mSendCodec+")");
     codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, true );
 }
 void  MainWindow::showLicence()
 {
     KApplication::showLicence();
 }
 void  MainWindow::showAbout()
 {
     QString version;
 #include <../version>
 
     QString cap = "About KOpieMail/Pi";
 	QString text =	i18n("KOpieMail/Platform-independent\n") +
                         "(OM/Pi) " + version + " - "
                       
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                        "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n"
 #endif
 		"www.pi-sync.net\n\n"
 
 
 
 "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n"
 		"KOpieMail/Pi is based on Opie Mail\n"
 		"Copyright (c) Rajko Albrecht and the Opie team\n"
 		"KOpieMail/Pi is licensed under the GPL\n"
 		"\n"
 		"KOpieMail/Pi uses LibEtPan - a mail stuff library\n"
         "Copyright (C) 2001, 2002 - DINH Viet Hoa\n"
 		"libEtPan has its own licence - see LibEtPan licence\n";
 
     KApplication::showText( cap, text );
 }
 void  MainWindow::showEtpanLicence()
 {
     KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
 
 } 
 void MainWindow::appMessage(const QCString &, const QByteArray &)
 {
     qDebug("appMessage implemented by subclass");
 }
 
 void MainWindow::slotAdjustLayout() {
 
     /*
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
     */
 }
 
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
     if ( hidden ) folderView->show();
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
     if ( hidden ) folderView->hide();
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, 100 );
     mailView->setColumnWidth( 2, 100 );
     mailView->setColumnWidth( 3, 50 );
     mailView->setColumnWidth( 4, 120 );
 }
 
 void MainWindow::slotEditSettings()
 {
 }
 
 void MainWindow::slotShowFolders( bool )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::refreshMailView(const QValueList<RecMailP>&)
 { 
     qDebug("not implemented:  ");
 }
 
 void MainWindow::mailLeftClicked(QListViewItem * )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::displayMail()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotDeleteMail()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int  )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotSendQueued()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotEditAccounts()
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotComposeMail()
 {
     qDebug("not implemented:  ");
 }
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 1da1e99..d7e384c 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -615,470 +615,471 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
 	      }
 	    else
 	      {
 		s = i18n("am").lower();
 		len = s.length();
 		if (str.mid(strpos, len) == s) {
 		  pm = false;
 		  strpos += len;
 		}
 		else
 		  goto error;
 	      }
 	  }
 	  break;
 
 	case 'k':
 	case 'H':
 	  g_12h = false;
 	  hour = readInt(str, strpos);
 	  if (hour < 0 || hour > 23)
 	    goto error;
 
 	  break;
 
 	case 'l':
 	case 'I':
 	  g_12h = true;
 	  hour = readInt(str, strpos);
 	  if (hour < 1 || hour > 12)
 	    goto error;
 
 	  break;
 
 	case 'M':
 	  minute = readInt(str, strpos);
 	  if (minute < 0 || minute > 59)
 	    goto error;
 
 	  break;
 
 	case 'S':
 	  second = readInt(str, strpos);
 	  if (second < 0 || second > 59)
 	    goto error;
 
 	  break;
 	}
     }
   if (g_12h)
     {
       hour %= 12;
       if (pm) hour += 12;
     }
 
   if (ok) *ok = true;
   return QTime(hour, minute, second);
 
  error:
   if (ok) *ok = false;
   return QTime(-1, -1, -1); // return invalid date if it didn't work
   // This will be removed in the near future, since it gives a warning on stderr.
   // The presence of the bool* (since KDE-3.0) removes the need for an invalid QTime.
 }
 
 QDateTime KLocale::readDateTime(const QString &intstr, 
 				IntDateFormat intIntDateFormat, 
 				bool* ok) const
 {
   bool ok1, ok2;
 
   // AT the moment we can not read any other format then ISODate
   if ( intIntDateFormat != ISODate )
     {
       qDebug("KLocale::readDateTime, only ISODate is supported.");
       return QDateTime();
     }  
 
   int pos = intstr.find("T");
   QString date = intstr.left(pos);
   QString time = intstr.mid(pos+1);
 
   QString dformat = dateFormat(intIntDateFormat);
   QString tformat = timeFormat(intIntDateFormat);
 
   QDate m_date = readDate(date, dformat, &ok1);
   QTime m_time = readTime(time, tformat, &ok2);
 
   QDateTime m_dt;
 
   if (ok)
     {
       if ((ok1 == false) || (ok2 == false))
 	*ok = false;
       else
 	*ok = true;
     }
 
   //only set values if both operations returned true.
   if ((ok1 == true) && (ok2 == true))
     {
       m_dt.setDate(m_date);
       m_dt.setTime(m_time);
     }
 
   //qDebug("KLocale::readDateTime() transformed %s into %s (%s), %s (%s) : err1=%i, err2=%i", intstr.latin1(), date.latin1(), dformat.latin1(), time.latin1(), tformat.latin1(), ok1, ok2);
   return m_dt;
 }
 
 QDate KLocale::readDate(const QString &intstr, 
 				IntDateFormat intIntDateFormat, 
 				bool* ok) const
 {
   bool ok1;
 
   QString dformat = dateFormat(intIntDateFormat);
 
   QDate m_date = readDate(intstr, dformat, &ok1);
 
   if (ok)
     *ok = ok1;
 
   //qDebug("KLocale::readDate() transformed %s into %s (%s), %s (%s) : err1=%i, err2=%i", intstr.latin1(), date.latin1(), dformat.latin1(), time.latin1(), tformat.latin1(), ok1, ok2);
   return m_date;
 }
 
 
 bool KLocale::use12Clock() const
 {
     return !mHourF24Format ;;
 }
 
 bool KLocale::weekStartsMonday() const
 {
     return mWeekStartsMonday;
 }
 
 int KLocale::weekStartDay() const
 {
     if ( mWeekStartsMonday )
         return 1;
     return 7;
 }
 
 QString KLocale::weekDayName(int i,bool shortName) const
 {
   if ( shortName )
     switch ( i )
       {
       case 1:  return i18n("Monday", "Mon");
       case 2:  return i18n("Tuesday", "Tue");
       case 3:  return i18n("Wednesday", "Wed");
       case 4:  return i18n("Thursday", "Thu");
       case 5:  return i18n("Friday", "Fri");
       case 6:  return i18n("Saturday", "Sat");
       case 7:  return i18n("Sunday", "Sun");
       }
   else
     switch ( i )
       {
       case 1:  return i18n("Monday");
       case 2:  return i18n("Tuesday");
       case 3:  return i18n("Wednesday");
       case 4:  return i18n("Thursday");
       case 5:  return i18n("Friday");
       case 6:  return i18n("Saturday");
       case 7:  return i18n("Sunday");
       }
 
   return QString::null;
 }
 
 QString KLocale::monthName(int i,bool shortName) const
 {
   if ( shortName )
     switch ( i )
       {
       case 1:   return i18n("January", "Jan");
       case 2:   return i18n("February", "Feb");
       case 3:   return i18n("March", "Mar");
       case 4:   return i18n("April", "Apr");
       case 5:   return i18n("May short", "May");
       case 6:   return i18n("June", "Jun");
       case 7:   return i18n("July", "Jul");
       case 8:   return i18n("August", "Aug");
       case 9:   return i18n("September", "Sep");
       case 10:  return i18n("October", "Oct");
       case 11:  return i18n("November", "Nov");
       case 12:  return i18n("December", "Dec");
       }
   else
     switch (i)
       {
       case 1:   return i18n("January");
       case 2:   return i18n("February");
       case 3:   return i18n("March");
       case 4:   return i18n("April");
       case 5:   return i18n("May long", "May");
       case 6:   return i18n("June");
       case 7:   return i18n("July");
       case 8:   return i18n("August");
       case 9:   return i18n("September");
       case 10:  return i18n("October");
       case 11:  return i18n("November");
       case 12:  return i18n("December");
       }
 
   return QString::null;
 }
 
 QString KLocale::country() const
 {
   return QString::null;
 }
 
 QString KLocale::dateFormat(IntDateFormat intIntDateFormat) const
 {
   const IntDateFormat dformat = (intIntDateFormat == Undefined)?mIntDateFormat:intIntDateFormat;
     
   if ( dformat == ISODate )
     return "%Y-%m-%d";
 
     if ( QApplication::desktop()->width() < 480 ) {
         if ( dformat == Default )
             return "%a %d %b %Y";
         else  if ( dformat == Format1 )
             return "%a %b %d %Y";
     } else {
         if ( dformat == Default )
             return "%A %d %B %Y";
         else  if ( dformat == Format1 )
             return "%A %B %d %Y";
 
     }
     return  mDateFormat ;
 }
 
 QString KLocale::dateFormatShort(IntDateFormat intIntDateFormat) const
 {
   const IntDateFormat dformat = (intIntDateFormat == Undefined)?mIntDateFormat:intIntDateFormat;
  
   if ( dformat == Default )
         return "%d.%m.%Y"; 
     else  if ( dformat == Format1 )
         return "%m.%d.%Y"; 
     else  if ( dformat == ISODate )  // = Qt::ISODate
         return "%Y-%m-%d"; 
   return mDateFormatShort ;
 
 }
 
 
 QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const
 {
     const IntDateFormat tformat = (intIntTimeFormat == Undefined)?mIntTimeFormat:intIntTimeFormat;
  
     if ( tformat == Default )
-      if ( mHourF24Format)
-	return "%H:%M:%S";
-      else
-	return "%I:%M:%S%p";
+        if ( mHourF24Format)
+            return "%H:%M:%S";
+        else
+            return "%I:%M:%S%p";
 
     else  if ( tformat == Format1 )
-      if ( mHourF24Format)
-        return "%H:%M:%S";
-      else
-	return "%I:%M:%S%p";
+        if ( mHourF24Format)
+            return "%H:%M:%S";
+        else
+            return "%I:%M:%S%p";
 
     else  if ( tformat == ISODate )  // = Qt::ISODate
-      if ( mHourF24Format)
-        return "%H:%M:%S";
-      else
-	return "%I:%M:%S%p";
-
+        if ( mHourF24Format)
+            return "%H:%M:%S";
+        else
+            return "%I:%M:%S%p";
+    // to satisfy the compiler
+    return "%H:%M:%S";
 }
 
 void KLocale::insertCatalogue ( const QString & )
 {
 }
 
 KCalendarSystem *KLocale::calendar()
 {
   if ( !mCalendarSystem ) {
     mCalendarSystem = new KCalendarSystemGregorian;
   }
   
   return mCalendarSystem;
 }
 
 int KLocale::timezoneOffset( QString timeZone )
 {
     int ret = 1001;
     int index = mTimeZoneList.findIndex( timeZone );
     if ( index < 24 ) 
        ret =  ( index-11 ) * 60 ;
     return ret;
 }
 
 QStringList KLocale::timeZoneList() const
 {
     return mTimeZoneList;
 }
 void KLocale::setTimezone( const QString &timeZone, bool oddTZ )
 {
     mTimeZoneOffset = timezoneOffset( timeZone );
     if ( oddTZ )
         mTimeZoneOffset += 30;
 }
 
 void KLocale::setDaylightSaving( bool b, int start , int end )
 {
     daylightEnabled = b;
     daylightStart = start;
     daylightEnd = end;
     mSouthDaylight = (end < start);
     // qDebug("klocale daylight %d %d %d ", b,  start ,  end );
 }
 
 int KLocale::localTimeOffset( const QDateTime &dt )
 {
     bool addDaylight = false;
     if ( daylightEnabled ) {
         int d_end, d_start;
         int dayofyear = dt.date().dayOfYear();
         int year = dt.date().year();
         int add = 0;
         if (  QDate::leapYear(year) )
             add = 1;
         QDate date (  year,1,1 );
         if ( daylightEnd > 59 )
             d_end = daylightEnd +add;
         else
             d_end = daylightEnd;
         if ( daylightStart > 59 )
             d_start = daylightStart +add;
         else
             d_start = daylightStart;
         QDate s_date = date.addDays( d_start -1 );
         QDate e_date = date.addDays( d_end -1 );
         int dof = s_date.dayOfWeek();
         if ( dof < 7 )
             s_date = s_date.addDays( -dof );
         dof = e_date.dayOfWeek();
         if ( dof < 7 )
             e_date = e_date.addDays( -dof );
         QTime startTime ( 3,0,0 );
         QDateTime startDt( s_date,  startTime );
         QDateTime endDt( e_date,  startTime );
         //qDebug("dayligt saving start %s end %s ",startDt.toString().latin1(),endDt.toString().latin1( ));
         if ( mSouthDaylight ) {
             if ( ! ( endDt < dt && dt < startDt) )
                 addDaylight = true;  
            } else {
             if ( startDt < dt && dt < endDt )
                 addDaylight = true;  
            
             
         }
     }
     int addMin = 0;
     if ( addDaylight )
         addMin = 60;
     return mTimeZoneOffset + addMin;
 }
 // ******************************************************************
 // added LR
 QString KLocale::formatNumber(double num, int precision) const
 {
   bool neg = num < 0;
   if (precision == -1) precision = 2;
   QString res = QString::number(neg?-num:num, 'f', precision);
   int pos = res.find('.');
   if (pos == -1) pos = res.length();
   else res.replace(pos, 1, decimalSymbol());
 
   while (0 < (pos -= 3))
     res.insert(pos, thousandsSeparator()); // thousand sep
 
   // How can we know where we should put the sign?
   res.prepend(neg?negativeSign():positiveSign());
 
   return res;
 }
 QString KLocale::formatNumber(const QString &numStr) const
 {
   return formatNumber(numStr.toDouble());
 }
 double KLocale::readNumber(const QString &_str, bool * ok) const
 {
   QString str = _str.stripWhiteSpace();
   bool neg = str.find(negativeSign()) == 0;
   if (neg)
     str.remove( 0, negativeSign().length() );
 
   /* will hold the scientific notation portion of the number.
      Example, with 2.34E+23, exponentialPart == "E+23"
   */
   QString exponentialPart;
   int EPos;
 
   EPos = str.find('E', 0, false);
 
   if (EPos != -1)
   {
     exponentialPart = str.mid(EPos);
     str = str.left(EPos);
   }
 
   int pos = str.find(decimalSymbol());
   QString major;
   QString minor;
   if ( pos == -1 )
     major = str;
   else
     {
       major = str.left(pos);
       minor = str.mid(pos + decimalSymbol().length());
     }
 
   // Remove thousand separators
   int thlen = thousandsSeparator().length();
   int lastpos = 0;
   while ( ( pos = major.find( thousandsSeparator() ) ) > 0 )
   {
     // e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N
     int fromEnd = major.length() - pos;
     if ( fromEnd % (3+thlen) != 0 // Needs to be a multiple, otherwise it's an error
         || pos - lastpos > 3 // More than 3 digits between two separators -> error
         || pos == 0          // Can't start with a separator
         || (lastpos>0 && pos-lastpos!=3))   // Must have exactly 3 digits between two separators
     {
       if (ok) *ok = false;
       return 0.0;
     }
 
     lastpos = pos;
     major.remove( pos, thlen );
   }
   if (lastpos>0 && major.length()-lastpos!=3)   // Must have exactly 3 digits after the last separator
   {
     if (ok) *ok = false;
     return 0.0;
   }
 
   QString tot;
   if (neg) tot = '-';
 
   tot += major + '.' + minor + exponentialPart;
 
   return tot.toDouble(ok);
 }
 QString KLocale::decimalSymbol() const
 {
 
   return m_decimalSymbol;
 }
 
 QString KLocale::thousandsSeparator() const
 {
 
   return m_thousandsSeparator;
 }
 QString KLocale::positiveSign() const
 {
   return m_positiveSign;
 }
 
 QString KLocale::negativeSign() const
 {
   return m_negativeSign;
 }
diff --git a/microkde/kidmanager.cpp b/microkde/kidmanager.cpp
index 8cf486a..e687e5d 100644
--- a/microkde/kidmanager.cpp
+++ b/microkde/kidmanager.cpp
@@ -1,136 +1,136 @@
 #include "kidmanager.h"
 
 KIdManager::KIdManager()
 {
    
 }
 // :profilename;12;id_withLen12;123456:
 // 123456 is the csum
 QString KIdManager::setId (const QString& idString,const QString& prof,const QString& idvalue )
 {
     int startProf;
     int startIDnum;
     int startIDnumlen;
     int startID;
     int lenID;
     int startCsum;
     int lenCsum;
     int endall;
     QString newIDString;
     if ( KIdManager::getNumbers (idString, prof, startProf, startIDnum, startIDnumlen,startID, lenID, startCsum, lenCsum, endall) ) {
         newIDString = idString.left(startIDnum ) + QString::number( idvalue.length() ) +";"+idvalue+ ";"+idString.mid(  startCsum );
     } else {
         newIDString = idString + prof+";"+ QString::number( idvalue.length() ) +";"+idvalue +";0:";
     }
     //qDebug("setID:profile:%s*retval:%s*idvalue:%s* ", prof.latin1(), newIDString.latin1() ,idvalue.latin1() );
     return newIDString;
 }
 QString KIdManager::getId (const QString& idString,const QString& prof )
 {
     int startProf;
     int startIDnum;
     int startIDnumlen;
     int startID;
     int lenID;
     int startCsum;
     int lenCsum;
     int endall;
     QString idval = "";
     if ( KIdManager::getNumbers (idString, prof, startProf, startIDnum, startIDnumlen,startID, lenID, startCsum, lenCsum, endall) )
         idval = idString.mid(  startID, lenID );
 
     //qDebug("getID:profile:%s*retval:%s*idstring:%s* ", prof.latin1(), idval.latin1() ,idString.latin1() );
     return idval;
 
 }
 
 QString KIdManager::removeId (const QString& idString,const QString& prof )
 { 
     int startProf;
     int startIDnum;
     int startIDnumlen;
     int startID;
     int lenID;
     int startCsum;
     int lenCsum;
     int endall;
     QString newIDString;
     if ( KIdManager::getNumbers (idString, prof, startProf, startIDnum, startIDnumlen,startID, lenID, startCsum, lenCsum, endall) ) {
         newIDString = idString.left(startProf) + idString.mid(  endall+1 );
     } else {
         newIDString = idString;
     }
     //qDebug("removeID:profile:%s*retval:%s*oldidstring:%s* ", prof.latin1(), newIDString.latin1() ,idString.latin1() );
     return newIDString;
 }
 
 QString KIdManager::setCsum (const QString& idString,const QString& prof,const QString& idCsum )
 {
     int startProf;
     int startIDnum;
     int startIDnumlen;
     int startID;
     int lenID;
     int startCsum;
     int lenCsum;
     int endall;
     QString newIDString;
     if ( KIdManager::getNumbers (idString, prof, startProf, startIDnum, startIDnumlen,startID, lenID, startCsum, lenCsum, endall) ) {
         newIDString = idString.left(startCsum) + idCsum+ idString.mid(  endall +1);
     } else {
         newIDString = idString + prof + ";3;_u_;"+ idCsum + ":";
     }
     //qDebug("setCsum:profile:%s*retval:%s*idCsum:%s* ", prof.latin1(), newIDString.latin1() ,idCsum.latin1() );
     return newIDString;
 }
 QString KIdManager::getCsum (const QString& idString,const QString& prof )
 {
     int startProf;
     int startIDnum;
     int startIDnumlen;
     int startID;
     int lenID;
     int startCsum;
     int lenCsum;
     int endall;
     QString idval = "";
     if ( KIdManager::getNumbers (idString, prof, startProf, startIDnum, startIDnumlen,startID, lenID, startCsum, lenCsum, endall) )
         idval = idString.mid(  startCsum, lenCsum );
 
     //qDebug("getCsum:profile:%s*retval:%s*idstring:%s* ", prof.latin1(), idval.latin1() ,idString.latin1() );
     return idval; 
 }
 // :profilename;12;id_withLen12;123456:
 bool KIdManager::getNumbers (const QString& idString,const QString& prof, int &startProf, int &startIDnum, int &startIDnumlen,int &startID, int& lenID, int &startCsum, int &lenCsum, int & endall)
 {
     startProf = idString.find( ":"+prof+";" );
     if ( startProf >= 0 ) {
         startIDnum = prof.length()+2+startProf;
         startID = idString.find( ";", startIDnum ) +1;
         startIDnumlen = startID - startIDnum - 1;
         if ( startIDnum > 0 ) {
             bool ok;
             lenID = idString.mid ( startIDnum,startIDnumlen).toInt( &ok );
             if (ok) {
                 startCsum = startID+lenID+1;
                 endall =  idString.find( ":", startCsum )-1;
                 if ( endall < 0 ) {
                     qDebug("Error getNumbers: andall not found ");
                     return false;
                 }
                 lenCsum = endall-startCsum+1;
             }
             else {
-                qDebug("Error getNumbers:length is no number:*%s* ", idString.mid ( startIDnum,startIDnumlen).toInt( &ok ));
+                qDebug("Error getNumbers:length is no number:*%s* ", idString.mid ( startIDnum,startIDnumlen).latin1());
                 return false;
             }
         } else {
             qDebug("Error in KIdManager::getNumbers.startIDnum <= 0");
             return false;
         }
     } else {
         //qDebug("getnumbers: profile not found *%s* ",prof.latin1() );
         return false;
     }
     return true;
 }
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index 5bd9eb7..566b8f4 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -1,374 +1,374 @@
 /*
     This file is part of libkresources.
 
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
     Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org>
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kglobal.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <qfile.h>
 
 #include "resource.h"
 #include "factory.h"
 #include "managerimpl.h"
 
 using namespace KRES;
 
 ManagerImpl::ManagerImpl( const QString &family )
   : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ),
     mFactory( 0 )
 
 {
   kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl;
 
 
 }
 
 ManagerImpl::~ManagerImpl()
 {
   kdDebug(5650) << "ManagerImpl::~ManagerImpl()" << endl;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     delete *it;
   }
 
   delete mStdConfig;
 }
 
 void ManagerImpl::createStandardConfig()
 {
   if ( !mStdConfig ) {
     QString file = locateLocal( "data", KGlobal::getAppName()
                                 + "/kresources/" + mFamily + "rc" ); 
     if (   mFamily == "tmpcontact" ) {
         if (QFile::exists ( file ) ){
             QFile::remove ( file ); 
             qDebug("removed tmp rc file: %s ", file.latin1());
         }
     }
     mStdConfig = new KConfig( file );
   }
 
   mConfig = mStdConfig;
 }
 
 void ManagerImpl::readConfig( KConfig *cfg )
 {
   kdDebug(5650) << "ManagerImpl::readConfig()" << endl;
 
   delete mFactory;
   mFactory = Factory::self( mFamily );
 
   if ( !cfg ) {
     createStandardConfig();
   } else {
     mConfig = cfg;
   }
 
   mStandard = 0;
 
   mConfig->setGroup( "General" );
 
   QStringList keys = mConfig->readListEntry( "ResourceKeys" );
   keys += mConfig->readListEntry( "PassiveResourceKeys" );
 
   QString standardKey = mConfig->readEntry( "Standard" );
 
   for ( QStringList::Iterator it = keys.begin(); it != keys.end(); ++it ) {
     readResourceConfig( *it, false );
   }
 
 }
 
 void ManagerImpl::writeConfig( KConfig *cfg )
 {
 //USqDebug("ManagerImpl::writeConfig begin this= %ul cfg=%ul", this, cfg);
 
 
   kdDebug(5650) << "ManagerImpl::writeConfig()" << endl;
 
   if ( !cfg ) {
     createStandardConfig();
   } else {
     mConfig = cfg;
   }
 
   QStringList activeKeys;
   QStringList passiveKeys;
 
   // First write all keys, collect active and passive keys on the way
   Resource::List::Iterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     writeResourceConfig( *it, false );
 
     QString key = (*it)->identifier();
     if( (*it)->isActive() )
       activeKeys.append( key );
     else
       passiveKeys.append( key );
   }
 
   // And then the general group
 
   kdDebug(5650) << "Saving general info" << endl;
   mConfig->setGroup( "General" );
   mConfig->writeEntry( "ResourceKeys", activeKeys );
   mConfig->writeEntry( "PassiveResourceKeys", passiveKeys );
   if ( mStandard )
     mConfig->writeEntry( "Standard", mStandard->identifier() );
   else
     mConfig->writeEntry( "Standard", "" );
 
   mConfig->sync();
   kdDebug(5650) << "ManagerImpl::save() finished" << endl;
 
 //US qDebug("ManagerImpl::writeConfig end this= %ul cfg=%ul", this, cfg);
 
 }
 
 void ManagerImpl::add( Resource *resource, bool useDCOP )
 {
-qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource);
+    //qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource);
 
   resource->setActive( true );
 
   if ( mResources.isEmpty() ) {
     mStandard = resource;
   }
 
   mResources.append( resource );
 
   writeResourceConfig( resource, true );
 
-  qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
+  //qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
 
 }
 
 void ManagerImpl::remove( Resource *resource, bool useDCOP )
 {
   if ( mStandard == resource ) mStandard = 0;
   removeResource( resource );
 
   mResources.remove( resource );
 
   delete resource;
 
   kdDebug(5650) << "Finished ManagerImpl::remove()" << endl;
 }
 
 void ManagerImpl::setActive( Resource *resource, bool active )
 {
   if ( resource && resource->isActive() != active ) {
     resource->setActive( active );
   }
 }
 
 Resource *ManagerImpl::standardResource()
 {
   return mStandard;
 }
 
 void ManagerImpl::setStandardResource( Resource *resource )
 {
   mStandard = resource;
 }
 
 void ManagerImpl::resourceChanged( Resource *resource )
 {
   writeResourceConfig( resource, true );
 
 
 //  ManagerIface_stub allManagers( "*", "ManagerIface_" + mFamily.utf8() );
 //  allManagers.dcopResourceModified( resource->identifier() );
 }
 
 // DCOP asynchronous functions
 //US since we work from inside the application, we call the methods directly.
 
 QStringList ManagerImpl::resourceNames()
 {
   QStringList result;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     result.append( (*it)->resourceName() );
   }
   return result;
 }
 
 Resource::List *ManagerImpl::resourceList()
 {
   return &mResources;
 }
 
 QPtrList<Resource> ManagerImpl::resources()
 {
   QPtrList<Resource> result;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     result.append( *it );
   }
   return result;
 }
 
 QPtrList<Resource> ManagerImpl::resources( bool active )
 {
   QPtrList<Resource> result;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     if ( (*it)->isActive() == active ) {
       result.append( *it );
     }
   }
   return result;
 }
 
 void ManagerImpl::setListener( ManagerImplListener *listener )
 {
   mListener = listener;
 }
 
 Resource* ManagerImpl::readResourceConfig( const QString& identifier,
                                                    bool checkActive )
 {
   kdDebug() << "ManagerImpl::readResourceConfig() " << identifier << endl;
 
 //  qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1());
 
   mConfig->setGroup( "Resource_" + identifier );
 #ifdef _WIN32_
   // we use plugins on win32. the group is stored in a static variable
   // such that gourp info not avail on win32 plugins
   // to fix that, it would be a looooot of work
   mConfig->setTempGroup( "Resource_" + identifier );
 #endif
   QString type = mConfig->readEntry( "ResourceType" );
   QString name = mConfig->readEntry( "ResourceName" );
   Resource *resource = mFactory->resource( type, mConfig );
   if ( !resource ) {
       qDebug("Failed to create resource with id %s ",identifier.latin1() );
       return 0;
   }
 
   if ( resource->identifier().isEmpty() )
     resource->setIdentifier( identifier );
 
   mConfig->setGroup( "General" );
 
   QString standardKey = mConfig->readEntry( "Standard" );
   if ( standardKey == identifier ) {
     mStandard = resource;
   }
 
   if ( checkActive ) {
     QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
     resource->setActive( activeKeys.contains( identifier ) );
   }
   mResources.append( resource );
 
   return resource;
 }
 
 void ManagerImpl::writeResourceConfig( Resource *resource,
                                                bool checkActive )
 {
   QString key = resource->identifier();
 
   kdDebug(5650) << "Saving resource " << key << endl;
 
   if ( !mConfig ) createStandardConfig();
 
   mConfig->setGroup( "Resource_" + key );
   resource->writeConfig( mConfig );
 
   mConfig->setGroup( "General" );
   QString standardKey = mConfig->readEntry( "Standard" );
 
   if ( resource == mStandard  && standardKey != key )
     mConfig->writeEntry( "Standard", resource->identifier() );
   else if ( resource != mStandard && standardKey == key )
     mConfig->writeEntry( "Standard", "" );
 
   if ( checkActive ) {
     QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
     if ( resource->isActive() && !activeKeys.contains( key ) ) {
       activeKeys.append( resource->identifier() );
       mConfig->writeEntry( "ResourceKeys", activeKeys );
     } else if ( !resource->isActive() && activeKeys.contains( key ) ) {
       activeKeys.remove( key );
       mConfig->writeEntry( "ResourceKeys", activeKeys );
     }
   }
 
   mConfig->sync();
 }
 
 void ManagerImpl::removeResource( Resource *resource )
 {
   QString key = resource->identifier();
 
   if ( !mConfig ) createStandardConfig();
 
   mConfig->setGroup( "General" );
   QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" );
   if ( activeKeys.contains( key ) ) {
     activeKeys.remove( key );
     mConfig->writeEntry( "ResourceKeys", activeKeys );
   } else {
     QStringList passiveKeys = mConfig->readListEntry( "PassiveResourceKeys" );
     passiveKeys.remove( key );
     mConfig->writeEntry( "PassiveResourceKeys", passiveKeys );
   }
 
   QString standardKey = mConfig->readEntry( "Standard" );
   if ( standardKey == key ) {
     mConfig->writeEntry( "Standard", "" );
   }
 
   mConfig->deleteGroup( "Resource_" + resource->identifier() );
 
   mConfig->sync();
 }
 
 Resource* ManagerImpl::getResource( const QString& identifier )
 {
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     if ( (*it)->identifier() == identifier )
       return *it;
   }
   return 0;
 }