-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | kalarmd/simplealarmdaemonapplet.cpp | 6 |
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). | |||
12 | 12 | ||
13 | Fixed a strange problem in KO/Pi alarm applet. | 13 | Fixed a strange problem in KO/Pi alarm applet. |
14 | Did not find the actual problem, | 14 | Did not find the actual problem, |
15 | such that now Qtopia reboots if deinstalling the alarm applet. | 15 | such that now Qtopia reboots again if deinstalling the alarm applet. |
16 | But the alarm applet should work again. | 16 | But the alarm applet should work again. |
17 | 17 | ||
18 | 18 | ||
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() | |||
14 | 14 | ||
15 | SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet() | 15 | SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet() |
16 | { | 16 | { |
17 | //delete mApplet; | 17 | delete mApplet; |
18 | mApplet = 0; | 18 | mApplet = 0; |
19 | } | 19 | } |
20 | 20 | ||
@@ -41,18 +41,16 @@ int SimpleAlarmDaemonApplet::position() const | |||
41 | 41 | ||
42 | QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 42 | QRESULT SimpleAlarmDaemonApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
43 | { | 43 | { |
44 | // qDebug(" SimpleAlarmDaemonApplet::queryInterface "); | ||
45 | *iface = 0; | 44 | *iface = 0; |
46 | if ( uuid == IID_QUnknown ) | 45 | if ( uuid == IID_QUnknown ) |
47 | *iface = this; | 46 | *iface = this; |
48 | else if ( uuid == IID_TaskbarApplet ) | 47 | else if ( uuid == IID_TaskbarApplet ) |
49 | *iface = this; | 48 | *iface = this; |
50 | |||
51 | if ( *iface ) { | 49 | if ( *iface ) { |
52 | (*iface)->addRef(); | 50 | (*iface)->addRef(); |
53 | return QS_OK; | 51 | return QS_OK; |
54 | } | 52 | } |
55 | return QE_NOINTERFACE; | 53 | return QS_FALSE; |
56 | } | 54 | } |
57 | Q_EXPORT_INTERFACE() | 55 | Q_EXPORT_INTERFACE() |
58 | { | 56 | { |