Minor fixes when generating GIR.

BUG=none
TEST=manually

Review URL: https://codereview.appspot.com/5600052

diff --git a/src/Makefile.am b/src/Makefile.am
index 6f0321cea59bceaa662d0c2dc3dea955addea73d..68950ff31b0a424c51a9b6f13b064b48150d751e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,12 +165,12 @@ BUILT_SOURCES =             \
 if HAVE_INTROSPECTION
 introspection_files =           \
     $(ibus_public_headers)      \
-    $(ibus_c_sources)           \
+    $(ibus_sources)             \
     ibusenumtypes.c             \
     ibusenumtypes.h             \
     $(NULL)
 IBus-1.0.gir: $(libibus) Makefile
-IBus_1_0_gir_SCANNERFLAGS = --pkg=glib-2.0 $(IBUS_GIR_SCANNERFLAGS)
+IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
 IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
 IBus_1_0_gir_LIBS = $(libibus)
 IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))

diff --git a/src/ibusengine.h b/src/ibusengine.h
index ac56248d940d86eaad8684046ca101ab9822ed2b..9ee346251c45d43edca0f64ad72d5496fe32cb0b 100644 (file)
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -408,9 +408,9 @@ void ibus_engine_delete_surrounding_text(IBusEngine         *engine,
 /**
  * ibus_engine_get_surrounding_text:
  * @engine: An IBusEngine.
- * @text: (allow-none): Location to store surrounding text.
- * @cursor_pos: (allow-none): Cursor position in characters in @text.
- * @anchor_pos: (allow-none): Anchor position of selection in @text.
+ * @text: (out) (transfer none) (allow-none): Location to store surrounding text.
+ * @cursor_pos: (out) (allow-none): Cursor position in characters in @text.
+ * @anchor_pos: (out) (allow-none): Anchor position of selection in @text.
  *
  * Get surrounding text.
  *

diff --git a/src/ibusfactory.h b/src/ibusfactory.h
index 03d1deadb2034684773c0d3ffeb50ad71d441b46..e5e6fba52cdd5598762ca0735008861a56f05a3b 100644 (file)
--- a/src/ibusfactory.h
+++ b/src/ibusfactory.h
@@ -127,6 +127,7 @@ struct _IBusFactoryClass {
     /*< private >*/
     IBusServiceClass parent;
 
+    /*< public >*/
     /* signals */
     IBusEngine *
                 (* create_engine)