From e3f31de1e4718b6888ae613133802020dcecd303 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 12 Nov 2015 13:36:00 +0100 Subject: Fork from Ubuntu's indicator-keyboard. --- .bzr-builddeb/default.conf | 2 - .bzrignore | 2 +- configure.ac | 10 ++-- data/Makefile.am | 70 +++++++++++----------- data/com.canonical.indicator.keyboard.gschema.xml | 15 ----- data/org.ayatana.indicator.keyboard.gschema.xml | 15 +++++ debian/changelog | 6 ++ debian/control | 26 ++++---- debian/rules | 7 +-- lib/Makefile.am | 2 +- lib/ibus-panel.vala | 2 +- lib/indicator-menu.vala | 2 +- lib/keyboard-plugin.vala | 2 +- lib/main.vala | 22 +++---- lib/unity-greeter.vala | 2 +- lib/unity-session.vala | 2 +- lib/window-stack.vala | 2 +- .../com.canonical.indicator.keyboard.test.Execute | 3 - tests/execute/gkbd-keyboard-display | 2 +- tests/execute/gucharmap | 2 +- .../org.ayatana.indicator.keyboard.test.Execute | 3 + tests/execute/unity-control-center | 2 +- tests/main.vala | 50 ++++++++-------- .../services/ayatana-indicator-keyboard.service.in | 3 + tests/services/indicator-keyboard.service.in | 3 - 25 files changed, 128 insertions(+), 129 deletions(-) delete mode 100644 .bzr-builddeb/default.conf delete mode 100644 data/com.canonical.indicator.keyboard.gschema.xml create mode 100644 data/org.ayatana.indicator.keyboard.gschema.xml delete mode 100755 tests/execute/com.canonical.indicator.keyboard.test.Execute create mode 100755 tests/execute/org.ayatana.indicator.keyboard.test.Execute create mode 100644 tests/services/ayatana-indicator-keyboard.service.in delete mode 100644 tests/services/indicator-keyboard.service.in diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf deleted file mode 100644 index 6c96a984..00000000 --- a/.bzr-builddeb/default.conf +++ /dev/null @@ -1,2 +0,0 @@ -[BUILDDEB] -split = True diff --git a/.bzrignore b/.bzrignore index f59e91ad..434bf43c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -16,7 +16,7 @@ build-aux config.log config.status configure -data/com.canonical.indicator.keyboard +data/org.ayatana.indicator.keyboard data/gschemas.compiled data/indicator-keyboard-icon-generator data/indicator-keyboard.conf diff --git a/configure.ac b/configure.ac index ba599e72..058c84dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.69]) -AC_INIT([indicator-keyboard], [0.0.0]) -AC_REVISION([0.0.0]) +AC_INIT([ayatana-indicator-keyboard], [0.1.0]) +AC_REVISION([0.1.0]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([build-aux]) @@ -19,14 +19,14 @@ AC_PROG_INSTALL PKG_PROG_PKG_CONFIG([0.26]) AC_ARG_WITH([dbus-service-dir], [AS_HELP_STRING([--with-dbus-service-dir=DIR], [D-Bus service directory [default=$datadir/dbus-1/services]])], [], [with_dbus_service_dir=$datadir/dbus-1/services]) -AC_ARG_WITH([indicator-dir], [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])], [], [with_indicator_dir=$datadir/unity/indicators]) +AC_ARG_WITH([indicator-dir], [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/ayatana/indicators]])], [], [with_indicator_dir=$datadir/ayatana/indicators]) AM_PATH_PYTHON AC_SUBST([DBUS_SERVICE_DIR], [$with_dbus_service_dir]) AC_SUBST([INDICATOR_DIR], [$with_indicator_dir]) -GETTEXT_PACKAGE=indicator-keyboard +GETTEXT_PACKAGE=ayatana-indicator-keyboard AC_SUBST([GETTEXT_PACKAGE]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [The prefix for our gettext translation domains.]) AM_GLIB_GNU_GETTEXT @@ -64,7 +64,7 @@ AC_CONFIG_FILES([Makefile tests/Makefile tests/autopilot/Makefile tests/config.vala - tests/services/indicator-keyboard.service]) + tests/services/ayatana-indicator-keyboard.service]) AC_CONFIG_FILES([tests/indicator-keyboard-test], [chmod +x tests/indicator-keyboard-test]) diff --git a/data/Makefile.am b/data/Makefile.am index 61e5c37f..bb9a1f82 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = upstart # Icon Generator ########################### -noinst_PROGRAMS = indicator-keyboard-icon-generator +noinst_PROGRAMS = ayatana-indicator-keyboard-icon-generator AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API AM_LDFLAGS = -lm @@ -13,38 +13,38 @@ AM_VALAFLAGS = --enable-experimental-non-null \ --metadatadir $(top_srcdir)/deps \ --vapidir $(top_srcdir)/deps -indicator_keyboard_icon_generator_SOURCES = main.vala \ - $(top_srcdir)/lib/common.vala -indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS) \ - --pkg gee-1.0 \ - --pkg fontconfig-2.0 \ - --pkg freetype2-2.0 \ - --pkg PangoFT2-1.0 \ - --pkg gtk+-3.0 \ - --pkg GDesktopEnums-3.0 \ - --pkg GnomeDesktop-3.0 \ +ayatana_indicator_keyboard_icon_generator_SOURCES = main.vala \ + $(top_srcdir)/lib/common.vala +ayatana_indicator_keyboard_icon_generator_VALAFLAGS = $(AM_VALAFLAGS) \ + --pkg gee-1.0 \ + --pkg fontconfig-2.0 \ + --pkg freetype2-2.0 \ + --pkg PangoFT2-1.0 \ + --pkg gtk+-3.0 \ + --pkg GDesktopEnums-3.0 \ + --pkg GnomeDesktop-3.0 \ --pkg Xkl-1.0 -indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS) \ - $(GEE_CFLAGS) \ - $(PANGOFT2_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GNOME_DESKTOP_CFLAGS) \ - $(LIBXKLAVIER_CFLAGS) \ - $(COVERAGE_CFLAGS) -indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS) \ - $(GEE_LIBS) \ - $(PANGOFT2_LIBS) \ - $(GTK_LIBS) \ - $(GNOME_DESKTOP_LIBS) \ - $(LIBXKLAVIER_LIBS) \ - $(COVERAGE_LDFLAGS) +ayatana_indicator_keyboard_icon_generator_CFLAGS = $(AM_CFLAGS) \ + $(GEE_CFLAGS) \ + $(PANGOFT2_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GNOME_DESKTOP_CFLAGS) \ + $(LIBXKLAVIER_CFLAGS) \ + $(COVERAGE_CFLAGS) +ayatana_indicator_keyboard_icon_generator_LDFLAGS = $(AM_LDFLAGS) \ + $(GEE_LIBS) \ + $(PANGOFT2_LIBS) \ + $(GTK_LIBS) \ + $(GNOME_DESKTOP_LIBS) \ + $(LIBXKLAVIER_LIBS) \ + $(COVERAGE_LDFLAGS) ########################### # Upstart Config ########################### upstart_jobsdir = $(datadir)/upstart/sessions/ -upstart_jobs_DATA = indicator-keyboard.conf +upstart_jobs_DATA = ayatana-indicator-keyboard.conf %.conf: %.conf.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -54,7 +54,7 @@ upstart_jobs_DATA = indicator-keyboard.conf ########################### xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = indicator-keyboard.desktop +xdg_autostart_DATA = ayatana-indicator-keyboard.desktop %.desktop: %.desktop.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -63,33 +63,33 @@ xdg_autostart_DATA = indicator-keyboard.desktop # Indicator Config ########################### -dist_indicator_DATA = com.canonical.indicator.keyboard +dist_indicator_DATA = org.ayatana.indicator.keyboard indicatordir = $(INDICATOR_DIR) -com.canonical.indicator.keyboard: +org.ayatana.indicator.keyboard: $(AM_V_GEN) (echo '[Indicator Service]'; \ echo 'Name=indicator-keyboard'; \ - echo 'ObjectPath=/com/canonical/indicator/keyboard'; \ + echo 'ObjectPath=/org/ayatana/indicator/keyboard'; \ echo 'Position=80'; \ echo ''; \ echo '[desktop]'; \ - echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop'; \ + echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop'; \ echo ''; \ echo '[desktop_greeter]'; \ - echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop_greeter'; \ + echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop_greeter'; \ echo ''; \ echo '[desktop_lockscreen]'; \ - echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop_lockscreen'; \ + echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop_lockscreen'; \ echo ''; \ echo '[ubiquity]'; \ - echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \ + echo 'ObjectPath=/org/ayatana/indicator/keyboard/desktop') > $@.tmp && \ mv $@.tmp $@ ########################### # GSettings Schemas ########################### -gsettings_SCHEMAS = com.canonical.indicator.keyboard.gschema.xml +gsettings_SCHEMAS = org.ayatana.indicator.keyboard.gschema.xml @GSETTINGS_RULES@ diff --git a/data/com.canonical.indicator.keyboard.gschema.xml b/data/com.canonical.indicator.keyboard.gschema.xml deleted file mode 100644 index 9ee74fd3..00000000 --- a/data/com.canonical.indicator.keyboard.gschema.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Keyboard layouts migrated - True if keyboard layouts were migrated, false otherwise. - false - - - Keyboard indicator visibility - True if the keyboard indicator is shown, false otherwise. - true - - - diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml b/data/org.ayatana.indicator.keyboard.gschema.xml new file mode 100644 index 00000000..81ca4537 --- /dev/null +++ b/data/org.ayatana.indicator.keyboard.gschema.xml @@ -0,0 +1,15 @@ + + + + + Keyboard layouts migrated + True if keyboard layouts were migrated, false otherwise. + false + + + Keyboard indicator visibility + True if the keyboard indicator is shown, false otherwise. + true + + + diff --git a/debian/changelog b/debian/changelog index e571d118..111842a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ayatana-indicator-keyboard (0.1.0-0) UNRELEASED; urgency=medium + + * Fork from Ubuntu's indicator-keyboard. + + -- Mike Gabriel Thu, 12 Nov 2015 13:32:10 +0100 + indicator-keyboard (0.0.0+15.10.20151006-0ubuntu1) wily; urgency=medium [ CI Train Bot ] diff --git a/debian/control b/debian/control index acee03dc..3bf1be69 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,9 @@ Source: indicator-keyboard Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: William Hua +Maintainer: Mike Gabriel Build-Depends: debhelper (>= 9.0.0), dh-autoreconf, - dh-translations, dbus, fcitx-libs-dev (>= 1:4.2.8.3), gir1.2-fcitx-1.0, @@ -21,20 +19,18 @@ Build-Depends: debhelper (>= 9.0.0), xauth, xvfb, Standards-Version: 3.9.4 -Homepage: https://code.launchpad.net/indicator-keyboard -# If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, just go ahead. ~indicator-applet-developers will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-keyboard/trunk -Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-develpers/indicator-keyboard/trunk/files +Homepage: https://github.com/ArcticaProject/ayatana-indicator-keyboard +Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-keyboard.git +Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-indicator-keyboard.git/ -Package: indicator-keyboard +Package: ayatana-indicator-keyboard 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 - key layouts or languages, and helps the user identifying which layouts are - currently in use. +Description: Ayatana Keyboard indicator + This package contains the keyboard indicator, which should show as an + icon in the top panel of indicator aware destkop environments. + . + It can be used to switch key layouts or languages, and helps the user + identifying which layouts are currently in use. diff --git a/debian/rules b/debian/rules index d2bfba7b..e290d9e1 100755 --- a/debian/rules +++ b/debian/rules @@ -7,13 +7,12 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 %: - dh $@ --with autoreconf,translations + dh $@ --with autoreconf override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_install: - find debian/indicator-keyboard/usr/lib -name *.la -delete - find debian/indicator-keyboard/usr/lib -name *.a -delete + find debian/ayatana-indicator-keyboard/usr/lib -name *.la -delete + find debian/ayatana-indicator-keyboard/usr/lib -name *.a -delete dh_install --fail-missing - diff --git a/lib/Makefile.am b/lib/Makefile.am index d45b98dd..e458475c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -pkglibexec_PROGRAMS = indicator-keyboard-service +pkglibexec_PROGRAMS = ayatana-indicator-keyboard-service AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API AM_LDFLAGS = -lm diff --git a/lib/ibus-panel.vala b/lib/ibus-panel.vala index 460b1eac..2a380efd 100644 --- a/lib/ibus-panel.vala +++ b/lib/ibus-panel.vala @@ -16,7 +16,7 @@ * Authors: William Hua */ -[DBus (name="com.canonical.IBus.Panel.Private")] +[DBus (name="org.ayatana.IBus.Panel.Private")] public interface IBusPanel : Object { public abstract void activate_property (string name, uint state) throws IOError; diff --git a/lib/indicator-menu.vala b/lib/indicator-menu.vala index 96bf64d6..2cfa52c6 100644 --- a/lib/indicator-menu.vala +++ b/lib/indicator-menu.vala @@ -59,7 +59,7 @@ public class Indicator.Keyboard.IndicatorMenu : MenuModel { var indicator = new MenuItem.submenu (null, submenu); indicator.set_detailed_action ("indicator.indicator"); - indicator.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root"); + indicator.set_attribute ("x-canonical-type", "s", "org.ayatana.indicator.root"); /* We need special mouse actions on the lock screen. */ if (Options.DCONF in options) { diff --git a/lib/keyboard-plugin.vala b/lib/keyboard-plugin.vala index 5ee8ea24..af1628f6 100644 --- a/lib/keyboard-plugin.vala +++ b/lib/keyboard-plugin.vala @@ -16,7 +16,7 @@ * Authors: William Hua */ -[DBus (name="com.canonical.SettingsDaemon.Keyboard.Private")] +[DBus (name="org.ayatana.SettingsDaemon.Keyboard.Private")] public interface KeyboardPlugin : Object { public abstract void activate_input_source (uint index) throws IOError; diff --git a/lib/main.vala b/lib/main.vala index d3e063d1..9bb3eb1f 100644 --- a/lib/main.vala +++ b/lib/main.vala @@ -16,7 +16,7 @@ * Authors: William Hua */ -[DBus (name = "com.canonical.indicator.keyboard")] +[DBus (name = "org.ayatana.indicator.keyboard")] public class Indicator.Keyboard.Service : Object { private static const uint PROPERTIES_DELAY = 250; @@ -116,21 +116,21 @@ public class Indicator.Keyboard.Service : Object { handle_keyboard_name_vanished); Bus.watch_name (BusType.SESSION, - "com.canonical.Unity", + "org.ayatana.Unity", BusNameWatcherFlags.NONE, handle_unity_name_appeared, handle_unity_name_vanished); if (!is_fcitx_active ()) { Bus.watch_name (BusType.SESSION, - "com.canonical.Unity.WindowStack", + "org.ayatana.Unity.WindowStack", BusNameWatcherFlags.NONE, handle_window_stack_name_appeared, handle_window_stack_name_vanished); } } - indicator_settings = new Settings ("com.canonical.indicator.keyboard"); + indicator_settings = new Settings ("org.ayatana.indicator.keyboard"); indicator_settings.changed["visible"].connect (handle_changed_visible); source_settings = new Settings ("org.gnome.desktop.input-sources"); @@ -279,7 +279,7 @@ public class Indicator.Keyboard.Service : Object { [DBus (visible = false)] private void acquire_bus_name () { Bus.own_name (BusType.SESSION, - "com.canonical.indicator.keyboard", + "org.ayatana.indicator.keyboard", BusNameOwnerFlags.ALLOW_REPLACEMENT | (force ? BusNameOwnerFlags.REPLACE : 0), handle_bus_acquired, null, @@ -1185,7 +1185,7 @@ public class Indicator.Keyboard.Service : Object { [DBus (visible = false)] private void handle_unity_name_appeared (DBusConnection connection, string name, string name_owner) { try { - var session = Bus.get_proxy_sync (BusType.SESSION, name, "/com/canonical/Unity/Session"); + var session = Bus.get_proxy_sync (BusType.SESSION, name, "/org/ayatana/Unity/Session"); session.locked.connect (() => { var sources = get_sources (); @@ -1221,7 +1221,7 @@ public class Indicator.Keyboard.Service : Object { [DBus (visible = false)] private void handle_window_stack_name_appeared (DBusConnection connection, string name, string name_owner) { try { - window_stack = Bus.get_proxy_sync (BusType.SESSION, name, "/com/canonical/Unity/WindowStack"); + window_stack = Bus.get_proxy_sync (BusType.SESSION, name, "/org/ayatana/Unity/WindowStack"); update_window_sources (); } catch (IOError error) { warning ("error: %s", error.message); @@ -1236,10 +1236,10 @@ public class Indicator.Keyboard.Service : Object { [DBus (visible = false)] private void handle_bus_acquired (DBusConnection connection, string name) { try { - connection.export_action_group ("/com/canonical/indicator/keyboard", get_action_group ()); - connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop", get_desktop_menu ()); - connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop_greeter", get_desktop_greeter_menu ()); - connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop_lockscreen", get_desktop_lockscreen_menu ()); + connection.export_action_group ("/org/ayatana/indicator/keyboard", get_action_group ()); + connection.export_menu_model ("/org/ayatana/indicator/keyboard/desktop", get_desktop_menu ()); + connection.export_menu_model ("/org/ayatana/indicator/keyboard/desktop_greeter", get_desktop_greeter_menu ()); + connection.export_menu_model ("/org/ayatana/indicator/keyboard/desktop_lockscreen", get_desktop_lockscreen_menu ()); } catch (Error error) { warning ("error: %s", error.message); } diff --git a/lib/unity-greeter.vala b/lib/unity-greeter.vala index 2cdfe05c..5ca398ec 100644 --- a/lib/unity-greeter.vala +++ b/lib/unity-greeter.vala @@ -16,7 +16,7 @@ * Authors: William Hua */ -[DBus (name="com.canonical.UnityGreeter.List")] +[DBus (name="org.ayatana.UnityGreeter.List")] public interface UnityGreeter : Object { public abstract string get_active_entry () throws IOError; diff --git a/lib/unity-session.vala b/lib/unity-session.vala index 04bf3349..15337c36 100644 --- a/lib/unity-session.vala +++ b/lib/unity-session.vala @@ -16,7 +16,7 @@ * Authors: William Hua */ -[DBus (name="com.canonical.Unity.Session")] +[DBus (name="org.ayatana.Unity.Session")] public interface UnitySession : Object { public signal void locked (); diff --git a/lib/window-stack.vala b/lib/window-stack.vala index 980eba4f..a943da6a 100644 --- a/lib/window-stack.vala +++ b/lib/window-stack.vala @@ -24,7 +24,7 @@ public struct WindowInfo { public uint stage; } -[DBus (name="com.canonical.Unity.WindowStack")] +[DBus (name="org.ayatana.Unity.WindowStack")] public interface WindowStack : Object { public abstract string get_app_id_from_pid (uint pid) throws IOError; diff --git a/tests/execute/com.canonical.indicator.keyboard.test.Execute b/tests/execute/com.canonical.indicator.keyboard.test.Execute deleted file mode 100755 index ad73fd24..00000000 --- a/tests/execute/com.canonical.indicator.keyboard.test.Execute +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -gdbus call -e -d com.canonical.indicator.keyboard.test -o /com/canonical/indicator/keyboard/test -m com.canonical.indicator.keyboard.test.Execute "\'`basename $0` $*\'" diff --git a/tests/execute/gkbd-keyboard-display b/tests/execute/gkbd-keyboard-display index 849e205e..0d3a8512 120000 --- a/tests/execute/gkbd-keyboard-display +++ b/tests/execute/gkbd-keyboard-display @@ -1 +1 @@ -com.canonical.indicator.keyboard.test.Execute \ No newline at end of file +org.ayatana.indicator.keyboard.test.Execute \ No newline at end of file diff --git a/tests/execute/gucharmap b/tests/execute/gucharmap index 849e205e..0d3a8512 120000 --- a/tests/execute/gucharmap +++ b/tests/execute/gucharmap @@ -1 +1 @@ -com.canonical.indicator.keyboard.test.Execute \ No newline at end of file +org.ayatana.indicator.keyboard.test.Execute \ No newline at end of file diff --git a/tests/execute/org.ayatana.indicator.keyboard.test.Execute b/tests/execute/org.ayatana.indicator.keyboard.test.Execute new file mode 100755 index 00000000..58b0ce87 --- /dev/null +++ b/tests/execute/org.ayatana.indicator.keyboard.test.Execute @@ -0,0 +1,3 @@ +#!/bin/sh + +gdbus call -e -d org.ayatana.indicator.keyboard.test -o /org/ayatana/indicator/keyboard/test -m org.ayatana.indicator.keyboard.test.Execute "\'`basename $0` $*\'" diff --git a/tests/execute/unity-control-center b/tests/execute/unity-control-center index 849e205e..0d3a8512 120000 --- a/tests/execute/unity-control-center +++ b/tests/execute/unity-control-center @@ -1 +1 @@ -com.canonical.indicator.keyboard.test.Execute \ No newline at end of file +org.ayatana.indicator.keyboard.test.Execute \ No newline at end of file diff --git a/tests/main.vala b/tests/main.vala index e2782d1d..71e5e4a6 100644 --- a/tests/main.vala +++ b/tests/main.vala @@ -22,7 +22,7 @@ const int LONG_TIMEOUT_S = 10; static string display; -[DBus (name = "com.canonical.indicator.keyboard.test")] +[DBus (name = "org.ayatana.indicator.keyboard.test")] public class Service : Object { [DBus (visible = false)] @@ -56,7 +56,7 @@ public class Tests : Object, Fixture { if (_connection != null) { try { _service = new Service (); - _object_name = ((!) _connection).register_object ("/com/canonical/indicator/keyboard/test", _service); + _object_name = ((!) _connection).register_object ("/org/ayatana/indicator/keyboard/test", _service); } catch (IOError error) { _connection = null; _service = null; @@ -82,7 +82,7 @@ public class Tests : Object, Fixture { var loop = new MainLoop (null, false); _service_name = Bus.own_name (BusType.SESSION, - "com.canonical.indicator.keyboard.test", + "org.ayatana.indicator.keyboard.test", BusNameOwnerFlags.ALLOW_REPLACEMENT | BusNameOwnerFlags.REPLACE, (connection, name) => { if (loop.is_running ()) { @@ -104,7 +104,7 @@ public class Tests : Object, Fixture { loop.run (); if (_connection == null) { - Test.message ("error: Unable to connect to com.canonical.indicator.keyboard.test."); + Test.message ("error: Unable to connect to org.ayatana.indicator.keyboard.test."); Test.fail (); } @@ -150,8 +150,8 @@ public class Tests : Object, Fixture { } var action_group = DBusActionGroup.get ((!) _connection, - "com.canonical.indicator.keyboard", - "/com/canonical/indicator/keyboard"); + "org.ayatana.indicator.keyboard", + "/org/ayatana/indicator/keyboard"); action_group.list_actions (); action_group.activate_action ("current", new Variant.uint32 (2)); @@ -178,8 +178,8 @@ public class Tests : Object, Fixture { public void test_activate_character_map () { var action_group = DBusActionGroup.get ((!) _connection, - "com.canonical.indicator.keyboard", - "/com/canonical/indicator/keyboard"); + "org.ayatana.indicator.keyboard", + "/org/ayatana/indicator/keyboard"); var loop = new MainLoop (null, false); var signal_name = ((!) _service).notify["command"].connect ((pspec) => { loop.quit (); @@ -209,8 +209,8 @@ public class Tests : Object, Fixture { } var action_group = DBusActionGroup.get ((!) _connection, - "com.canonical.indicator.keyboard", - "/com/canonical/indicator/keyboard"); + "org.ayatana.indicator.keyboard", + "/org/ayatana/indicator/keyboard"); var loop = new MainLoop (null, false); var signal_name = ((!) _service).notify["command"].connect ((pspec) => { loop.quit (); @@ -229,8 +229,8 @@ public class Tests : Object, Fixture { public void test_activate_text_entry_settings () { var action_group = DBusActionGroup.get ((!) _connection, - "com.canonical.indicator.keyboard", - "/com/canonical/indicator/keyboard"); + "org.ayatana.indicator.keyboard", + "/org/ayatana/indicator/keyboard"); var loop = new MainLoop (null, false); var signal_name = ((!) _service).notify["command"].connect ((pspec) => { loop.quit (); @@ -252,7 +252,7 @@ public class Tests : Object, Fixture { var migrated = false; var sources = "[('xkb', 'us')]"; var layouts = "['us', 'ca\teng', 'epo']"; - Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated"); + Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard migrated $migrated"); Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\""); Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\""); } catch (SpawnError error) { @@ -282,7 +282,7 @@ public class Tests : Object, Fixture { return; } - dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS); + dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "org.ayatana.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS); } catch (Error error) { Test.message ("error: %s", error.message); Test.fail (); @@ -310,7 +310,7 @@ public class Tests : Object, Fixture { var migrated = true; var sources = "[('xkb', 'us')]"; var layouts = "['us', 'ca\teng', 'epo']"; - Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated"); + Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard migrated $migrated"); Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\""); Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\""); } catch (SpawnError error) { @@ -340,7 +340,7 @@ public class Tests : Object, Fixture { return; } - dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS); + dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "org.ayatana.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS); } catch (Error error) { Test.message ("error: %s", error.message); Test.fail (); @@ -368,7 +368,7 @@ public class Tests : Object, Fixture { try { visible = true; - Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible"); + Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard visible $visible"); } catch (SpawnError error) { Test.message ("error: %s", error.message); Test.fail (); @@ -376,8 +376,8 @@ public class Tests : Object, Fixture { } var action_group = DBusActionGroup.get ((!) _connection, - "com.canonical.indicator.keyboard", - "/com/canonical/indicator/keyboard"); + "org.ayatana.indicator.keyboard", + "/org/ayatana/indicator/keyboard"); var loop = new MainLoop (null, false); var signal_name = action_group.action_added["indicator"].connect ((action) => { loop.quit (); @@ -402,7 +402,7 @@ public class Tests : Object, Fixture { try { visible = false; - Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible"); + Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard visible $visible"); } catch (SpawnError error) { Test.message ("error: %s", error.message); Test.fail (); @@ -426,7 +426,7 @@ public class Tests : Object, Fixture { try { visible = true; - Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible"); + Process.spawn_command_line_sync (@"gsettings set org.ayatana.indicator.keyboard visible $visible"); } catch (SpawnError error) { Test.message ("error: %s", error.message); Test.fail (); @@ -457,8 +457,8 @@ public class Tests : Object, Fixture { } var action_group = DBusActionGroup.get ((!) _connection, - "com.canonical.indicator.keyboard", - "/com/canonical/indicator/keyboard"); + "org.ayatana.indicator.keyboard", + "/org/ayatana/indicator/keyboard"); var loop = new MainLoop (null, false); var signal_name = action_group.action_state_changed["current"].connect ((action, state) => { loop.quit (); @@ -545,8 +545,8 @@ public class Tests : Object, Fixture { } var menu_model = DBusMenuModel.get ((!) _connection, - "com.canonical.indicator.keyboard", - "/com/canonical/indicator/keyboard/desktop"); + "org.ayatana.indicator.keyboard", + "/org/ayatana/indicator/keyboard/desktop"); var loop = new MainLoop (null, false); var signal_name = menu_model.items_changed.connect ((position, removed, added) => { loop.quit (); diff --git a/tests/services/ayatana-indicator-keyboard.service.in b/tests/services/ayatana-indicator-keyboard.service.in new file mode 100644 index 00000000..01b42ad1 --- /dev/null +++ b/tests/services/ayatana-indicator-keyboard.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.ayatana.indicator.keyboard +Exec=@abs_top_builddir@/lib/indicator-keyboard-service diff --git a/tests/services/indicator-keyboard.service.in b/tests/services/indicator-keyboard.service.in deleted file mode 100644 index be38867d..00000000 --- a/tests/services/indicator-keyboard.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.canonical.indicator.keyboard -Exec=@abs_top_builddir@/lib/indicator-keyboard-service -- cgit v1.2.3