summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--kalarmd/simplealarmdaemonapplet.cpp6
2 files changed, 3 insertions, 5 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index df0b2eb..6a9a200 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -14,3 +14,3 @@ Fixed a strange problem in KO/Pi alarm applet.
Did not find the actual problem,
-such that now Qtopia reboots if deinstalling the alarm applet.
+such that now Qtopia reboots again if deinstalling the alarm applet.
But the alarm applet should work again.
diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index 3277036..73b1e07 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -16,3 +16,3 @@ SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
{
- //delete mApplet;
+ delete mApplet;
mApplet = 0;
@@ -43,3 +43,2 @@ QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInte
{
- // qDebug(" SimpleAlarmDaemonApplet::queryInterface ");
*iface = 0;
@@ -49,3 +48,2 @@ QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInte
*iface = this;
-
if ( *iface ) {
@@ -54,3 +52,3 @@ QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInte
}
- return QE_NOINTERFACE;
+ return QS_FALSE;
}