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
@@ -57,4 +57,5 @@ IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
 //     mSearchText->setMaximumWidth(30);
 // #endif //KAB_EMBEDDED
+  //mSearchText->setMaximumWidth(60);
 
   
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 7acf1ee..a6fc677 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -362,10 +362,10 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   
   // 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()
@@ -778,4 +778,10 @@ void KABCore::beamMySelf()
   }
 }
+void  KABCore::updateMainWindow()
+{
+                  
+    mMainWindow->showMaximized();
+    mMainWindow->update();
+}
 void KABCore::resizeEvent(QResizeEvent* e )
 {
@@ -783,18 +789,24 @@ void KABCore::resizeEvent(QResizeEvent* e )
         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()));
+                }
             }
         }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index fe2d3a2..88e83f0 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -362,4 +362,5 @@ class KABCore : public QWidget, public KSyncInterface
   private slots:
     void updateToolBar();
+    void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
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
@@ -106,5 +106,5 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
   char * wordutf8;
   int type;
-
+  int appendNewLine;
   cur_token = * index;
 
@@ -118,7 +118,7 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
 
   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);