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
@@ -2722,49 +2722,49 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
 
     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 {
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
@@ -133,98 +133,98 @@ class CardViewSeparator
 };
 
 //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()
 {
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 4abf859..13d6681 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -126,107 +126,108 @@ void KOPrefsDialog::setupMainTab()
   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 )
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,39 +1,40 @@
 #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 );
             }
         }
     }
@@ -124,74 +125,75 @@ mailimf_address_list *Generatemail::parseAddresses(const QString&addr ) {
     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 );
             }
@@ -206,71 +208,73 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
     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() ) );
 }
@@ -377,48 +381,50 @@ mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Ma
                 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:
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
@@ -21,27 +21,28 @@ 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
@@ -204,49 +204,50 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
         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);
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
@@ -738,50 +738,50 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
         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);
         }
     }
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
@@ -62,49 +62,49 @@ public:
     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;
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 3013931..8c0a4cb 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -86,49 +86,50 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     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);
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
@@ -847,65 +847,66 @@ QString KLocale::dateFormat(IntDateFormat intIntDateFormat) const
     }
     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;
 }
 
diff --git a/microkde/kidmanager.cpp b/microkde/kidmanager.cpp
index 8cf486a..e687e5d 100644
--- a/microkde/kidmanager.cpp
+++ b/microkde/kidmanager.cpp
@@ -100,37 +100,37 @@ QString KIdManager::getCsum (const QString& idString,const QString& prof )
     //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
@@ -136,61 +136,61 @@ void ManagerImpl::writeConfig( KConfig *cfg )
     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()
 {