Merge trunk fixing conflicts.

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/main.vala b/lib/main.vala
index 8d8c213f..8543dd3e 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -130,6 +130,19 @@ public class Indicator.Keyboard.Service : Object {
 		if (ibus == null) {
 			IBus.init ();
 			ibus = new IBus.Bus ();
+			((!) ibus).connected.connect (() => {
+				if (desktop_menu != null) {
+					get_desktop_menu ().set_sources (get_sources ());
+				}
+
+				if (desktop_greeter_menu != null) {
+					get_desktop_greeter_menu ().set_sources (get_sources ());
+				}
+
+				if (indicator_action != null) {
+					update_indicator_action ();
+				}
+			});
 		}
 
 		return (!) ibus;