4 files changed, 27 insertions, 13 deletions

diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 78eaf65..dd2121a 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -47,24 +47,25 @@ IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
 #ifdef DESKTOP_VERSION
   QLabel *label = new QLabel( i18n( "Search:" ), this );
   label->setAlignment( QLabel::AlignVCenter | QLabel::AlignRight );
   layout->addWidget( label );
 #endif //KAB_EMBEDDED
 
   mSearchText = new KLineEdit( this );
   layout->addWidget( mSearchText );
 // #ifdef KAB_EMBEDDED
 //   if (KGlobal::getOrientation() == KGlobal::Portrait)
 //     mSearchText->setMaximumWidth(30);
 // #endif //KAB_EMBEDDED
+  //mSearchText->setMaximumWidth(60);
 
   
   mFieldCombo = new QComboBox( false, this );
   layout->addWidget( mFieldCombo );
   mFieldCombo->setMaximumHeight( 34 );
   QToolTip::add( mFieldCombo, i18n( "Select Incremental Search Field" ) );
 
 // #ifndef KAB_EMBEDDED
 //   resize( QSize(420, 50).expandedTo( sizeHint() ) );
 // #else //KAB_EMBEDDED
 //   resize( QSize(30, 10).expandedTo( sizeHint() ) );
 // #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7acf1ee..a6fc677 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -352,30 +352,30 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   mMessageTimer = new QTimer( this ); 
   connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) );
   mEditorDialog = 0;
   createAddresseeEditorDialog( this );
   setModified( false );  
   mBRdisabled = false;
 #ifndef DESKTOP_VERSION
   infrared  = 0;
 #endif
   //toggleBeamReceive( );
   
   // we have a toolbar repainting error on the Zaurus when starting KA/Pi
-    QTimer::singleShot( 1000, this , SLOT ( updateToolBar()));
+    QTimer::singleShot( 10000, this , SLOT ( updateToolBar()));
 }
 
 void KABCore::updateToolBar()
 {
-    mMainWindow->toolBar()->repaint();
+    mMainWindow->toolBar()->update();
 }
 KABCore::~KABCore()
 {
     //  save();
     //saveSettings();
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
     mAddressBook = 0;
     KABC::StdAddressBook::close();
     
     delete syncManager;
 #ifndef DESKTOP_VERSION
@@ -768,43 +768,55 @@ void KABCore::beamMySelf()
   if (!a.isEmpty())
   {
     QStringList uids;
     uids << a.uid();
 
         beamVCard(uids);
   } else {
       KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) );
 
 
   }
 }
+void  KABCore::updateMainWindow()
+{
+                  
+    mMainWindow->showMaximized();
+    mMainWindow->update();
+}
 void KABCore::resizeEvent(QResizeEvent* e )
 {
     if ( !mMiniSplitter )
         return;
     if ( QApplication::desktop()->width() >= 480 ) {
-        int fac =  QApplication::desktop()->width()/QApplication::desktop()->height();
-        if ( fac > 0 ) { // e.g. 640x480
+        if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480
             if ( mMiniSplitter->orientation() == Qt::Vertical ) {
                 mMiniSplitter->setOrientation(  Qt::Horizontal);
                 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
-                if ( QApplication::desktop()->width() <= 640 )
-                    topLevelWidget()->showMaximized();
+                if ( QApplication::desktop()->width() <= 640 ) {
+                    //mMainWindow->setMaximumSize( QApplication::desktop()->size()  );
+                    mViewManager->getFilterAction()->setComboWidth( 150 );
+                    QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+                }
             }
-        } else {// e.g. 480x640
+        } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640
             if ( mMiniSplitter->orientation() == Qt::Horizontal ) {
                 mMiniSplitter->setOrientation( Qt::Vertical );
                 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
-                if ( QApplication::desktop()->width() <= 640 )
-                    topLevelWidget()->showMaximized();
+                if ( QApplication::desktop()->width() <= 640 ) {
+                    //mMainWindow->setMaximumSize( QApplication::desktop()->size()  );
+                    mMainWindow->showMinimized();
+                    mViewManager->getFilterAction()->setComboWidth( 0 );
+                    QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
+                }
             }
         }
     }
 
 }
 void KABCore::export2phone()
 {
 
     QStringList uids;
     XXPortSelectDialog dlg( this, false, this );
     if ( dlg.exec() )
         uids = dlg.uids();
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index fe2d3a2..88e83f0 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -352,24 +352,25 @@ class KABCore : public QWidget, public KSyncInterface
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   public slots:
     void recieve(QString cmsg );
     void getFile( bool success );
     void syncFileRequest();
     void setDetailsVisible( bool visible );
     void setDetailsToState();
     //    void slotSyncMenu( int );
   private slots:
     void updateToolBar();
+    void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setCaptionBack();
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
     void removeVoice();
diff --git a/kmicromail/libetpan/mime/mailmime_decode.c b/kmicromail/libetpan/mime/mailmime_decode.c
index b2ab0f7..bb7638e 100644
--- a/kmicromail/libetpan/mime/mailmime_decode.c
+++ b/kmicromail/libetpan/mime/mailmime_decode.c
@@ -96,39 +96,39 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
     size_t * index, const char * tocode,
     char ** result)
 {
   MMAPString * gphrase;
   struct mailmime_encoded_word * word;
   int first;
   size_t cur_token;
   int r;
   int res;
   char * str;
   char * wordutf8;
   int type;
-
+  int appendNewLine;
   cur_token = * index;
 
   gphrase = mmap_string_new("");
   if (gphrase == NULL) {
     res = MAILIMF_ERROR_MEMORY;
     goto err;
   }
 
   first = TRUE;
 
   type = TYPE_ERROR; /* XXX - removes a gcc warning */
-  // LUTZ add
-  int appendNewLine = FALSE;
-  while (1) { //while
+  /* LUTZ add*/
+  appendNewLine = FALSE;
+  while (1) { 
 
       r = mailmime_encoded_word_parse(message, length, &cur_token, &word);
       if (r == MAILIMF_NO_ERROR) {
           if (!first) {
               if (type != TYPE_ENCODED_WORD) {
                   if (mmap_string_append_c(gphrase, ' ') == NULL) {
                       mailmime_encoded_word_free(word);
                       res = MAILIMF_ERROR_MEMORY;
                       goto free;
                   }
               }
           }