Fix problem when restart ibus-daemon.

3 files changed, 6 insertions, 1 deletions

diff --git a/client/qt4/ibus-client.cpp b/client/qt4/ibus-client.cpp
index 41d97f8..c7f5397 100644
--- a/client/qt4/ibus-client.cpp
+++ b/client/qt4/ibus-client.cpp
@@ -57,6 +57,7 @@ IBusClient::IBusClient ()
 	session = getenv ("DISPLAY");
 	session.replace (":", "-");
 
+	ibus_path = QString("/tmp/ibus-%1/ibus-%2").arg (username, session);
 	ibus_addr = QString("unix:path=/tmp/ibus-%1/ibus-%2").arg (username, session);
 	connectToBus ();
 
@@ -471,7 +472,7 @@ IBusClient::slotDirectoryChanged (const QString & /*path*/)
 		disconnectFromBus ();
 
 	if (ibus == NULL ) {
-		if (QFile::exists (ibus_addr)) {
+		if (QFile::exists (ibus_path)) {
 			usleep (500);
 			connectToBus ();
 		}
diff --git a/client/qt4/ibus-client.h b/client/qt4/ibus-client.h
index ff21c07..abddae6 100644
--- a/client/qt4/ibus-client.h
+++ b/client/qt4/ibus-client.h
@@ -81,6 +81,7 @@ private:
 	QHash <QString, IBusInputContext *>context_dict;
 	QString username;
 	QString session;
+	QString ibus_path;
 	QString ibus_addr;
 };
 
diff --git a/client/qt4/ibus-input-context.cpp b/client/qt4/ibus-input-context.cpp
index 28e8af0..d120f1e 100644
--- a/client/qt4/ibus-input-context.cpp
+++ b/client/qt4/ibus-input-context.cpp
@@ -164,6 +164,9 @@ void
 IBusInputContext::setIC (QString ic)
 {
 	this->ic = ic;
+	if (has_focus && !ic.isEmpty ()) {
+		client->focusIn (this);
+	}
 }
 
 QString