diff -Nru ibus-1.5.8/debian/changelog ibus-1.5.8/debian/changelog --- ibus-1.5.8/debian/changelog 2014-08-04 15:58:56.000000000 +0200 +++ ibus-1.5.8/debian/changelog 2014-08-05 11:38:22.000000000 +0200 @@ -1,3 +1,21 @@ +ibus (1.5.8-1ubuntu1) utopic; urgency=low + + * Merge from Debian unstable (LP: #1352805). Remaining changes: + - debian/rules: + + Build with dh_translations. Add dh-translations build dependency. + - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input + Methods" + - debian/patches/ibus-no-notification.patch: Don't show the notification + if not actually upgrading from a previous version. (LP: #1255542). + * debian/patches/ubuntu-forward-panel-properties.patch: + - Augment the panel service D-Bus interface so that external consumers can + detect when the panel service properties are changed. (LP: #1290881) + * debian/patches/ubuntu-disable-trigger.patch: + - Disable input method switching under Unity; it's handled by + gnome-settings-daemon. (LP: #1278511) + + -- Gianfranco Costamagna Tue, 05 Aug 2014 11:38:13 +0200 + ibus (1.5.8-1) unstable; urgency=medium [ Aron Xu ] @@ -75,6 +93,37 @@ -- Osamu Aoki Thu, 05 Jun 2014 22:41:50 +0900 +ibus (1.5.5-1ubuntu3) trusty; urgency=medium + + * debian/patches/ubuntu-forward-panel-properties.patch: + - Augment the panel service D-Bus interface so that external consumers can + detect when the panel service properties are changed. (LP: #1290881) + + -- William Hua Wed, 19 Mar 2014 14:08:29 +1300 + +ibus (1.5.5-1ubuntu2) trusty; urgency=medium + + * debian/patches/ubuntu-disable-trigger.patch: + - Disable input method switching under Unity; it's handled by + gnome-settings-daemon. (LP: #1278511) + + -- William Hua Thu, 13 Feb 2014 18:33:46 -0500 + +ibus (1.5.5-1ubuntu1) trusty; urgency=medium + + * Merge with Debian (LP: #1276143); remaining changes: + - debian/rules: + + Build with dh_translations. Add dh-translations build dependency. + - Add 02_title_update.patch: Rename "IBus Preferences" to "Keyboard Input + Methods" + - debian/patches/ibus-no-notification.patch: Don't show the notification + if not actually upgrading from a previous version. (LP: #1255542). + * debian/patches/03_dont_run_dconf_update.patch: added + - Don't run "dconf update" if $(DESTDIR) is set + + https://github.com/ibus/ibus/commit/e6ec45d64a32d16245770f8b80e795a63e6ad553 + + -- Ikuya Awashiro Mon, 03 Feb 2014 22:34:56 +0900 + ibus (1.5.5-1) unstable; urgency=medium * New upstream release. @@ -806,3 +855,4 @@ * Add im-switch's support, stole it from scim-bridge. :) -- Zhengpeng Hou Sun, 30 Nov 2008 10:41:05 +0000 + diff -Nru ibus-1.5.8/debian/control ibus-1.5.8/debian/control --- ibus-1.5.8/debian/control 2014-08-04 15:58:32.000000000 +0200 +++ ibus-1.5.8/debian/control 2014-08-05 11:38:38.000000000 +0200 @@ -1,7 +1,8 @@ Source: ibus Section: utils Priority: optional -Maintainer: IME Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: IME Packaging Team Uploaders: Aron Xu , Osamu Aoki Build-Depends: autoconf, automake, @@ -11,6 +12,7 @@ debhelper (>= 9), desktop-file-utils, dh-autoreconf, + dh-translations, dh-python, gconf2, gettext, diff -Nru ibus-1.5.8/debian/patches/02_title_update.patch ibus-1.5.8/debian/patches/02_title_update.patch --- ibus-1.5.8/debian/patches/02_title_update.patch 1970-01-01 01:00:00.000000000 +0100 +++ ibus-1.5.8/debian/patches/02_title_update.patch 2014-08-05 11:31:02.000000000 +0200 @@ -0,0 +1,41 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_title_update.dpatch by Sebastien Bacher +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- a/setup/ibus-setup.desktop.in ++++ b/setup/ibus-setup.desktop.in +@@ -1,6 +1,6 @@ + [Desktop Entry] +-_Name=IBus Preferences +-_Comment=Set IBus Preferences ++_Name=Keyboard Input Methods ++_Comment=Adjust methods for keyboard input. + Exec=ibus-setup + Icon=ibus-setup + Terminal=false +--- a/setup/main.py ++++ b/setup/main.py +@@ -365,7 +365,7 @@ + if self.__bus.is_connected(): + return + +- message = _("The IBus daemon is not running. Do you wish to start it?") ++ message = _("Keyboard Input Methods (IBus Daemon) is not running. Do you wish to start it?") + dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.QUESTION, + buttons = Gtk.ButtonsType.YES_NO, + text = message) +@@ -387,10 +387,7 @@ + + if self.__bus.is_connected(): + message = _("IBus has been started! " +- "If you cannot use IBus, add the following lines to your $HOME/.bashrc; then relog into your desktop.\n" +- " export GTK_IM_MODULE=ibus\n" +- " export XMODIFIERS=@im=ibus\n" +- " export QT_IM_MODULE=ibus" ++ "If you can not use IBus, please open System Menu -> System Settings -> Language Support and set the \"Keyboard Input Method\" to \"ibus\", then log out and back in again." + ) + dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.INFO, + buttons = Gtk.ButtonsType.OK, diff -Nru ibus-1.5.8/debian/patches/ibus-no-notification.patch ibus-1.5.8/debian/patches/ibus-no-notification.patch --- ibus-1.5.8/debian/patches/ibus-no-notification.patch 1970-01-01 01:00:00.000000000 +0100 +++ ibus-1.5.8/debian/patches/ibus-no-notification.patch 2014-08-05 11:31:02.000000000 +0200 @@ -0,0 +1,17 @@ +Description: don't show notification if not upgrading from a previous version +Author: Marc Deslauriers +Bug: http://code.google.com/p/ibus/issues/detail?id=1677 +Bug-Ubuntu: https://bugs.launchpad.net/ibus/+bug/1255542 +Forwarded: yes + +--- a/ui/gtk3/panel.vala ++++ b/ui/gtk3/panel.vala +@@ -632,7 +632,7 @@ + string prev_version = m_settings_general.get_string("version"); + string current_version = null; + +- if (compare_versions(prev_version, "1.5.3") < 0) ++ if (prev_version != "" && compare_versions(prev_version, "1.5.3") < 0) + update_version_1_5_3(); + + if (compare_versions(prev_version, "1.5.8") < 0) diff -Nru ibus-1.5.8/debian/patches/ibus-xx-setup-frequent-lang.patch ibus-1.5.8/debian/patches/ibus-xx-setup-frequent-lang.patch --- ibus-1.5.8/debian/patches/ibus-xx-setup-frequent-lang.patch 2014-08-03 13:04:24.000000000 +0200 +++ ibus-1.5.8/debian/patches/ibus-xx-setup-frequent-lang.patch 2014-08-05 11:31:01.000000000 +0200 @@ -11,7 +11,7 @@ --- a/data/ibus.schemas.in +++ b/data/ibus.schemas.in -@@ -384,6 +384,174 @@ +@@ -327,6 +327,174 @@ diff -Nru ibus-1.5.8/debian/patches/series ibus-1.5.8/debian/patches/series --- ibus-1.5.8/debian/patches/series 2014-08-04 15:58:32.000000000 +0200 +++ ibus-1.5.8/debian/patches/series 2014-08-05 11:32:02.000000000 +0200 @@ -1,3 +1,7 @@ ## This makes ibus-setup looks cleaner. Keep this. ## Old FC patch4: Hide minor input method engines on ibus-setup by locale ibus-xx-setup-frequent-lang.patch +02_title_update.patch +ibus-no-notification.patch +ubuntu-disable-trigger.patch +ubuntu-forward-panel-properties.patch diff -Nru ibus-1.5.8/debian/patches/ubuntu-disable-trigger.patch ibus-1.5.8/debian/patches/ubuntu-disable-trigger.patch --- ibus-1.5.8/debian/patches/ubuntu-disable-trigger.patch 1970-01-01 01:00:00.000000000 +0100 +++ ibus-1.5.8/debian/patches/ubuntu-disable-trigger.patch 2014-08-05 11:32:08.000000000 +0200 @@ -0,0 +1,1283 @@ +--- /dev/null ++++ b/setup/setup-unity.ui +@@ -0,0 +1,1220 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Horizontal ++ ++ ++ Vertical ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Top left corner ++ ++ ++ Top right corner ++ ++ ++ Bottom left corner ++ ++ ++ Bottom right corner ++ ++ ++ Custom ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Do not show ++ ++ ++ Hide automatically ++ ++ ++ Always ++ ++ ++ ++ ++ False ++ 12 ++ IBus Preferences ++ False ++ center-always ++ ibus-setup ++ ++ ++ True ++ False ++ 12 ++ ++ ++ True ++ True ++ ++ ++ True ++ False ++ 12 ++ 12 ++ 12 ++ 12 ++ ++ ++ True ++ False ++ 18 ++ ++ ++ True ++ False ++ 0 ++ none ++ ++ ++ True ++ False ++ 6 ++ 12 ++ ++ ++ True ++ False ++ 5 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ False ++ The shortcut keys for switching to next input method in the list ++ 0 ++ Next input method: ++ ++ ++ 3 ++ 4 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ False ++ The shortcut keys for switching to previous input method in the list ++ 0 ++ Previous input method: ++ ++ ++ 4 ++ 5 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ True ++ False ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ ... ++ False ++ True ++ True ++ False ++ False ++ True ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ True ++ False ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ ... ++ False ++ True ++ True ++ False ++ False ++ True ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ 3 ++ 4 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ > True ++ False ++ True ++ False ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ ... ++ False ++ True ++ False ++ True ++ False ++ False ++ True ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ 4 ++ 5 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ The shortcut keys for turning input method on or off ++ 0 ++ Enable or disable: ++ ++ ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ 0 ++ Enable: ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ True ++ False ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ ... ++ False ++ True ++ True ++ True ++ False ++ True ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ 0 ++ Disable: ++ ++ ++ 2 ++ 3 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ True ++ False ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ ... ++ False ++ True ++ True ++ True ++ False ++ True ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ False ++ <b>Keyboard Shortcuts</b> ++ True ++ ++ ++ ++ ++ False ++ True ++ 0 ++ ++ ++ ++ ++ True ++ False ++ 0 ++ none ++ ++ ++ True ++ False ++ 6 ++ 12 ++ ++ ++ True ++ False ++ 7 ++ 2 ++ 12 ++ 6 ++ ++ ++ True ++ False ++ Set the orientation of candidates in lookup table ++ 0 ++ Candidates orientation: ++ right ++ ++ ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ model_candidates_orientation ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ Set the behavior of ibus how to show or hide language bar ++ 0 ++ Show property panel: ++ right ++ ++ ++ 1 ++ 2 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ False ++ True ++ 0 ++ Language panel position: ++ right ++ ++ ++ 2 ++ 3 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ True ++ False ++ model_panel_show_mode ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ GTK_FILL ++ ++ ++ ++ ++ False ++ True ++ model_panel_position ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ ++ Show icon on system tray ++ False ++ True ++ True ++ False ++ Show icon on system tray ++ False ++ 0 ++ True ++ ++ ++ 2 ++ 3 ++ 4 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ Show input method name on language bar ++ False ++ True ++ True ++ False ++ Show input method's name on language bar when check the checkbox ++ False ++ 0 ++ True ++ ++ ++ 2 ++ 4 ++ 5 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ Embed preedit text in application window ++ False ++ True ++ True ++ False ++ Embed the preedit text of input method in the application window ++ False ++ 0 ++ True ++ ++ ++ 2 ++ 5 ++ 6 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ Use custom font: ++ False ++ True ++ True ++ False ++ False ++ True ++ 0 ++ True ++ ++ ++ 6 ++ 7 ++ GTK_FILL ++ GTK_FILL ++ ++ ++ ++ ++ False ++ True ++ True ++ True ++ False ++ ++ ++ 1 ++ 2 ++ 6 ++ 7 ++ GTK_FILL ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ False ++ <b>Font and Style</b> ++ True ++ ++ ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ False ++ General ++ ++ ++ False ++ ++ ++ ++ ++ True ++ False ++ 12 ++ 12 ++ 12 ++ 12 ++ ++ ++ True ++ False ++ ++ ++ True ++ Customize active input _methods ++ True ++ True ++ False ++ Customize active input methods ++ True ++ ++ ++ False ++ True ++ 0 ++ ++ ++ ++ ++ True ++ False ++ ++ ++ True ++ False ++ ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ False ++ ++ ++ True ++ ++ ++ ++ ++ False ++ True ++ 0 ++ ++ ++ ++ ++ 240 ++ 300 ++ True ++ True ++ in ++ ++ ++ True ++ True ++ ++ ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ True ++ False ++ 12 ++ ++ ++ True ++ False ++ 5 ++ start ++ ++ ++ gtk-add ++ False ++ True ++ False ++ True ++ True ++ Add the selected input method into the enabled input methods ++ False ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-remove ++ False ++ True ++ False ++ True ++ True ++ Remove the selected input method from the enabled input methods ++ False ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ gtk-go-up ++ False ++ True ++ False ++ True ++ True ++ Move up the selected input method in the enabled input methods list ++ False ++ True ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ gtk-go-down ++ False ++ True ++ False ++ True ++ True ++ Move down the selected input method in the enabled input methods ++ False ++ True ++ ++ ++ False ++ False ++ 3 ++ ++ ++ ++ ++ gtk-about ++ False ++ True ++ False ++ True ++ True ++ Show information of the selected input method ++ False ++ True ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ gtk-preferences ++ False ++ True ++ False ++ True ++ True ++ Show setup of the selected input method ++ False ++ True ++ ++ ++ False ++ False ++ 5 ++ ++ ++ ++ ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ False ++ 6 ++ ++ ++ True ++ False ++ gtk-info ++ 2 ++ ++ ++ False ++ True ++ 0 ++ ++ ++ ++ ++ True ++ False ++ 0 ++ True ++ <small><i>The active input method can be switched around from the selected ones in the above list by pressing the keyboard shortcut keys or clicking the panel icon.</i></small> ++ True ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ True ++ 2 ++ ++ ++ ++ ++ ++ ++ 1 ++ ++ ++ ++ ++ True ++ False ++ Input Method ++ ++ ++ 1 ++ False ++ ++ ++ ++ ++ True ++ False ++ 12 ++ 12 ++ 12 ++ 12 ++ ++ ++ True ++ False ++ ++ ++ True ++ False ++ 0 ++ none ++ ++ ++ True ++ False ++ 12 ++ ++ ++ True ++ False ++ 6 ++ 12 ++ ++ ++ True ++ False ++ 6 ++ ++ ++ Use system keyboard layout ++ False ++ True ++ True ++ False ++ Use system keyboard (XKB) layout ++ False ++ 0 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ False ++ <b>Keyboard Layout</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ False ++ 0 ++ none ++ ++ ++ True ++ False ++ 12 ++ ++ ++ True ++ False ++ 6 ++ 12 ++ ++ ++ True ++ False ++ 6 ++ ++ ++ Share the same input method among all applications ++ False ++ True ++ True ++ False ++ False ++ 0 ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ True ++ False ++ <b>Global input method settings</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ 2 ++ ++ ++ ++ ++ True ++ False ++ Advanced ++ ++ ++ 3 ++ False ++ ++ ++ ++ ++ False ++ True ++ ++ ++ ++ ++ ++ True ++ False ++ <big><b>IBus</b></big> ++<small>The intelligent input bus</small> ++Homepage: http://code.google.com/p/ibus ++ ++ ++ ++ ++ True ++ center ++ ++ ++ True ++ True ++ 1 ++ ++ ++ ++ ++ False ++ True ++ 0 ++ none ++ ++ ++ True ++ False ++ 6 ++ 12 ++ ++ ++ Start ibus on login ++ False ++ True ++ True ++ False ++ False ++ True ++ 0 ++ True ++ ++ ++ ++ ++ ++ ++ True ++ False ++ <b>Startup</b> ++ True ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ 3 ++ ++ ++ ++ ++ True ++ False ++ About ++ ++ ++ 3 ++ False ++ ++ ++ ++ ++ True ++ True ++ 0 ++ ++ ++ ++ ++ True ++ False ++ 12 ++ end ++ ++ ++ gtk-close ++ False ++ True ++ True ++ False ++ False ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ False ++ True ++ 1 ++ ++ ++ ++ ++ ++ +--- a/ui/gtk3/panel.vala ++++ b/ui/gtk3/panel.vala +@@ -247,7 +247,14 @@ + (e) => handle_engine_switch(e, true)); + } + ++ private bool is_unity() { ++ return Environment.get_variable("XDG_CURRENT_DESKTOP") == "Unity"; ++ } ++ + private void bind_switch_shortcut() { ++ if (is_unity()) ++ return; ++ + string[] accelerators = m_settings_hotkey.get_strv("triggers"); + + var keybinding_manager = KeybindingManager.get_instance(); +@@ -258,6 +265,9 @@ + } + + private void unbind_switch_shortcut() { ++ if (is_unity()) ++ return; ++ + var keybinding_manager = KeybindingManager.get_instance(); + + unowned GLib.List keybindings = m_keybindings; +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -33,6 +33,7 @@ + + ibussetup_DATA = \ + setup.ui \ ++ setup-unity.ui \ + $(NULL) + + bin_SCRIPTS = ibus-setup +@@ -65,6 +66,7 @@ + $(man_one_in_files) \ + ibus-setup.in \ + setup.ui \ ++ setup-unity.ui \ + ibus-setup.desktop.in \ + $(NULL) + +--- a/setup/main.py ++++ b/setup/main.py +@@ -95,7 +95,11 @@ + # Gtk.ListBox has been available since gtk 3.10 + self.__has_list_box = hasattr(Gtk, 'ListBox') + +- gtk_builder_file = path.join(path.dirname(__file__), "./setup.ui") ++ if os.getenv("XDG_CURRENT_DESKTOP") == "Unity": ++ gtk_builder_file = path.join(path.dirname(__file__), "./setup-unity.ui") ++ else: ++ gtk_builder_file = path.join(path.dirname(__file__), "./setup.ui") ++ + self.__builder = Gtk.Builder() + self.__builder.set_translation_domain(DOMAINNAME) + self.__builder.add_from_file(gtk_builder_file); diff -Nru ibus-1.5.8/debian/patches/ubuntu-forward-panel-properties.patch ibus-1.5.8/debian/patches/ubuntu-forward-panel-properties.patch --- ibus-1.5.8/debian/patches/ubuntu-forward-panel-properties.patch 1970-01-01 01:00:00.000000000 +0100 +++ ibus-1.5.8/debian/patches/ubuntu-forward-panel-properties.patch 2014-08-05 11:32:10.000000000 +0200 @@ -0,0 +1,84 @@ +Description: Broadcast when panel properties are registered/updated + Augment the panel service D-Bus interface so that external consumers can + detect when the panel service properties are changed. +Author: William Hua +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1290881 + +--- a/src/ibuspanelservice.c ++++ b/src/ibuspanelservice.c +@@ -141,8 +141,24 @@ + + G_DEFINE_TYPE (IBusPanelService, ibus_panel_service, IBUS_TYPE_SERVICE) + ++/* Ubuntu-specific */ ++#define UBUNTU_INTERFACE_PANEL "com.canonical.IBus.Panel.Private" ++ + static const gchar introspection_xml[] = + "" ++ /* Ubuntu-specific */ ++ " " ++ " " ++ " " ++ " " ++ " " ++ " " ++ " " ++ " " ++ " " ++ " " ++ " " ++ " " + " " + /* Methods */ + " " +@@ -876,6 +892,20 @@ + { + IBusPanelService *panel = IBUS_PANEL_SERVICE (service); + ++ /* Ubuntu-specific */ ++ if (g_strcmp0 (interface_name, UBUNTU_INTERFACE_PANEL) == 0) { ++ if (g_strcmp0 (method_name, "ActivateProperty") == 0) { ++ const gchar *name; ++ guint state; ++ ++ g_variant_get (parameters, "(&su)", &name, &state); ++ ++ ibus_panel_service_property_activate (panel, name, state); ++ g_dbus_method_invocation_return_value (invocation, NULL); ++ return; ++ } ++ } ++ + if (g_strcmp0 (interface_name, IBUS_INTERFACE_PANEL) != 0) { + IBUS_SERVICE_CLASS (ibus_panel_service_parent_class)-> + service_method_call (service, +@@ -964,6 +994,14 @@ + g_signal_emit (panel, panel_signals[REGISTER_PROPERTIES], 0, prop_list); + _g_object_unref_if_floating (prop_list); + g_dbus_method_invocation_return_value (invocation, NULL); ++ ++ /* Ubuntu-specific */ ++ ibus_service_emit_signal ((IBusService *) panel, ++ NULL, ++ UBUNTU_INTERFACE_PANEL, ++ "PropertiesRegistered", ++ parameters, ++ NULL); + return; + } + +@@ -975,6 +1013,14 @@ + g_signal_emit (panel, panel_signals[UPDATE_PROPERTY], 0, property); + _g_object_unref_if_floating (property); + g_dbus_method_invocation_return_value (invocation, NULL); ++ ++ /* Ubuntu-specific */ ++ ibus_service_emit_signal ((IBusService *) panel, ++ NULL, ++ UBUNTU_INTERFACE_PANEL, ++ "PropertyUpdated", ++ parameters, ++ NULL); + return; + } + diff -Nru ibus-1.5.8/debian/rules ibus-1.5.8/debian/rules --- ibus-1.5.8/debian/rules 2014-08-03 17:36:29.000000000 +0200 +++ ibus-1.5.8/debian/rules 2014-08-05 11:03:50.000000000 +0200 @@ -9,7 +9,12 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --parallel --with autoreconf,gir,python2,python3 + dh $@ --parallel --with autoreconf,gir,python2,python3,translations + +override_dh_auto_clean: + -rm -f bindings/vala/ibus-1.0.vapi + -rm -f data/dconf/00-upstream-settings + dh_auto_clean CONFIGURE_FLAGS = \ --disable-silent-rules \