1 files changed, 9 insertions, 2 deletions

diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h
index 549683b..994fec5 100644
--- a/noncore/unsupported/mailit/emailclient.h
+++ b/noncore/unsupported/mailit/emailclient.h
@@ -32,24 +32,25 @@
 #include <qaction.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qtoolbutton.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qprogressbar.h>
 #include <qstatusbar.h>
 #include <qdir.h>
 #include <stdlib.h>
 #include <opie/otabwidget.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <qtimer.h>
 
 #include "emailhandler.h"
 #include "emaillistitem.h"
 #include "textparser.h"
 #include "editaccount.h"
 #include "maillist.h"
 #include "addresslist.h"
 
 #include <qpe/config.h>
 
 class AccountList : public QList<MailAccount>
@@ -61,28 +62,27 @@ private:
   MailAccount *ac;
 };
 
 //class EmailClient : public EmailClientBase
 class EmailClient : public QMainWindow
 {
     Q_OBJECT
 
 public:
   EmailClient( QWidget* parent, const char* name, WFlags fl = 0 );
   ~EmailClient();
   AddressList* getAdrListRef();
-  void download(Email*);
 
 protected:
-  void timerEvent(QTimerEvent*);
+  //void timerEvent(QTimerEvent*);
   
 signals:
   void composeRequested();
   void viewEmail(QListView *, Email *);
   void mailUpdated(Email *);
   void newCaption(const QString &);
   void replyRequested(Email&, bool&);
   void forwardRequested(Email&);
   void removeItem(EmailListItem*, bool&);
   /*void reply(Email&);
   void replyAll(Email&);
   void remove(Email&);
@@ -107,54 +107,61 @@ public slots:
   void mailArrived(const Email &mail, bool fromDisk);
   void allMailArrived(int);
   void saveMail(QString fileName, QListView *view);
   void selectAccount(int);
   void editAccount(int);
   void updateAccounts();
   void deleteAccount(int);
   void deleteMail(EmailListItem *mailItem, bool &inbox);
   void setTotalSize(int);
   void setMailSize(int);
   void setDownloadedSize(int);
   void moveMailFront(Email *mailPtr);
+  void download(Email*);
 /*  void reply();
   void replyAll();
   void forward();
   void remove();*/
 
+private slots:
+  void receive(const QCString&, const QByteArray&);
+  
 private:
   void init();
+  void initStatusBar(QWidget*);
   void readMail();
   QString getPath(bool enclosurePath);
   void readSettings();
   void saveSettings();
   Email* getCurrentMail();
   int timerID;
   Config *mailconf;
   int newAccountId, idCount, mailIdCount;
   int accountIdCount;
   AccountList accountList;
   AddressList *addressList;
   
   EditAccount *editAccountView;
   EmailListItem *item;
   EmailHandler *emailHandler;
   QList<Email> quedMessages;
   MailList mailDownloadList;
   MailList tempMailDownloadList;
   
   bool sending, receiving, previewingMail, allAccounts;
   QString lineShift;
   MailAccount account, *currentAccount;
   
+  QCopChannel* channel;
+  
   QToolBar *bar;
   QProgressBar *progressBar;
   QStatusBar *statusBar;
   QLabel *status1Label, *status2Label;
   QToolButton *getMailButton;
   QAction *sendMailButton;
   QAction *composeButton;
   QAction *cancelButton;
   QAction *deleteButton;
   //QToolButton *setAccountButton;
   
   QMenuBar *mb;