aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2014-06-17 00:31:11 -0400
committerWilliam Hua <william.hua@canonical.com>2014-06-17 00:31:11 -0400
commit66693b52961aa9197c54c508223ec12c1156a691 (patch)
tree90e933532a6a853a81f16df815f2ce5e34540e05
parentd6026b45e932c47b1d0eb62da8d12b618f493f12 (diff)
downloadayatana-indicator-keyboard-66693b52961aa9197c54c508223ec12c1156a691.tar.gz
ayatana-indicator-keyboard-66693b52961aa9197c54c508223ec12c1156a691.tar.bz2
ayatana-indicator-keyboard-66693b52961aa9197c54c508223ec12c1156a691.zip
Disable experimental non-null.
-rw-r--r--data/Makefile.am3
-rw-r--r--lib/Makefile.am3
-rw-r--r--lib/main.vala2
3 files changed, 3 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 03c377c7..7befb94e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,8 +2,7 @@ noinst_PROGRAMS = indicator-keyboard-icon-generator
AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
AM_LDFLAGS = -lm
-AM_VALAFLAGS = --enable-experimental-non-null \
- --metadatadir $(top_srcdir)/deps \
+AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
--vapidir $(top_srcdir)/deps
indicator_keyboard_icon_generator_SOURCES = main.vala \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ae9dec00..16b8807c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,8 +2,7 @@ libexec_PROGRAMS = indicator-keyboard-service
AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
AM_LDFLAGS = -lm
-AM_VALAFLAGS = --enable-experimental-non-null \
- --metadatadir $(top_srcdir)/deps \
+AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
--vapidir $(top_srcdir)/deps
indicator_keyboard_service_SOURCES = main.vala \
diff --git a/lib/main.vala b/lib/main.vala
index 9f007170..d2ea8c79 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -811,7 +811,7 @@ public class Indicator.Keyboard.Service : Object {
if (xkb_length > 1) {
var active_action = get_active_action ();
- var active = active_action.state.get_uint32 ();
+ var active = active_action.get_state ().get_uint32 ();
var offset = -((!) parameter).get_int32 () % xkb_length;
/* Make offset positive modulo xkb_length. */