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
@@ -12,7 +12,7 @@ Fixed some minor problems. (Like word wrap in help text windows).
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
@@ -14,7 +14,7 @@ SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet()
SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
{
- //delete mApplet;
+ delete mApplet;
mApplet = 0;
}
@@ -41,18 +41,16 @@ int SimpleAlarmDaemonApplet::position() const
QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
{
- // qDebug(" SimpleAlarmDaemonApplet::queryInterface ");
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_TaskbarApplet )
*iface = this;
-
if ( *iface ) {
(*iface)->addRef();
return QS_OK;
}
- return QE_NOINTERFACE;
+ return QS_FALSE;
}
Q_EXPORT_INTERFACE()
{