if there are new mails the taskbar icon stays 'cause not all

machines have a (working) mail-LED and users wonders why them don't
get a notification.
Inserted a block for SIGPIPE - that would let opie crash otherwise if
happen.

2 files changed, 11 insertions, 8 deletions

diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index 9c0d32f..ce1e7ac 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -1,97 +1,100 @@
 #include <qpainter.h>
 #include <qtimer.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/applnk.h>
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 
 #include <libmailwrapper/settings.h>
 
 #include "mailapplet.h"
 
 /* UNIX */
 #include <signal.h>
 
 using namespace Opie::Core;
 
 MailApplet::MailApplet( QWidget *parent )
-: QWidget( parent ) {
+: QLabel( parent ) {
 
     m_config = new Config( "mail" );
     m_config->setGroup( "Applet" );
 
-    setFixedWidth( AppLnk::smallIconSize() );
+    //setFixedWidth( AppLnk::smallIconSize() );
     setFixedHeight( AppLnk::smallIconSize() );
 
     hide();
 
     m_newMails = 0;
     m_statusMail = 0l;
 
     /* for networking we must block SIGPIPE and Co. */
     struct sigaction blocking_action,temp_action;
     blocking_action.sa_handler = SIG_IGN;
     sigemptyset(&(blocking_action.sa_mask));
     blocking_action.sa_flags = 0;
     sigaction(SIGPIPE,&blocking_action,&temp_action);
 
     if ( !m_config->readBoolEntry( "Disabled", false ) ) {
         // delay 5 sec until the whole mail backend gets started .-)
         QTimer::singleShot( 5000, this, SLOT( startup() ) );
     }
     repaint( true );
 }
 
 
 MailApplet::~MailApplet() {
     if ( m_statusMail )
         delete m_statusMail;
     if ( m_config )
         delete m_config;
 }
 
-void MailApplet::paintEvent( QPaintEvent* ) {
+void MailApplet::paintEvent( QPaintEvent*ev )
+{
     QPainter p( this );
     p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/inbox" ) );
+    QLabel::paintEvent(ev);
+#if 0
     QFont f( "vera", AppLnk::smallIconSize() );
     QFontMetrics fm( f );
     p.setFont( f );
     p.setPen( Qt::blue );
     p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) );
+#endif
     return;
-
 }
 
 void MailApplet::mouseReleaseEvent( QMouseEvent* e ) {
     slotClicked();
 }
 
 void MailApplet::slotClicked() {
     QCopEnvelope e( "QPE/System", "execute(QString)" );
     e << QString( "opiemail" );
 
     ODevice *device = ODevice::inst();
     if ( !device-> ledList().isEmpty() ) {
         OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
 
         device->setLedState( led, Led_Off );
     }
     if (m_statusMail)
         m_statusMail->reset_status();
     hide();
 }
 
 void MailApplet::startup()
 {
     Settings *settings = new Settings();
     QList<Account> ma = settings->getAccounts();
     m_statusMail = new StatusMail( ma );
     delete settings;
 
     //m_intervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
     m_intervalMs = 100;
     m_intervalTimer = new QTimer();
     m_intervalTimer->start( m_intervalMs );
@@ -105,56 +108,55 @@ void MailApplet::slotCheck() {
     if ( newIntervalMs != m_intervalMs ) {
         m_intervalTimer->changeInterval( newIntervalMs );
         m_intervalMs = newIntervalMs;
     }
 
     if (m_statusMail == 0) {
         return;
     }
 
     folderStat stat;
     m_statusMail->check_current_stat( stat );
     int newMailsOld = m_newMails;
     m_newMails = stat.message_unseen;
     odebug << QString( "test %1" ).arg( m_newMails ) << oendl;
     if ( m_newMails > 0) {
         if (isHidden())
             show();
         if (newMailsOld != m_newMails) {
             ODevice *device = ODevice::inst();
             if ( m_config->readBoolEntry( "BlinkLed", true ) ) {
                 if ( !device->ledList().isEmpty() ) {
                     OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
                     device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On );
                 }
             }
             if ( m_config->readBoolEntry( "PlaySound", false ) )
                 device->playAlarmSound();
         }
         Config cfg( "mail" );
         cfg.setGroup( "Status" );
         cfg.writeEntry( "newMails", m_newMails );
         {
-            odebug << "QCop abschicken" << oendl;
             QCopEnvelope env( "QPE/Pim", "newMails(int)" );
             env <<  m_newMails;
         }
-        odebug << "QCop abschicken done" << oendl;
-        repaint( true );
+        setText(QString::number( m_newMails ));
+//        repaint( true );
     } else {
         ODevice *device = ODevice::inst();
         if ( !isHidden() )
             hide();
         if ( !device->ledList().isEmpty() ) {
             OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
             device->setLedState( led, Led_Off );
         }
 
         if ( newMailsOld != m_newMails ) {
             Config cfg( "mail" );
             cfg.setGroup( "Status" );
             cfg.writeEntry( "newMails", m_newMails );
             QCopEnvelope env( "QPE/Pim", "newMails(int)" );
             env <<  m_newMails;
         }
     }
 }
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h
index b4d3742..f28f274 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.h
+++ b/noncore/net/mail/taskbarapplet/mailapplet.h
@@ -1,38 +1,39 @@
 #ifndef MAILAPPLET_H
 #define MAILAPPLET_H
 
 #include <qbutton.h>
+#include <qlabel.h>
 
 #include <libmailwrapper/statusmail.h>
 
 class Config;
 class QTimer;
 
-class MailApplet : public QWidget {
+class MailApplet : public QLabel {
 
     Q_OBJECT
 
 public:
     MailApplet( QWidget *parent = 0 );
     ~MailApplet();
 
 protected:
     void gotNewMail();
     void mouseReleaseEvent( QMouseEvent* );
     void paintEvent( QPaintEvent* );
 
 protected slots:
     void startup();
     void slotCheck();
     void slotClicked();
 private:
     Config *m_config;
     QTimer *m_intervalTimer;
     int m_intervalMs;
     StatusMail* m_statusMail;
     int m_newMails;
 
 };
 
 #endif