From: Ivailo Monev <xakepa10@laimg.moc>
Date: Wed, 24 Jul 2019 11:34:42 +0000 (+0000)
Subject: workaround for broken libSM is no longer needed
X-Git-Tag: 4.12.0~5374
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=747fb3e8cb5c14b4f1d2ec60b0f9006f51ff7b6a;p=kde%2FKatie.git

workaround for broken libSM is no longer needed

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index c5f8f2b4e..c6858f32e 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -4094,13 +4094,6 @@ static void sm_setProperty(const QString& name, const QStringList& value)
     delete [] prop;
 }
 
-
-// workaround for broken libsm, see below
-struct QT_smcConn {
-    unsigned int save_yourself_in_progress : 1;
-    unsigned int shutdown_in_progress : 1;
-};
-
 static void sm_saveYourselfCallback(SmcConn smcConn, SmPointer clientData,
                                   int saveType, Bool shutdown , int interactStyle, Bool /*fast*/)
 {
@@ -4113,12 +4106,6 @@ static void sm_saveYourselfCallback(SmcConn smcConn, SmPointer clientData,
     sm_interactStyle = interactStyle;
 //    sm_shouldbefast = fast; ### never used?!?
 
-    // ugly workaround for broken libSM. libSM should do that _before_
-    // actually invoking the callback in sm_process.c
-    ((QT_smcConn*)smcConn)->save_yourself_in_progress = true;
-    if (sm_isshutdown)
-        ((QT_smcConn*)smcConn)->shutdown_in_progress = true;
-
     sm_performSaveYourself((QSessionManagerPrivate*) clientData);
     if (!sm_isshutdown) // we cannot expect a confirmation message in that case
         resetSmState();