summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakao Fujiwara <tfujiwar@redhat.com>2015-03-24 19:08:34 +0900
committerGatis Paeglis <gatis.paeglis@digia.com>2015-03-27 13:15:54 +0000
commitc72325d52575cb8a46cc8595c592c27581089dec (patch)
tree618afa9c079fc08f813a3ce0173e523eee64c330
parentfa3985ab22a5dc9b45ea469cbcfba9debcf46df5 (diff)
ibus: Get display number when screen number is omitted.
QIBusPlatformInputContextPrivate::createConnection() parses DISPLAY variable and it does not get the display number when the screen number is omitted. E.g. DISPLAY=":1". Change-Id: I9f81d8114d4e0f654a27ada67c5dc110eb34cd64 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index d00435b0a3..673942b5d9 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -351,6 +351,8 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection()
int pos2 = display.indexOf('.', pos);
if (pos2 > 0)
displayNumber = display.mid(pos, pos2 - pos);
+ else
+ displayNumber = display.right(pos);
if (debug)
qDebug() << "host=" << host << "displayNumber" << displayNumber;