diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-29 02:31:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-29 02:31:43 -0300 |
| commit | e87b42b0f90e1a4d8b255f1dab945f2f3bb13cdc (patch) | |
| tree | e36d5720f76b5db9dd5f97260108607023d7d2e7 /extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch | |
| parent | c0e37a8f32f335c12352f23cdc73113099e057ec (diff) | |
| parent | 32b05a621cb20af1bd4b7cd6f5609b7512bb20f1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/avfs/PKGBUILD
extra/gtk2/PKGBUILD
extra/hercules/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-qt/PKGBUILD
Diffstat (limited to 'extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch')
| -rw-r--r-- | extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch b/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch new file mode 100644 index 000000000..4739e601d --- /dev/null +++ b/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch @@ -0,0 +1,20 @@ +diff -uNr kshutdown-3.0beta2.orig/src/kshutdown.cpp kshutdown-3.0beta2/src/kshutdown.cpp +--- kshutdown-3.0beta2.orig/src/kshutdown.cpp 2011-12-29 22:18:45.000000000 -0500 ++++ kshutdown-3.0beta2/src/kshutdown.cpp 2011-12-30 19:09:08.128451522 -0500 +@@ -886,13 +886,13 @@ + #ifdef KS_NATIVE_KDE + if ( + // TODO: check if logout is available +- (m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT)) && ++ (m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT))) + KWorkSpace::requestShutDown( + KWorkSpace::ShutdownConfirmNo, + m_type, + KWorkSpace::ShutdownModeForceNow +- ) +- ) ++ ); ++ + return true; + #endif // KS_NATIVE_KDE + |