summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2012-03-05 10:14:07 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2012-03-05 10:14:07 +0900
commitb7fb2107ca35662a92fe6b4964cade367a07c4c1 (patch)
tree5b623d4d817c9ff3b1fc2c3912c3880dce4d1053
parentf1c82fbc0681b471056b74f51b1fda71fc210e78 (diff)
downloadibus-b7fb2107ca35662a92fe6b4964cade367a07c4c1.tar.gz
Revert Gdk.DeviceManager.list_devices to work with vala 0.15
Fixed a build error in ui/gtk3 with vala 0.15 TEST=Linux desktop Review URL: https://codereview.appspot.com/5720068
-rw-r--r--ui/gtk3/switcher.vala7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index ff521e1c..dab70ab0 100644
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -65,8 +65,15 @@ class Switcher : Gtk.Window {
if (device == null) {
var display = get_display();
var device_manager = display.get_device_manager();
+/* The macro VALA_X_Y supports even numbers.
+ * http://git.gnome.org/browse/vala/commit/?id=294b374af6
+ */
+#if VALA_0_16
+ device = device_manager.list_devices(Gdk.DeviceType.MASTER).data;
+#else
unowned GLib.List<Gdk.Device> devices = device_manager.list_devices(Gdk.DeviceType.MASTER);
device = devices.data;
+#endif
}
Gdk.Device keyboard;