Qt IBus plugin connects to IBus Bus again if ibus-daemon does not run

Qt5 applications do not enable IBus when the applications are saved in
the session and launched automatically in the next login.
This patch checks the IBus socket path and connect to the bus when
it's available.

Task-number QTBUG-47657

Change-Id: I0883eaa2438fd27455da93f78f392ea3c1abe6b8
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
index 127db7df8b..a8efd9deb3 100644
--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
+++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
@@ -37,7 +37,9 @@
 
 #include <QtCore/qpointer.h>
 #include <QtDBus/qdbuspendingreply.h>
+#include <QFileSystemWatcher>
 #include <QLoggingCategory>
+#include <QTimer>
 #include <QWindow>
 
 QT_BEGIN_NAMESPACE
@@ -96,10 +98,16 @@ public Q_SLOTS:
     void deleteSurroundingText(int offset, uint n_chars);
     void surroundingTextRequired();
     void filterEventFinished(QDBusPendingCallWatcher *call);
+    void socketChanged(const QString &str);
+    void connectToBus();
 
 private:
     QIBusPlatformInputContextPrivate *d;
     bool m_eventFilterUseSynchronousMode;
+    QFileSystemWatcher m_socketWatcher;
+    QTimer m_timer;
+
+    void connectToContextSignals();
 };
 
 QT_END_NAMESPACE