11
0

Accepting request 360625 from home:wolfi323:plasma5-workspace

- Added plasmashell-disable-windowclosing-on-logout.patch: prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled (boo#955280, kde#349805)

OBS-URL: https://build.opensuse.org/request/show/360625
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=173
This commit is contained in:
Hrvoje Senjan
2016-02-20 16:04:07 +00:00
committed by Git OBS Bridge
parent 644b956915
commit c0350164cd
3 changed files with 30 additions and 0 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 19 18:22:22 UTC 2016 - wbauer@tmo.at
- Added plasmashell-disable-windowclosing-on-logout.patch: prevent
plasma from closing too early on logout resulting in an unusable
desktop if the logout is cancelled (boo#955280, kde#349805)
-------------------------------------------------------------------
Tue Feb 16 22:00:36 UTC 2016 - hrvoje.senjan@gmail.com

View File

@@ -36,6 +36,8 @@ Patch1: create_kdehome.patch
Patch2: fix-breeze-sddm-theme-with-many-users.patch
# PATCH-FIX_OPENSUSE kuiserver5_qApp.patch -- kuiserver can't be a QCoreApplications as it uses QWidget
Patch3: kuiserver5_qApp.patch
# PATCH-FIX_OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 wbauer@tmo.at -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled
Patch4: plasmashell-disable-windowclosing-on-logout.patch
# PATCHES 100-200 and above are from upstream 5.5 branch
Patch100: reset-the-model-on-list-always-shown-hide-change.patch
# PATCHES 201-300 and above are from upstream master/5.6 branch
@@ -207,6 +209,7 @@ workspace. Development files.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch100 -p1
%build

View File

@@ -0,0 +1,20 @@
diff --git a/shell/main.cpp b/shell/main.cpp
index 49ea484..0451aea 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -130,9 +130,15 @@ int main(int argc, char *argv[])
auto disableSessionManagement = [](QSessionManager &sm) {
sm.setRestartHint(QSessionManager::RestartNever);
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
+ sm.setAutoCloseWindowsEnabled(false);
+#endif
};
QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+ QGuiApplication::setFallbackSessionManagementEnabled(false);
+#endif
ShellManager::s_crashes = cliOptions.value(crashOption).toInt();
ShellManager::s_forceWindowed = cliOptions.isSet(winOption);