[ibus/f16] Fix g-ir-scanner errors.

Takao Fujiwara fujiwara at fedoraproject.org
Fri Dec 30 15:18:36 UTC 2011


commit bf8c2dea8f034bea4845def86018966e91ee0168
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Sat Dec 31 00:17:33 2011 +0900

    Fix g-ir-scanner errors.

 ibus-HEAD.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ibus.spec       |    4 +-
 2 files changed, 60 insertions(+), 2 deletions(-)
---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 1314c13..1264e34 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1930,3 +1930,61 @@ index 58069fc..3cb03f0 100644
 -- 
 1.7.7.4
 
+From b90c7ed47b1f84e0b0a03233e817c97dd854a5d6 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1 at gmail.com>
+Date: Sat, 31 Dec 2011 00:09:11 +0900
+Subject: [PATCH] Fix g-ir-scanner errors in ibusproperty.h and ibustext.h.
+
+---
+ src/ibusproperty.h |    7 ++++---
+ src/ibustext.h     |    2 +-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/ibusproperty.h b/src/ibusproperty.h
+index ddbadc8..96b1a13 100644
+--- a/src/ibusproperty.h
++++ b/src/ibusproperty.h
+@@ -188,7 +188,7 @@ const gchar *    ibus_property_get_key      (IBusProperty   *prop);
+ /**
+  * ibus_property_get_label:
+  * @prop: An IBusProperty.
+- * @returns: the label of IBusProperty. Should not be freed.
++ * @returns: (transfer none): the label of IBusProperty. Should not be freed.
+  *
+  * Get the label of IBusProperty.
+  */
+@@ -226,7 +226,7 @@ void             ibus_property_set_icon     (IBusProperty   *prop,
+ /**
+  * ibus_property_get_tooltip:
+  * @prop: An IBusProperty.
+- * @returns: the tooltip of IBusProperty. Should not be freed.
++ * @returns: (transfer none): the tooltip of IBusProperty. Should not be freed.
+  *
+  * Get the tooltip of IBusProperty.
+  */
+@@ -311,7 +311,8 @@ void             ibus_property_set_state    (IBusProperty   *prop,
+ /**
+  * ibus_property_get_sub_props:
+  * @prop: An IBusProperty.
+- * @returns: the IBusPropList of IBusProperty. Should not be freed.
++ * @returns: (transfer none): the IBusPropList of IBusProperty.
++ *     Should not be freed.
+  *
+  * Get the IBusPropList of IBusProperty.
+  */
+diff --git a/src/ibustext.h b/src/ibustext.h
+index f6e25a7..23ae920 100644
+--- a/src/ibustext.h
++++ b/src/ibustext.h
+@@ -190,7 +190,7 @@ const gchar *    ibus_text_get_text                 (IBusText       *text);
+ /**
+  * ibus_text_get_attributes:
+  * @text: An IBusText.
+- * @returns: the attrs in @text.
++ * @returns: (transfer none): the attrs in @text.
+  *
+  * Return the attributes in an IBusText. Should not be freed.
+  */
+-- 
+1.7.7.4
+
diff --git a/ibus.spec b/ibus.spec
index 431a966..d6d42bb 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -33,7 +33,7 @@
 
 Name:       ibus
 Version:    1.4.0
-Release:    15%{?dist}
+Release:    16%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -435,7 +435,7 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Fri Dec 30 2011 Takao Fujiwara <tfujiwar at redhat.com> - 1.4.0-15
+* Fri Dec 30 2011 Takao Fujiwara <tfujiwar at redhat.com> - 1.4.0-16
 - Enhanced ibus-gnome3 shell lookup window.
 - Updated ibus-HEAD.patch from upstream
   Fixed Bug 769135 - ibus-x11 SEGV in _process_key_event_done.


More information about the scm-commits mailing list