Merge lp:~attente/indicator-keyboard/1290881 into lp:indicator-keyboard

[William Hua]

Use Ubuntu-specific IBus D-Bus API so that we don't have to replace the old IBus panel service in order to inspect and activate IBus engine properties.

Use Ubuntu-specific IBus D-Bus API so that we don't have to replace the old IBus panel service in order to inspect and activate IBus engine properties.

This branch depends on the IBus patch attached at https://bugs.launchpad.net/indicator-keyboard/+bug/1290881.

[lp:~attente/indicator-keyboard/1290881]

310. By William Hua on 2014-03-19

Breaks IBus << 1.5.5-1ubuntu3.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/50/rebuild

review: Needs Fixing (continuous-integration)

[lp:~attente/indicator-keyboard/1290881]

311. By William Hua on 2014-03-19

Check if IBus is connected before checking engine properties.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/18/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/51/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

LGTM.

review: Approve

[lp:~attente/indicator-keyboard/1290881]

312. By William Hua on 2014-03-19

IBus panel is only available while IBus is running.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/52/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks! The new ibus got uploaded (still in the unapproved queue due to beta freeze though), we can land that one next

review: Approve

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2013-11-22 16:44:45 +0000
+++ debian/control	2014-03-19 23:26:13 +0000
@@ -30,6 +30,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+Breaks: ibus (<< 1.5.5-1ubuntu3),
 Description: Keyboard indicator
  This package contains the keyboard indicator, which should show as an icon in
  the top panel when using the Unity environment. It can be used to switch

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2014-02-19 16:10:54 +0000
+++ lib/Makefile.am	2014-03-19 23:26:13 +0000
@@ -10,6 +10,7 @@
                                      source.vala        \
                                      common.vala        \
                                      ibus-menu.vala     \
+                                     ibus-panel.vala    \
                                      window-stack.vala  \
                                      unity-greeter.vala
 indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS)            \

=== added file 'lib/ibus-panel.vala'
--- lib/ibus-panel.vala	1970-01-01 00:00:00 +0000
+++ lib/ibus-panel.vala	2014-03-19 23:26:13 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: William Hua <[e-mail]>
+ */
+
+[DBus (name="com.canonical.IBus.Panel.Private")]
+public interface IBusPanel : Object {
+
+	public abstract void activate_property (string name, uint state) throws IOError;
+
+	public signal void properties_registered (Variant variant);
+	public signal void property_updated (Variant variant);
+}

=== modified file 'lib/main.vala'
--- lib/main.vala	2014-02-27 19:37:55 +0000
+++ lib/main.vala	2014-03-19 23:26:13 +0000
@@ -37,7 +37,8 @@
 	private uint focused_window_id;
 
 	private IBus.Bus? ibus;
-	private IBus.PanelService? panel_service;
+	private IBusPanel? ibus_panel;
+	private ulong ibus_connected_id;
 	private uint panel_timeout;
 
 	private Source[]? sources;
@@ -132,6 +133,43 @@
 	}
 
 	[DBus (visible = false)]
+	private IBusPanel? get_ibus_panel () {
+		if (ibus_panel == null && get_ibus ().is_connected ()) {
+			var connection = get_ibus ().get_connection ();
+			var name = "org.freedesktop.IBus.Panel";
+			var path = "/org/freedesktop/IBus/Panel";
+
+			try {
+				ibus_panel = connection.get_proxy_sync (name, path);
+
+				((!) ibus_panel).properties_registered.connect ((variant) => {
+					var properties = new IBus.PropList ();
+					properties.deserialize (variant);
+
+					if (properties is IBus.PropList) {
+						handle_properties_registered ((!) (properties as IBus.PropList));
+					}
+				});
+				((!) ibus_panel).property_updated.connect ((variant) => {
+					var type = IBus.PropType.NORMAL;
+					var state = IBus.PropState.INCONSISTENT;
+					var text = new IBus.Text.from_static_string ("");
+					var property = new IBus.Property ("", type, text, null, text, false, false, state, null);
+					property.deserialize (variant);
+
+					if (property is IBus.Property) {
+						handle_property_updated ((!) (property as IBus.Property));
+					}
+				});
+			} catch (IOError error) {
+				warning ("error: %s", error.message);
+			}
+		}
+
+		return ibus_panel;
+	}
+
+	[DBus (visible = false)]
 	public void up () {
 		if (loop == null) {
 			loop = new MainLoop ();
@@ -576,11 +614,12 @@
 					}
 				}
 
-				if (panel_service == null && sources[i].is_ibus) {
-					if (get_ibus ().request_name (IBus.SERVICE_PANEL, IBus.BusNameFlag.REPLACE_EXISTING) > 0) {
-						panel_service = new IBus.PanelService (get_ibus ().get_connection ());
-						((!) panel_service).register_properties.connect (handle_registered_properties);
-						((!) panel_service).update_property.connect (handle_updated_property);
+				if (ibus_connected_id == 0 && sources[i].is_ibus) {
+					ibus_connected_id = get_ibus ().connected.connect (() => { get_ibus_panel (); });
+					get_ibus ().disconnected.connect (() => { ibus_panel = null; });
+
+					if (get_ibus ().is_connected ()) {
+						get_ibus_panel ();
 					}
 				}
 			}
@@ -590,7 +629,7 @@
 	}
 
 	[DBus (visible = false)]
-	private void handle_registered_properties (IBus.PropList list) {
+	private void handle_properties_registered (IBus.PropList list) {
 		if (panel_timeout > 0) {
 			GLib.Source.remove (panel_timeout);
 			panel_timeout = 0;
@@ -604,7 +643,7 @@
 	}
 
 	[DBus (visible = false)]
-	private void handle_updated_property (IBus.Property property) {
+	private void handle_property_updated (IBus.Property property) {
 		get_ibus_menu ().update_property (property);
 	}
 
@@ -747,8 +786,14 @@
 		if (ibus_menu == null) {
 			ibus_menu = new IBusMenu (get_action_group ());
 			((!) ibus_menu).activate.connect ((property, state) => {
-				if (panel_service != null) {
-					((!) panel_service).property_activate (property.key, state);
+				var panel = get_ibus_panel ();
+
+				if (panel != null) {
+					try {
+						((!) panel).activate_property (property.key, state);
+					} catch (IOError error) {
+						warning ("error: %s", error.message);
+					}
 				}
 			});
 		}

=== modified file 'po/indicator-keyboard.pot'
--- po/indicator-keyboard.pot	2013-09-27 15:10:19 +0000
+++ po/indicator-keyboard.pot	2014-03-19 23:26:13 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-27 16:28+0200\n"
+"POT-Creation-Date: 2014-03-20 12:25+1300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,19 +17,19 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/main.vala:427
+#: ../lib/main.vala:667
 #, c-format
 msgid "%s input source"
 msgstr ""
 
-#: ../lib/main.vala:525
+#: ../lib/main.vala:815
 msgid "Character Map"
 msgstr ""
 
-#: ../lib/main.vala:526
+#: ../lib/main.vala:816
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: ../lib/main.vala:527
+#: ../lib/main.vala:817
 msgid "Text Entry Settings..."
 msgstr ""