summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts/ibus
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2017-02-07 16:18:18 +0100
committerKonstantin Tokarev <annulen@yandex.ru>2017-02-17 10:14:39 +0000
commit1d6700171cf41c17983edff285c3658933610523 (patch)
tree470c4c8460e00ad9dfba5ab4f32f3a9488aefa58 /src/plugins/platforminputcontexts/ibus
parentdd7f62059c2ae52b5c05fdbe1b6b5d5fa5bc1b03 (diff)
Respect XDG_CONFIG_HOME when getting ibus socket location
Task-number: QTBUG-58687 Change-Id: I97ea8b7d7caf922227a92348fb914aead1ecd312 Reviewed-by: Tinu Weber Reviewed-by: Takao Fujiwara <takao.fujiwara1@gmail.com> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/plugins/platforminputcontexts/ibus')
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index 736c66ebc0..0a55f689c6 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -572,7 +572,8 @@ QString QIBusPlatformInputContextPrivate::getSocketPath()
if (debug)
qDebug() << "host=" << host << "displayNumber" << displayNumber;
- return QDir::homePath() + QLatin1String("/.config/ibus/bus/") +
+ return QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) +
+ QLatin1String("/ibus/bus/") +
QLatin1String(QDBusConnection::localMachineId()) +
QLatin1Char('-') + QString::fromLocal8Bit(host) + QLatin1Char('-') + QString::fromLocal8Bit(displayNumber);
}