Michael Vetter
7eb3c100e8
- boo#1044483:
* Add lxqt-session-0.11.1-string-encoding.patch
to have new string encoding
* Add lxqt-session-0.11.1-add-poweroff.patch
add option to power off
OBS-URL: https://build.opensuse.org/request/show/525862
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-session?expand=0&rev=5
54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
From 4786793b55fa2d8b755faeb2c14f33a519d72c0f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
|
|
Date: Mon, 15 May 2017 19:38:29 +0100
|
|
Subject: [PATCH] String encoding (#103)
|
|
|
|
* Replace QString::toUtf8() with QString::toLatin1()
|
|
|
|
Udev subsystem strings are latin strings.
|
|
|
|
* Don't assume UTF-8 encoding.
|
|
|
|
QString::toLocal8Bit() uses QTextCodec::codecForLocale() is used to
|
|
perform the conversion.
|
|
---
|
|
lxqt-session/src/UdevNotifier.cpp | 2 +-
|
|
lxqt-session/src/sessionapplication.cpp | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lxqt-session/src/UdevNotifier.cpp b/lxqt-session/src/UdevNotifier.cpp
|
|
index edcb8a6..3b87f87 100644
|
|
--- a/lxqt-session/src/UdevNotifier.cpp
|
|
+++ b/lxqt-session/src/UdevNotifier.cpp
|
|
@@ -52,7 +52,7 @@ UdevNotifier::UdevNotifier(QString const & subsystem, QObject * parent/* = nullp
|
|
return;
|
|
}
|
|
|
|
- int ret = udev_monitor_filter_add_match_subsystem_devtype(d->monitor, subsystem.toUtf8().constData(), nullptr);
|
|
+ int ret = udev_monitor_filter_add_match_subsystem_devtype(d->monitor, subsystem.toLatin1().constData(), nullptr);
|
|
if (0 != ret)
|
|
qCWarning(SESSION) << QStringLiteral("UdevNotifier: unable to add match subsystem, monitor will receive all devices");
|
|
|
|
diff --git a/lxqt-session/src/sessionapplication.cpp b/lxqt-session/src/sessionapplication.cpp
|
|
index cf6ed74..26637ed 100644
|
|
--- a/lxqt-session/src/sessionapplication.cpp
|
|
+++ b/lxqt-session/src/sessionapplication.cpp
|
|
@@ -58,7 +58,7 @@ SessionApplication::SessionApplication(int& argc, char** argv) :
|
|
configName = "session";
|
|
|
|
// tell the world which config file we're using.
|
|
- qputenv("LXQT_SESSION_CONFIG", configName.toUtf8());
|
|
+ qputenv("LXQT_SESSION_CONFIG", configName.toLocal8Bit());
|
|
|
|
modman = new LXQtModuleManager(winmanager);
|
|
connect(this, &LXQt::Application::unixSignal, modman, &LXQtModuleManager::logout);
|
|
@@ -135,7 +135,7 @@ void SessionApplication::loadEnvironmentSettings(LXQt::Settings& settings)
|
|
Q_FOREACH (QString i, settings.childKeys())
|
|
{
|
|
envVal = settings.value(i).toByteArray();
|
|
- lxqt_setenv(i.toUtf8().constData(), envVal);
|
|
+ lxqt_setenv(i.toLocal8Bit().constData(), envVal);
|
|
}
|
|
settings.endGroup();
|
|
}
|