* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 3 deletions

diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index 273c5997..dbf5f3f9 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -48,12 +48,14 @@
 
 using namespace KMail;
 
-EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith, TQObject * parent) :
+EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool openWith,
+                             TQObject * parent, TQWidget *parentWidget) :
     TQObject( parent ),
     mUrl( url ),
     mMimeType( mimeType ),
     mOpenWith( openWith ),
     mEditor( 0 ),
+    mParentWidget( parentWidget ),
     mHaveInotify( false ),
     mFileOpen( false ),
     mEditorRunning( false ),
@@ -154,8 +156,13 @@ void EditorWatcher::checkEditDone()
   // nobody can edit that fast, we seem to be unable to detect
   // when the editor will be closed
   if ( mEditTime.elapsed() <= 3000 ) {
-    KMessageBox::error( 0, i18n("KMail is unable to detect when the choosen editor is closed. "
-         "To avoid data loss, editing the attachment will be aborted."), i18n("Unable to edit attachment") );
+    KMessageBox::information(
+      mParentWidget,
+      i18n( "KMail is unable to detect when the chosen editor is closed. "
+            "To avoid data loss, editing the attachment will be aborted." ),
+      i18n( "Unable to edit attachment" ),
+      "UnableToEditAttachment" );
+
   }
 
   emit editDone( this );