made ompi compiling on desktop

1 files changed, 7 insertions, 6 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 8eb6d27..0cd0b23 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -21,28 +21,28 @@
 #include <qiconset.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 #include <kabc/addresseedialog.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addressee.h>
 #ifdef DESKTOP_VERSION
+#include <qapplication.h>
 #include <kabc/addresseedialog.h>
-#else //DESKTOP_VERSION
-#include <libkdepim/externalapphandler.h>
 #endif //DESKTOP_VERSION
+#include <libkdepim/externalapphandler.h>
 
 #include "koprefs.h"
 
 //using namespace Opie::Core;
 //using namespace Opie::Ui;
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal )
     : ComposeMailUI( parent, name, modal )
 {
     mPickLineEdit = 0;
     connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
     settings = s;
@@ -105,30 +105,31 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
     connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
     connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
     connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
     connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
     connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
     connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) );
     mMail = 0;
     warnAttach = true; 
     QIconSet icon;
     //icon = SmallIcon("fileexport");
     icon = SmallIcon("filesave");
-    if ( QApplication::desktop()->width() < 320 )
+    SaveButton->setIconSet (icon ) ;
+    if ( QApplication::desktop()->width() < 320 ) {
         SaveButton->setText ("") ;
+        SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ;
+    }
     else
-        SaveButton->setText (i18n("Save")) ;
-    SaveButton->setIconSet (icon ) ;
-    SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ;
+        SaveButton->setText (i18n("Save"));
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
     QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold );
     QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold );
 #endif
     message->setFont ( KOPrefs::instance()->mComposeFont );
     message->setWordWrap (QMultiLineEdit::WidgetWidth);
     if ( smtpAccounts.count() > 0 ) {
         fillValues( smtpAccountBox->currentItem() );
     } else {
         QMessageBox::information( 0, i18n( "Problem" ),
                                   i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ),