From a20429dd66965e6c4ceef4bb5f8c5048da3b2446 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 31 Jan 2012 13:56:04 +0900 Subject: [PATCH 3/3] Additional fixes. --- Makefile.am | 2 +- src/ibusbus.h | 4 ++-- ui/gtk3/switcher.vala | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 310c915..cf6bc03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,13 +43,13 @@ SUBDIRS = \ util \ conf \ client \ + bindings \ engine \ tools \ data \ m4 \ po \ docs \ - bindings \ $(UI_DIR) \ $(DAEMON_DIR) \ $(PYTHON_LIB_DIRS) \ diff --git a/src/ibusbus.h b/src/ibusbus.h index 27e94a3..6a3cd6e 100644 --- a/src/ibusbus.h +++ b/src/ibusbus.h @@ -858,7 +858,7 @@ gboolean ibus_bus_is_global_engine_enabled_async_finish /** * ibus_bus_get_global_engine: * @bus: An #IBusBus. - * @returns: (transfer floating): The description of current global engine, + * @returns: (transfer none): The description of current global engine, * or %NULL if there is no global engine. * * Get the description of current global engine synchronously. @@ -891,7 +891,7 @@ void ibus_bus_get_global_engine_async * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to * ibus_bus_get_global_engine_async_finish(). * @error: Return location for error or %NULL. - * @returns: (transfer floating): The description of current global engine, + * @returns: (transfer none): The description of current global engine, * or %NULL if there is no global engine. * * Finishes an operation started with ibus_bus_get_global_engine_async_finish(). diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala index 5db459c..ff521e1 100644 --- a/ui/gtk3/switcher.vala +++ b/ui/gtk3/switcher.vala @@ -65,7 +65,8 @@ class Switcher : Gtk.Window { if (device == null) { var display = get_display(); var device_manager = display.get_device_manager(); - device = device_manager.list_devices(Gdk.DeviceType.MASTER).data; + unowned GLib.List devices = device_manager.list_devices(Gdk.DeviceType.MASTER); + device = devices.data; } Gdk.Device keyboard; -- 1.7.7.6