diff options
| author | Jesse Smith <jsmith@resonatingmedia.com> | 2015-05-22 15:09:16 -0300 |
|---|---|---|
| committer | Jesse Smith <jsmith@resonatingmedia.com> | 2015-05-22 15:09:16 -0300 |
| commit | 9cbe7794d1bfaf2221ef768395590a23a2b8d907 (patch) | |
| tree | 9e694a7417ed337e518d4e575d81e1a0a1f71524 | |
| parent | Finish cleaning up the new CPU/Memory desction routines in libLumina, and add... (diff) | |
| download | lumina-9cbe7794d1bfaf2221ef768395590a23a2b8d907.tar.gz lumina-9cbe7794d1bfaf2221ef768395590a23a2b8d907.tar.bz2 lumina-9cbe7794d1bfaf2221ef768395590a23a2b8d907.zip | |
Make sure disabled numlock stays off. Updated Linux shutdown command.
This patch primarily fixes two minor issues.
1. When number lock is disabled in the session settings, it should now turn off when Lumina starts.
2. In the Linux portion of libLumina, the shutdown command has been updated.
3. A minor typo was fixed in the dependency list.
| -rw-r--r-- | DEPENDENCIES | 2 | ||||
| -rw-r--r-- | libLumina/LuminaOS-Linux.cpp | 2 | ||||
| -rw-r--r-- | lumina-desktop/LSession.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/DEPENDENCIES b/DEPENDENCIES index 322cd0cc..ae0d0765 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -84,5 +84,5 @@ X.org and XCB extensions (possibly the XLib libraries above during the transitio xbacklight (required for changing screen brightness) alsa-utils (required for adjusting audio volume) acpi (required for monitoring battery life) - numlockx (required for changign state of numlock at login) + numlockx (required for changing state of numlock at login) pavucontrol (required for detatched audio mixer) diff --git a/libLumina/LuminaOS-Linux.cpp b/libLumina/LuminaOS-Linux.cpp index e60677d5..2368f773 100644 --- a/libLumina/LuminaOS-Linux.cpp +++ b/libLumina/LuminaOS-Linux.cpp @@ -141,7 +141,7 @@ bool LOS::userHasShutdownAccess(){ //System Shutdown void LOS::systemShutdown(){ //start poweroff sequence - QProcess::startDetached("shutdown -h now"); + QProcess::startDetached("shutdown -P -h now"); } //System Restart diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index 1fe20376..59e6fe57 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -229,6 +229,9 @@ void LSession::launchStartupApps(){ if(sessionsettings->value("EnableNumlock",false).toBool()){ QProcess::startDetached("numlockx on"); } + else{ + QProcess::startDetached("numlockx off"); + } } //First create the list of all possible locations in order of precedence |