diff options
| author | q5sys <jt@xsystems.com> | 2018-02-07 14:41:07 -0500 |
|---|---|---|
| committer | q5sys <jt@xsystems.com> | 2018-02-07 14:41:07 -0500 |
| commit | dc18ed78126c752a6519d4827fb0b6d520aab08e (patch) | |
| tree | 30bd6d60098b0bb282187b84b876d1af0c19d687 | |
| parent | Merge branch 'master' of http://github.com/trueos/lumina (diff) | |
| download | lumina-dc18ed78126c752a6519d4827fb0b6d520aab08e.tar.gz lumina-dc18ed78126c752a6519d4827fb0b6d520aab08e.tar.bz2 lumina-dc18ed78126c752a6519d4827fb0b6d520aab08e.zip | |
Revert "add shell logout to Lumina"
This reverts commit 4455528cd9cd0b0594c3bcabf619a50e64e37832.
| -rw-r--r-- | port-files/FreeBSD/x11/lumina-core/pkg-plist | 1 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop/LSession.cpp | 2 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop/lumina-desktop.pro | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/port-files/FreeBSD/x11/lumina-core/pkg-plist b/port-files/FreeBSD/x11/lumina-core/pkg-plist index 9942795f..9aad7f66 100644 --- a/port-files/FreeBSD/x11/lumina-core/pkg-plist +++ b/port-files/FreeBSD/x11/lumina-core/pkg-plist @@ -4,7 +4,6 @@ bin/lumina-desktop bin/lumina-info bin/lumina-open bin/start-lumina-desktop -bin/llogout etc/luminaDesktop.conf.dist lib/qt5/plugins/platformthemes/liblthemeengine.so lib/qt5/plugins/styles/liblthemeengine-style.so diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 7eafcde7..111a17b6 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -272,7 +272,7 @@ void LSession::NewCommunication(QStringList list){ screensChanged(); }else if(list[i]=="--show-start"){ emit StartButtonActivated(); - }else if(list[i]=="--logout"){ QTimer::singleShot(1000, this, SLOT(StartLogout()));} + } } } diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index 1c9e9268..e36d11a2 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -172,8 +172,6 @@ TRANSLATIONS = i18n/lumina-desktop_af.ts \ dotrans.path=$${L_SHAREDIR}/lumina-desktop/i18n/ dotrans.extra=cd $$PWD/i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/ -link.extra=ln -sf "lumina-desktop --logout" $(INSTALL_ROOT)$${L_BINDIR}/llogout - manpage.path=$${L_MANDIR}/man1/ manpage.extra="$${MAN_ZIP} $$PWD/lumina-desktop.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-desktop.1.gz" |