aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog132
-rw-r--r--debian/compat2
-rw-r--r--debian/control31
-rwxr-xr-xdebian/rules16
-rw-r--r--debian/source/format2
-rw-r--r--lib/main.vala8
-rw-r--r--po/indicator-keyboard.pot8
-rw-r--r--tests/indicator-keyboard-test.in8
-rw-r--r--tests/main.vala39
10 files changed, 92 insertions, 156 deletions
diff --git a/configure.ac b/configure.ac
index b2503f1f..ccd69620 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 foreign -Wall -Woverride -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 foreign serial-tests -Wall -Woverride -Wno-portability])
AM_SILENT_RULES([yes])
LT_INIT
diff --git a/debian/changelog b/debian/changelog
index 1b7581f8..53c78547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,117 +1,29 @@
-indicator-keyboard (0.0.0-0ubuntu19) saucy; urgency=low
+indicator-keyboard (0.0.0+13.10.20130821-0ubuntu1) saucy; urgency=low
+ [ Jeremy Bicha ]
* debian/control:
- Don't build-depend on vala-0.20-vapi
- Build-depend on dbus for tests
- -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 15 Jul 2013 21:00:06 -0400
-
-indicator-keyboard (0.0.0-0ubuntu18) saucy; urgency=low
-
- * Add indicator schema.
- * Repair test fixtures.
-
- -- William Hua <william.hua@canonical.com> Mon, 15 Jul 2013 20:37:40 -0400
-
-indicator-keyboard (0.0.0-0ubuntu17) saucy; urgency=low
-
- * Minor fixes.
-
- -- William Hua <william.hua@canonical.com> Thu, 27 Jun 2013 11:38:17 -0400
-
-indicator-keyboard (0.0.0-0ubuntu16) saucy; urgency=low
-
- * Remove autopilot support.
-
- -- William Hua <william.hua@canonical.com> Mon, 24 Jun 2013 17:13:03 -0400
-
-indicator-keyboard (0.0.0-0ubuntu15) saucy; urgency=low
-
- * Experimental non-null support.
-
- -- William Hua <william.hua@canonical.com> Sat, 22 Jun 2013 16:25:44 -0400
-
-indicator-keyboard (0.0.0-0ubuntu14) saucy; urgency=low
-
- * Update indicator service manifest.
-
- -- William Hua <william.hua@canonical.com> Thu, 20 Jun 2013 15:20:09 -0400
-
-indicator-keyboard (0.0.0-0ubuntu13) saucy; urgency=low
-
- * Migrate old keyboard layouts.
-
- -- William Hua <william.hua@canonical.com> Thu, 20 Jun 2013 13:50:00 -0400
-
-indicator-keyboard (0.0.0-0ubuntu12) saucy; urgency=low
-
- * Remove indicator-keyboard-schema.
-
- -- William Hua <william.hua@canonical.com> Wed, 19 Jun 2013 10:15:00 -0400
-
-indicator-keyboard (0.0.0-0ubuntu11) saucy; urgency=low
-
- * Per-window fixes.
-
- -- William Hua <william.hua@canonical.com> Wed, 19 Jun 2013 08:52:36 -0400
-
-indicator-keyboard (0.0.0-0ubuntu10) saucy; urgency=low
-
- * Build depend on dh-translations.
-
- -- William Hua <william.hua@canonical.com> Fri, 14 Jun 2013 09:34:50 -0400
-
-indicator-keyboard (0.0.0-0ubuntu9) saucy; urgency=low
-
- * dh --with translations.
-
- -- William Hua <william.hua@canonical.com> Thu, 13 Jun 2013 17:07:42 -0400
-
-indicator-keyboard (0.0.0-0ubuntu8) saucy; urgency=low
-
- * Build depend on libgee-dev.
-
- -- William Hua <william.hua@canonical.com> Mon, 10 Jun 2013 15:23:33 -0400
-
-indicator-keyboard (0.0.0-0ubuntu7) saucy; urgency=low
-
- * Translations.
- * Use icons from theme.
-
- -- William Hua <william.hua@canonical.com> Mon, 10 Jun 2013 12:11:14 -0400
-
-indicator-keyboard (0.0.0-0ubuntu6) saucy; urgency=low
-
- * Require vala 0.20.
-
- -- William Hua <william.hua@canonical.com> Wed, 15 May 2013 16:57:51 -0400
-
-indicator-keyboard (0.0.0-0ubuntu5) saucy; urgency=low
-
- * Fix icon rendering.
-
- -- William Hua <william.hua@canonical.com> Wed, 08 May 2013 17:01:09 -0400
-
-indicator-keyboard (0.0.0-0ubuntu4) raring; urgency=low
-
- * Add indicator visibility schema.
-
- -- William Hua <william.hua@canonical.com> Wed, 01 May 2013 14:53:34 -0700
-
-indicator-keyboard (0.0.0-0ubuntu3) raring; urgency=low
-
- * Use dictionary action state.
-
- -- William Hua <william.hua@canonical.com> Fri, 26 Apr 2013 15:03:12 -0400
-
-indicator-keyboard (0.0.0-0ubuntu2) raring; urgency=low
-
- * GBytesIcon support.
-
- -- William Hua <william.hua@canonical.com> Tue, 16 Apr 2013 10:45:34 -0400
-
-indicator-keyboard (0.0.0-0ubuntu1) raring; urgency=low
-
+ [ William Hua ]
* Initial Release.
- -- William Hua <william.hua@canonical.com> Wed, 03 Apr 2013 12:37:54 -0400
+ [ Mathieu Trudel-Lapierre ]
+ * Automatic snapshot from revision 102 (bootstrap)
+ * debian/control:
+ - Packaging review, add comment to developers.
+ - Fix Vcs-Bzr, Vcs-Browser.
+ - Sort Build-Depends, use trailing commas.
+ - Improve long description.
+ * debian/rules:
+ - Add DPKG_GENSYMBOLS_CHECK_LEVEL = 4.
+ - Override dh_autoreconf to run ./autogen.sh.
+ - Override dh_install to remove .la and .a files.
+ - Run dh_install with --fail-missing.
+ * debian/compat: bump to compat level 9.
+ * debian/source/format: make sure we're using format 1.0.
+
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 103
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Aug 2013 14:07:27 +0000
diff --git a/debian/compat b/debian/compat
index 45a4fb75..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 4f5289ac..b9757366 100644
--- a/debian/control
+++ b/debian/control
@@ -3,34 +3,37 @@ Section: gnome
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: William Hua <william.hua@canonical.com>
-Build-Depends: quilt,
- debhelper (>= 9.0.0),
+Build-Depends: debhelper (>= 9.0.0),
+ quilt,
dh-autoreconf,
dh-translations,
- libgirepository1.0-dev,
- valac,
+ dbus,
+ libaccountsservice-dev,
+ libbamf3-dev,
libgee-dev,
- libgtk-3-dev,
+ libgirepository1.0-dev,
libgnome-desktop-3-dev,
libgnomekbd-dev,
+ libgtk-3-dev,
libibus-1.0-dev (>= 1.5.0),
- libaccountsservice-dev,
liblightdm-gobject-1-dev,
- libbamf3-dev,
- dbus,
+ valac,
+ xauth,
xvfb,
- xauth
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/~attente/indicator-keyboard/trunk
-Vcs-Browser: https://bazaar.launchpad.net/~attente/indicator-keyboard/trunk/files
+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
Package: indicator-keyboard
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Keyboard indicator
- This package contains the 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.
diff --git a/debian/rules b/debian/rules
index c816d1da..d2bfba7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,19 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
%:
dh $@ --with autoreconf,translations
+
+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
+ dh_install --fail-missing
+
diff --git a/debian/source/format b/debian/source/format
index 89ae9db8..d3827e75 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+1.0
diff --git a/lib/main.vala b/lib/main.vala
index ef94b2f2..601a599e 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -339,8 +339,14 @@ public class Indicator.Keyboard.Service : Object {
private void update_indicator_action () {
var visible = indicator_settings.get_boolean ("visible");
var current = source_settings.get_uint ("current");
- var icon = get_sources ()[current].icon;
+ var sources = get_sources ();
+
Variant state;
+ Icon? icon = null;
+
+ if (current < sources.length) {
+ icon = sources[current].icon;
+ }
if (icon != null) {
state = new Variant.parsed ("{ 'visible' : <%b>, 'icon' : %v }", visible, ((!) icon).serialize ());
diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot
index 171c3021..b657f08e 100644
--- a/po/indicator-keyboard.pot
+++ b/po/indicator-keyboard.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-07 15:03-0400\n"
+"POT-Creation-Date: 2013-08-21 12:15+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,14 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../lib/main.c:1405 ../lib/main.vala:322
+#: ../lib/main.c:1419 ../lib/main.vala:328
msgid "Character Map"
msgstr ""
-#: ../lib/main.c:1407 ../lib/main.vala:323
+#: ../lib/main.c:1421 ../lib/main.vala:329
msgid "Keyboard Layout Chart"
msgstr ""
-#: ../lib/main.c:1409 ../lib/main.vala:324
+#: ../lib/main.c:1423 ../lib/main.vala:330
msgid "Text Entry Settings..."
msgstr ""
diff --git a/tests/indicator-keyboard-test.in b/tests/indicator-keyboard-test.in
index 7ae24423..621133dd 100644
--- a/tests/indicator-keyboard-test.in
+++ b/tests/indicator-keyboard-test.in
@@ -3,5 +3,11 @@
export PATH="@abs_top_builddir@/tests/execute:$PATH"
export DCONF_PROFILE="@abs_top_builddir@/tests/profiles/indicator-keyboard-test"
export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data"
+export XDG_RUNTIME_DIR="@abs_top_builddir@/tests"
-xvfb-run -a ./indicator-keyboard-tests
+if xvfb-run -a ./indicator-keyboard-tests
+then
+ pkill -f tests/gvfs || exit 0
+else
+ pkill -f tests/gvfs && exit 1
+fi
diff --git a/tests/main.vala b/tests/main.vala
index d9d52733..1a7833a2 100644
--- a/tests/main.vala
+++ b/tests/main.vala
@@ -18,6 +18,7 @@
const int TIMEOUT_S = 1;
const int TIMEOUT_MS = 1000;
+const int LONG_TIMEOUT_S = 10;
[DBus (name = "com.canonical.indicator.keyboard.test")]
public class Service : Object {
@@ -150,18 +151,12 @@ static void test_activate_input_source (void *data) {
var action_group = DBusActionGroup.get ((!) fixture.connection,
"com.canonical.indicator.keyboard",
"/com/canonical/indicator/keyboard");
- var loop = new MainLoop (null, false);
- var signal_name = action_group.action_state_changed["current"].connect ((action, state) => {
- loop.quit ();
- });
-
action_group.list_actions ();
action_group.activate_action ("current", new Variant.uint32 (2));
- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ var loop = new MainLoop (null, false);
+ Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
- Source.remove (source);
- action_group.disconnect (signal_name);
var state = action_group.get_action_state ("current");
var current = state.get_uint32 ();
@@ -199,7 +194,7 @@ static void test_activate_character_map (void *data) {
action_group.activate_action ("map", null);
- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
((!) fixture.service).disconnect (signal_name);
@@ -238,7 +233,7 @@ static void test_activate_keyboard_layout_chart (void *data) {
action_group.activate_action ("chart", null);
- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
((!) fixture.service).disconnect (signal_name);
@@ -266,7 +261,7 @@ static void test_activate_text_entry_settings (void *data) {
action_group.activate_action ("settings", null);
- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
((!) fixture.service).disconnect (signal_name);
@@ -300,7 +295,7 @@ static void test_migration (void *data) {
try {
var cancellable = new Cancellable ();
- var source = Timeout.add_seconds (TIMEOUT_S, () => { cancellable.cancel (); return false; });
+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; });
var dbus_proxy = new DBusProxy.sync ((!) fixture.connection,
DBusProxyFlags.NONE,
@@ -325,6 +320,10 @@ static void test_migration (void *data) {
return;
}
+ var loop = new MainLoop (null, false);
+ Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ loop.run ();
+
try {
string sources;
Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources);
@@ -362,7 +361,7 @@ static void test_no_migration (void *data) {
try {
var cancellable = new Cancellable ();
- var source = Timeout.add_seconds (TIMEOUT_S, () => { cancellable.cancel (); return false; });
+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; });
var dbus_proxy = new DBusProxy.sync ((!) fixture.connection,
DBusProxyFlags.NONE,
@@ -387,6 +386,10 @@ static void test_no_migration (void *data) {
return;
}
+ var loop = new MainLoop (null, false);
+ Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ loop.run ();
+
try {
string sources;
Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources);
@@ -429,7 +432,7 @@ static void test_update_visible (void *data) {
action_group.list_actions ();
- var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
action_group.disconnect (signal_name);
@@ -453,7 +456,7 @@ static void test_update_visible (void *data) {
return;
}
- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
action_group.disconnect (signal_name);
@@ -477,7 +480,7 @@ static void test_update_visible (void *data) {
return;
}
- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
action_group.disconnect (signal_name);
@@ -562,7 +565,7 @@ static void test_update_input_source (void *data) {
return;
}
- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
action_group.disconnect (signal_name);
@@ -669,7 +672,7 @@ static void test_update_input_sources (void *data) {
return;
}
- source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+ source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
loop.run ();
Source.remove (source);
section.disconnect (signal_name);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 00:55:44 +0000