From 0817b1fad80603879e7a25981fe87ce162eaaa7d Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Tue, 2 Apr 2013 17:33:46 -0400
Subject: Fix display name of IBus engines.

---
 lib/main.vala | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/main.vala b/lib/main.vala
index 97315f96..b5b735b5 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -123,19 +123,30 @@ public class Indicator.Keyboard.Service : Object {
 					var language = Xkl.get_language_name (name);
 					var country = Xkl.get_country_name (name);
 
-					if (language != null && country != null)
+					if (language != null && country != null) {
 						name = @"$language ($country)";
-					else if (language != null)
+					} else if (language != null) {
 						name = language;
-					else if (country != null)
+					} else if (country != null) {
 						name = country;
+					}
 				}
 				else if (type == "ibus") {
 					var ibus = get_ibus ();
 					string[] names = { name, null };
 					var engines = ibus.get_engines_by_names (names);
-
-					name = engines[0].longname;
+					var engine = engines[0];
+					var longname = engine.longname;
+					var language = Xkl.get_language_name (engine.language);
+					var country = Xkl.get_country_name (engine.language);
+
+					if (language != null) {
+						name = @"$language ($longname)";
+					} else if (country != null) {
+						name = @"$country ($longname)";
+					} else {
+						name = longname;
+					}
 				}
 
 				var menu_item = new MenuItem (name, "indicator.current");
-- 
cgit v1.2.3