-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 17 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.h | 0 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailappletimpl.cpp | 13 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailappletimpl.h | 0 |
4 files changed, 17 insertions, 13 deletions
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index 5d98783..35198d1 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp | |||
@@ -37,8 +37,10 @@ MailApplet::MailApplet( QWidget *parent ) | |||
37 | 37 | ||
38 | 38 | ||
39 | MailApplet::~MailApplet() { | 39 | MailApplet::~MailApplet() { |
40 | if (m_statusMail) delete m_statusMail; | 40 | if ( m_statusMail ) |
41 | if (m_config) delete m_config; | 41 | delete m_statusMail; |
42 | if ( m_config ) | ||
43 | delete m_config; | ||
42 | } | 44 | } |
43 | 45 | ||
44 | void MailApplet::paintEvent( QPaintEvent* ) { | 46 | void MailApplet::paintEvent( QPaintEvent* ) { |
@@ -57,7 +59,6 @@ void MailApplet::mouseReleaseEvent( QMouseEvent* e) { | |||
57 | } | 59 | } |
58 | 60 | ||
59 | void MailApplet::slotClicked() { | 61 | void MailApplet::slotClicked() { |
60 | qDebug( " CLICKED" ); | ||
61 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 62 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
62 | e << QString( "opiemail" ); | 63 | e << QString( "opiemail" ); |
63 | 64 | ||
@@ -81,7 +82,6 @@ void MailApplet::startup() { | |||
81 | m_intervalTimer = new QTimer(); | 82 | m_intervalTimer = new QTimer(); |
82 | m_intervalTimer->start( m_intervalMs ); | 83 | m_intervalTimer->start( m_intervalMs ); |
83 | connect( m_intervalTimer, SIGNAL(timeout() ), this, SLOT( slotCheck() ) ); | 84 | connect( m_intervalTimer, SIGNAL(timeout() ), this, SLOT( slotCheck() ) ); |
84 | |||
85 | } | 85 | } |
86 | 86 | ||
87 | void MailApplet::slotCheck() { | 87 | void MailApplet::slotCheck() { |
@@ -92,14 +92,14 @@ void MailApplet::slotCheck() { | |||
92 | m_intervalMs = newIntervalMs; | 92 | m_intervalMs = newIntervalMs; |
93 | } | 93 | } |
94 | 94 | ||
95 | |||
96 | folderStat stat; | 95 | folderStat stat; |
97 | m_statusMail->check_current_stat( stat ); | 96 | m_statusMail->check_current_stat( stat ); |
98 | m_newMails = stat.message_unseen; | 97 | m_newMails = stat.message_unseen; |
99 | qDebug( QString( "test %1" ).arg( stat.message_unseen ) ); | 98 | qDebug( QString( "test %1" ).arg( m_newMails ) ); |
100 | if ( m_newMails > 0 ) { | 99 | if ( m_newMails > 0 ) { |
101 | ODevice *device = ODevice::inst(); | 100 | ODevice *device = ODevice::inst(); |
102 | if ( isHidden() ) show(); | 101 | if ( isHidden() ) |
102 | show(); | ||
103 | if ( m_config->readBoolEntry( "BlinkLed", true ) ) { | 103 | if ( m_config->readBoolEntry( "BlinkLed", true ) ) { |
104 | if ( !device-> ledList ( ).isEmpty( ) ) { | 104 | if ( !device-> ledList ( ).isEmpty( ) ) { |
105 | OLed led = ( device->ledList( ).contains( Led_Mail ) ) ? Led_Mail : device->ledList( ) [0]; | 105 | OLed led = ( device->ledList( ).contains( Led_Mail ) ) ? Led_Mail : device->ledList( ) [0]; |
@@ -118,7 +118,8 @@ void MailApplet::slotCheck() { | |||
118 | 118 | ||
119 | } else { | 119 | } else { |
120 | ODevice *device = ODevice::inst(); | 120 | ODevice *device = ODevice::inst(); |
121 | if ( !isHidden() ) hide(); | 121 | if ( !isHidden() ) |
122 | hide(); | ||
122 | if ( !device-> ledList( ).isEmpty( ) ) { | 123 | if ( !device-> ledList( ).isEmpty( ) ) { |
123 | OLed led = ( device->ledList( ).contains( Led_Mail ) ) ? Led_Mail : device->ledList( ) [0]; | 124 | OLed led = ( device->ledList( ).contains( Led_Mail ) ) ? Led_Mail : device->ledList( ) [0]; |
124 | device->setLedState( led, Led_Off ); | 125 | device->setLedState( led, Led_Off ); |
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h index 25f0652..b4d3742 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.h +++ b/noncore/net/mail/taskbarapplet/mailapplet.h | |||
diff --git a/noncore/net/mail/taskbarapplet/mailappletimpl.cpp b/noncore/net/mail/taskbarapplet/mailappletimpl.cpp index 26f6a6f..c01a674 100644 --- a/noncore/net/mail/taskbarapplet/mailappletimpl.cpp +++ b/noncore/net/mail/taskbarapplet/mailappletimpl.cpp | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | MailAppletImpl::MailAppletImpl() | 4 | MailAppletImpl::MailAppletImpl() |
5 | : m_mailApplet(0), ref(0) { | 5 | : m_mailApplet(0), ref(0) { |
6 | |||
7 | } | 6 | } |
8 | 7 | ||
9 | MailAppletImpl::~MailAppletImpl() { | 8 | MailAppletImpl::~MailAppletImpl() { |
@@ -11,7 +10,8 @@ MailAppletImpl::~MailAppletImpl() { | |||
11 | } | 10 | } |
12 | 11 | ||
13 | QWidget *MailAppletImpl::applet(QWidget *parent) { | 12 | QWidget *MailAppletImpl::applet(QWidget *parent) { |
14 | if (!m_mailApplet) m_mailApplet = new MailApplet(parent); | 13 | if (!m_mailApplet) |
14 | m_mailApplet = new MailApplet(parent); | ||
15 | return m_mailApplet; | 15 | return m_mailApplet; |
16 | } | 16 | } |
17 | 17 | ||
@@ -21,10 +21,13 @@ int MailAppletImpl::position() const { | |||
21 | 21 | ||
22 | QRESULT MailAppletImpl::queryInterface(const QUuid &uuid, QUnknownInterface **iface) { | 22 | QRESULT MailAppletImpl::queryInterface(const QUuid &uuid, QUnknownInterface **iface) { |
23 | *iface = 0; | 23 | *iface = 0; |
24 | if (uuid == IID_QUnknown) *iface = this; | 24 | if (uuid == IID_QUnknown) |
25 | else if (uuid == IID_TaskbarApplet) *iface = this; | 25 | *iface = this; |
26 | else if (uuid == IID_TaskbarApplet) | ||
27 | *iface = this; | ||
26 | 28 | ||
27 | if (*iface) (*iface)->addRef(); | 29 | if (*iface) |
30 | (*iface)->addRef(); | ||
28 | return QS_OK; | 31 | return QS_OK; |
29 | } | 32 | } |
30 | 33 | ||
diff --git a/noncore/net/mail/taskbarapplet/mailappletimpl.h b/noncore/net/mail/taskbarapplet/mailappletimpl.h index 4f27eb3..4809053 100644 --- a/noncore/net/mail/taskbarapplet/mailappletimpl.h +++ b/noncore/net/mail/taskbarapplet/mailappletimpl.h | |||