check back before deleting a mail

2 files changed, 6 insertions, 1 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 391b55e..e466d9b 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -1,11 +1,12 @@
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
+#include <qmessagebox.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include "defines.h"
 #include "mainwindow.h"
@@ -178,15 +179,17 @@ void MainWindow::displayMail(QListViewItem*item)
 }
 
 void MainWindow::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
+    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail.getFrom() + " - " + mail.getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
     mail.Wrapper()->deleteMail( mail );
     folderView->refreshCurrent();
 }
+}
 
 
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :QListViewItem(parent,item),mail_data()
 {
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 163ffb7..2415c82 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,8 +1,8 @@
 #include <qtextbrowser.h>
-#include <qmessagebox.h>
+#include <qmessagebox.h>?
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 
 #include <opie/ofiledialog.h>
@@ -316,10 +316,12 @@ void ViewMail::slotForward()
         composer.showMaximized();
         composer.exec();
 }
 
 void ViewMail::slotDeleteMail( )
 {
+    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
     m_recMail.Wrapper()->deleteMail( m_recMail );
     hide();
     deleted = true;
 }
+}