Completed introspection, using new libxklavier 5.2

New libxklavier 5.2 provides introspection, so it is now used by libgnomekdb.
Of course, non-introspectable X11 API still provides some warning messages

5 files changed, 20 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index 65c6178..37c888d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl ***************************************************************************
 dnl *** configure.in for libgnomekbd                                        ***
 dnl ***************************************************************************
-AC_INIT(libgnomekbd, 3.2.0, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
+AC_INIT(libgnomekbd, 3.3.90, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
 AC_PREREQ(2.62)
 
 VERSION_INFO=7:0:0
@@ -18,7 +18,7 @@ dnl ***************************************************************************
 GLIB_REQUIRED=2.18
 GDK_REQUIRED=2.91.7
 GTK_REQUIRED=2.90
-LIBXKLAVIER_REQUIRED=5.1
+LIBXKLAVIER_REQUIRED=5.2
 
 AC_SUBST([GDK_REQUIRED])
 AC_SUBST([GTK_REQUIRED])
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 9f8ae69..7117f97 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -165,7 +165,7 @@ introspection_sources = $(gnomekbdinc_HEADERS) \
         gkbd-indicator-plugin-manager.h
 
 Gkbd-3.0.gir: libgnomekbd.la libgnomekbdui.la
-Gkbd_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 xlib-2.0
+Gkbd_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 xlib-2.0 Xkl-1.0
 Gkbd_3_0_gir_CFLAGS = $(libgnomekbdui_la_CFLAGS)
 Gkbd_3_0_gir_LIBS = libgnomekbd.la libgnomekbdui.la
 Gkbd_3_0_gir_FILES = $(introspection_sources)
diff --git a/libgnomekbd/gkbd-configuration.c b/libgnomekbd/gkbd-configuration.c
index 02b6548..ea58ec3 100644
--- a/libgnomekbd/gkbd-configuration.c
+++ b/libgnomekbd/gkbd-configuration.c
@@ -360,6 +360,10 @@ gkbd_configuration_get (void)
 	return instance;
 }
 
+/**
+ * gkbd_configuration_get_xkl_engine:
+ * Returns: (transfer none): The engine used by GkbdConfiguration object
+ */
 XklEngine *
 gkbd_configuration_get_xkl_engine (GkbdConfiguration * configuration)
 {
@@ -508,7 +512,7 @@ gkbd_configuration_get_keyboard_config (GkbdConfiguration * configuration)
 
 /**
  * gkbd_configuration_get_all_objects: 
- * Returns: (transfer none): list of widgets/status icons/...
+ * Returns: (transfer none) (element-type GObject): list of widgets/status icons/...
  */
 GSList *
 gkbd_configuration_get_all_objects (GkbdConfiguration * configuration)
@@ -569,6 +573,10 @@ gkbd_configuration_load_images (GkbdConfiguration * configuration)
 	return images;
 }
 
+/**
+ * gkbd_configuration_free_images: 
+ * @images: (element-type GdkPixbuf): list of images
+ */
 void
 gkbd_configuration_free_images (GkbdConfiguration * configuration,
 				GSList * images)
diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
index 8c5cee1..d85339a 100644
--- a/libgnomekbd/gkbd-indicator.c
+++ b/libgnomekbd/gkbd-indicator.c
@@ -563,6 +563,10 @@ gkbd_indicator_set_parent_tooltips (GkbdIndicator * gki, gboolean spt)
 	gkbd_indicator_update_tooltips (gki);
 }
 
+/**
+ * gkbd_indicator_get_xkl_engine:
+ * Returns: (transfer none): The engine shared by all GkbdIndicator objects
+ */
 XklEngine *
 gkbd_indicator_get_xkl_engine ()
 {
diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
index 10c95bc..72ff5e4 100644
--- a/libgnomekbd/gkbd-status.c
+++ b/libgnomekbd/gkbd-status.c
@@ -662,6 +662,10 @@ gkbd_status_new (void)
 	    GTK_STATUS_ICON (g_object_new (gkbd_status_get_type (), NULL));
 }
 
+/**
+ * gkbd_status_get_xkl_engine:
+ * Returns: (transfer none): The engine shared by all GkbdStatus objects
+ */
 XklEngine *
 gkbd_status_get_xkl_engine ()
 {