3 files changed, 10 insertions, 10 deletions

diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index 7e8125d..94d8428 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -14,8 +14,9 @@ SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet()
 
 SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
 {
   delete mApplet;
+  mApplet = 0;
 }
 
 
 QWidget *SimpleAlarmDaemonApplet::applet( QWidget *parent )
diff --git a/kalarmd/simplealarmdaemonapplet.h b/kalarmd/simplealarmdaemonapplet.h
index a4cbee4..1787bf3 100644
--- a/kalarmd/simplealarmdaemonapplet.h
+++ b/kalarmd/simplealarmdaemonapplet.h
@@ -3,9 +3,8 @@
 
 #include <qpe/taskbarappletinterface.h>
 
 class SimpleAlarmDaemonImpl;
-class ScreenshotApplet;
 
 class SimpleAlarmDaemonApplet : public TaskbarAppletInterface
 {
   public:
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 4ff6861..50c4605 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -47,9 +47,9 @@
 SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     : QLabel( parent )
 {
     mAlarmDialog = new AlarmDialog( 0 );
-    mPopUp = new QPopupMenu( 0 );
+    mPopUp = new QPopupMenu( this );
     mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
     mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "What's Todo?", this, SLOT ( showTodo() ) );
@@ -61,14 +61,14 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
     mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
-    mTimerPopUp = new QPopupMenu( mPopUp );
+    mTimerPopUp = new QPopupMenu( this );
 
-    mBeepPopUp = new QPopupMenu( mPopUp );   
-    mSoundPopUp = new QPopupMenu( mBeepPopUp );   
-    mPausePopUp = new QPopupMenu( mBeepPopUp );    
-    QPopupMenu* savePopUp = new QPopupMenu( mBeepPopUp ); 
+    mBeepPopUp = new QPopupMenu( this );   
+    mSoundPopUp = new QPopupMenu( this );   
+    mPausePopUp = new QPopupMenu( this );    
+    QPopupMenu* savePopUp = new QPopupMenu( this ); 
     savePopUp->insertItem( "Save", 0 );   
     savePopUp->insertItem( "Load", 1 );   
     mSoundPopUp->insertItem( "Buzzer", 0 );   
     mSoundPopUp->insertItem( "Wav file", 1 ); 
@@ -80,9 +80,9 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     mPausePopUp->insertItem( "30 sec", 30 );
     mPausePopUp->insertItem( " 1 min", 60 );
     mPausePopUp->insertItem( " 5 min", 300 );
     mPausePopUp->insertItem( "10 min", 600 );
-    mSuspendPopUp = new QPopupMenu( mBeepPopUp );
+    mSuspendPopUp = new QPopupMenu( this );
     mSuspendPopUp->insertItem( "Off", 0 ); 
     mSuspendPopUp->insertItem( " 1x", 1 );   
     mSuspendPopUp->insertItem( " 2x", 2 );   
     mSuspendPopUp->insertItem( " 3x", 3 );  
@@ -141,9 +141,9 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
 }
 
 SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl()
 {
-    delete mPopUp;
+    //delete mPopUp;
     delete mAlarmDialog;
 }
 void SimpleAlarmDaemonImpl::saveSlot( int load )
 {
@@ -563,9 +563,9 @@ void SimpleAlarmDaemonImpl::newMail()
  QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
 void SimpleAlarmDaemonImpl::showAdd()
 {
- QCopEnvelope e("QPE/Application/kapi", " ");
+ QCopEnvelope e("QPE/Application/kapi", "raise()");
 }
 void SimpleAlarmDaemonImpl::ringSync()
 {
     QCopEnvelope e("QPE/Application/kopi", "-ringSync");