andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Workaround for 380974. 

If DBUS_SESSION_BUS_ADDRESS is not defined then try to determine it from
~/.dbus/session/bus/ and pass to partitionmanager running as root.

This fixes a long delay before KMessageBoxes become usable.
The delay happens when using KNotifications >= 5.33.
This commit is contained in:
Andrius Štikonas 2017-06-13 22:12:58 +02:00
parent 4e78cd9ff1
commit 64463944f7
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/util/guihelpers.cpp
View File

@ -17,6 +17,7 @@
*************************************************************************/
#include "util/guihelpers.h"
#include "config.h"
#include <backend/corebackendmanager.h>
@ -33,9 +34,6 @@
#include <KMessageBox>
#include <unistd.h>
#include <signal.h>
#include <config.h>
QIcon createFileSystemColor(FileSystem::Type type, quint32 size)
{
@ -67,16 +65,40 @@ bool checkPermissions()
argList = QStringLiteral("-c ");
// Workaround for ugly GUI when kdesu uses sudo
QString DBusString = QStringLiteral("DBUS_SESSION_BUS_ADDRESS");
const QStringList envVars = { QStringLiteral("KDE_FULL_SESSION"),
QStringLiteral("QT_WAYLAND_FORCE_DPI"),
QStringLiteral("QT_QPA_PLATFORM"),
QStringLiteral("XDG_RUNTIME_DIR"),
QStringLiteral("DBUS_SESSION_BUS_ADDRESS") };
DBusString };
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
for (const auto &var : envVars)
if (env.contains(var))
argList += var + QStringLiteral("=") + env.value(var) + QStringLiteral(" ");
QString displayString = QStringLiteral("DISPLAY");
QString homeString = QStringLiteral("HOME");
if (!env.contains(DBusString) && env.contains(displayString) && env.contains(homeString)) {
QFile file(QStringLiteral("/var/lib/dbus/machine-id"));
if (file.open(QIODevice::ReadOnly)) {
QTextStream in(&file);
QString machineId = in.readLine();
file.close();
QString display = env.value(displayString).remove(0,1);
QFile sessionFile(env.value(homeString) + QStringLiteral("/.dbus/session-bus/") + machineId + QStringLiteral("-") + display);
if (sessionFile.open(QIODevice::ReadOnly)) {
QTextStream in2(&sessionFile);
while (!in2.atEnd()) {
QString line = in2.readLine();
if (line.startsWith(DBusString)) {
argList += line + QStringLiteral(" ");
break;
}
}
}
}
}
argList += QCoreApplication::arguments().join(QStringLiteral(" ")) + QStringLiteral(" --dontsu");
if (QProcess::execute(suCmd, QStringList(argList)) == 0)