diff options
| -rw-r--r-- | lib/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/ibus-panel.vala | 26 | ||||
| -rw-r--r-- | lib/main.vala | 48 |
3 files changed, 65 insertions, 10 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 7432d15c..b99073e1 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -10,6 +10,7 @@ indicator_keyboard_service_SOURCES = main.vala \ source.vala \ common.vala \ ibus-menu.vala \ + ibus-panel.vala \ window-stack.vala \ unity-greeter.vala indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \ diff --git a/lib/ibus-panel.vala b/lib/ibus-panel.vala new file mode 100644 index 00000000..460b1eac --- /dev/null +++ b/lib/ibus-panel.vala @@ -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 <william.hua@canonical.com> + */ + +[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); +} diff --git a/lib/main.vala b/lib/main.vala index f012ecb0..4367e9ae 100644 --- a/lib/main.vala +++ b/lib/main.vala @@ -37,7 +37,7 @@ public class Indicator.Keyboard.Service : Object { private uint focused_window_id; private IBus.Bus? ibus; - private IBus.PanelService? panel_service; + private IBusPanel? ibus_panel; private uint panel_timeout; private Source[]? sources; @@ -576,11 +576,35 @@ public class Indicator.Keyboard.Service : Object { } } - 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_panel == null && sources[i].is_ibus) { + 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); } } } @@ -590,7 +614,7 @@ public class Indicator.Keyboard.Service : Object { } [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 +628,7 @@ public class Indicator.Keyboard.Service : Object { } [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 +771,12 @@ public class Indicator.Keyboard.Service : Object { 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); + if (ibus_panel != null) { + try { + ((!) ibus_panel).activate_property (property.key, state); + } catch (IOError error) { + warning ("error: %s", error.message); + } } }); } |