summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts/ibus
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-06-23 22:50:14 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-26 14:40:50 +0200
commit27d7d7c69ee185a4b99913a518879d39058d935b (patch)
tree5a1d938b8426e467f135121c5cf22a449c14b6bc /src/plugins/platforminputcontexts/ibus
parent8e280d1e187b09651c7036bd76272342d52ce401 (diff)
Fix warning when ibus is not available.
This is perfectly ok on a linux desktop, so no reason to abort when setting QT_FATAL_WARNINGS. Change-Id: I64ba987679195741631fb204af57ae3d283bb516 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforminputcontexts/ibus')
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
index 38fe0cce51..2ee8c89fc8 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
@@ -272,10 +272,8 @@ QIBusPlatformInputContextPrivate::QIBusPlatformInputContextPrivate()
context(0),
valid(false)
{
- if (!connection || !connection->isConnected()) {
- qDebug("QIBusPlatformInputContext: not connected.");
+ if (!connection || !connection->isConnected())
return;
- }
bus = new QIBusProxy(QLatin1String("org.freedesktop.IBus"),
QLatin1String("/org/freedesktop/IBus"),
@@ -333,12 +331,8 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection()
QLatin1String(QDBusConnection::localMachineId()) +
QLatin1Char('-') + QString::fromLocal8Bit(host) + QLatin1Char('-') + QString::fromLocal8Bit(displayNumber));
- if (!file.exists()) {
- qWarning("QIBusPlatformInputContext: ibus config file '%s' does not exist.", qPrintable(file.fileName()));
+ if (!file.open(QFile::ReadOnly))
return 0;
- }
-
- file.open(QFile::ReadOnly);
QByteArray address;
int pid = -1;