fixing crash which occured when leaving config dialog

2 files changed, 3 insertions, 2 deletions

diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp
index a37d506..2a2efd2 100644
--- a/core/pim/today/plugins/mail/mailplugin.cpp
+++ b/core/pim/today/plugins/mail/mailplugin.cpp
@@ -19,13 +19,13 @@
 
 MailPlugin::MailPlugin() {
     m_widget = 0l;
 }
 
 MailPlugin::~MailPlugin() {
-    delete m_widget;
+    delete (MailPluginWidget*)m_widget;
 }
 
 QString MailPlugin::pluginName() const {
     return QObject::tr( "Mail plugin" );
 }
 
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h
index 67fac0c..a0f009b 100644
--- a/core/pim/today/plugins/mail/mailplugin.h
+++ b/core/pim/today/plugins/mail/mailplugin.h
@@ -17,12 +17,13 @@
 
 #ifndef MAIL_PLUGIN_H
 #define MAIL_PLUGIN_H
 
 #include <qstring.h>
 #include <qwidget.h>
+#include <qguardedptr.h>
 
 #include <opie/tododb.h>
 #include <opie/oclickablelabel.h>
 
 #include <opie/todayplugininterface.h>
 #include <opie/todayconfigwidget.h>
@@ -43,10 +44,10 @@ public:
     TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
 
  private:
-    MailPluginWidget *m_widget;
+   QGuardedPtr<MailPluginWidget> m_widget;
 };
 
 #endif