[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-addons/Applications/16.08] plugins/messageviewerplugins: messageviewerplugins: don't create 
From:       David Faure <faure () kde ! org>
Date:       2016-07-31 12:24:47
Message-ID: E1bTpnT-0007TE-43 () code ! kde ! org
[Download RAW message or body]

Git commit 53dd252a8b04d7712614e982b5628add16600267 by David Faure.
Committed on 31/07/2016 at 12:24.
Pushed by dfaure into branch 'Applications/16.08'.

messageviewerplugins: don't create widget just to hide it

Called by ViewerPluginToolManager::closeAllTools() in
ViewerPrivate::resetStateForNewMessage().

M  +3    -1    plugins/messageviewerplugins/createeventplugin/viewerpluginc=
reateeventinterface.cpp
M  +3    -1    plugins/messageviewerplugins/createnoteplugin/viewerplugincr=
eatenoteinterface.cpp
M  +3    -1    plugins/messageviewerplugins/createtodoplugin/viewerplugincr=
eatetodointerface.cpp

http://commits.kde.org/kdepim-addons/53dd252a8b04d7712614e982b5628add166002=
67

diff --git a/plugins/messageviewerplugins/createeventplugin/viewerplugincre=
ateeventinterface.cpp b/plugins/messageviewerplugins/createeventplugin/view=
erplugincreateeventinterface.cpp
index 9f253e4..b79ed4e 100644
--- a/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeven=
tinterface.cpp
+++ b/plugins/messageviewerplugins/createeventplugin/viewerplugincreateeven=
tinterface.cpp
@@ -64,7 +64,9 @@ void ViewerPluginCreateEventInterface::setMessage(const K=
Mime::Message::Ptr &val
 =

 void ViewerPluginCreateEventInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mEventEdit) {
+        mEventEdit->slotCloseWidget();
+    }
 }
 =

 void ViewerPluginCreateEventInterface::showWidget()
diff --git a/plugins/messageviewerplugins/createnoteplugin/viewerplugincrea=
tenoteinterface.cpp b/plugins/messageviewerplugins/createnoteplugin/viewerp=
lugincreatenoteinterface.cpp
index f785475..6ddf587 100644
--- a/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenotei=
nterface.cpp
+++ b/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenotei=
nterface.cpp
@@ -62,7 +62,9 @@ void ViewerPluginCreatenoteInterface::setMessage(const KM=
ime::Message::Ptr &valu
 =

 void ViewerPluginCreatenoteInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mNoteEdit) {
+        mNoteEdit->slotCloseWidget();
+    }
 }
 =

 Akonadi::Relation ViewerPluginCreatenoteInterface::relatedNoteRelation() c=
onst
diff --git a/plugins/messageviewerplugins/createtodoplugin/viewerplugincrea=
tetodointerface.cpp b/plugins/messageviewerplugins/createtodoplugin/viewerp=
lugincreatetodointerface.cpp
index fd41c3a..befdd0c 100644
--- a/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodoi=
nterface.cpp
+++ b/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodoi=
nterface.cpp
@@ -59,7 +59,9 @@ void ViewerPluginCreateTodoInterface::setMessage(const KM=
ime::Message::Ptr &valu
 =

 void ViewerPluginCreateTodoInterface::closePlugin()
 {
-    widget()->slotCloseWidget();
+    if (mTodoEdit) {
+        mTodoEdit->slotCloseWidget();
+    }
 }
 =

 void ViewerPluginCreateTodoInterface::showWidget()
[prev in list] [next in list] [prev in thread] [next in thread]