[gentoo-commits] gentoo-x86 commit in app-i18n/ibus-mozc/files: ibus-mozc-1.3.975.102-ibus-1.4.patch

[gentoo-commits] gentoo-x86 commit in app-i18n/ibus-mozc/files: ibus-mozc-1.3.975.102-ibus-1.4.patch

[Samuli Suominen (ssuominen)]

ssuominen    12/03/09 19:51:02

  Added:                ibus-mozc-1.3.975.102-ibus-1.4.patch
  Log:
  Fix building with app-i18n/ibus >= 1.4.0 wrt #402397 by Tomoh K.
  
  (Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-i18n/ibus-mozc/files/ibus-mozc-1.3.975.102-ibus-1.4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus-mozc/files/ibus-mozc-1.3.975.102-ibus-1.4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus-mozc/files/ibus-mozc-1.3.975.102-ibus-1.4.patch?rev=1.1&content-type=text/plain

Index: ibus-mozc-1.3.975.102-ibus-1.4.patch
===================================================================
http://bugs.gentoo.org/402397

--- unix/ibus/mozc_engine.cc
+++ unix/ibus/mozc_engine.cc
@@ -620,8 +620,15 @@
 
 #ifndef OS_CHROMEOS
   if (prop_mozc_tool_) {
+#if IBUS_CHECK_VERSION(1, 4, 0)
+    while ((prop = ibus_prop_list_get(
+        const_cast<IBusPropList*>(
+            ibus_property_get_sub_props(prop_mozc_tool_)), i++))) {
+      if (!g_strcmp0(property_name, ibus_property_get_key(prop))) {
+#else
     while ((prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++))) {
-      if (!g_strcmp0(property_name, prop->key)) {
+             if (!g_strcmp0(property_name, prop->key)) {
+#endif
         const MozcEngineToolProperty *entry =
             reinterpret_cast<const MozcEngineToolProperty*>(
                 g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
@@ -640,8 +647,15 @@
   }
 
   i = 0;
+#if IBUS_CHECK_VERSION(1, 4, 0)
+  while ((prop = ibus_prop_list_get(
+      const_cast<IBusPropList*>(
+          ibus_property_get_sub_props(prop_composition_mode_)), i++))) {
+    if (!g_strcmp0(property_name, ibus_property_get_key(prop))) {
+#else
   while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) {
-    if (!g_strcmp0(property_name, prop->key)) {
+           if (!g_strcmp0(property_name, prop->key)) {
+#endif
       const MozcEngineProperty *entry =
           reinterpret_cast<const MozcEngineProperty*>(
               g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
@@ -1096,8 +1110,15 @@
 
   size_t i = 0;
   IBusProperty *prop = NULL;
+#if IBUS_CHECK_VERSION(1, 4, 0)
+  while ((prop = ibus_prop_list_get(
+      const_cast<IBusPropList*>(
+          ibus_property_get_sub_props(prop_composition_mode_)), i++))) {
+    if (!g_strcmp0(entry->key, ibus_property_get_key(prop))) {
+#else
   while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) {
     if (!g_strcmp0(entry->key, prop->key)) {
+#endif
       // Update the language panel.
       ibus_property_set_icon(prop_composition_mode_,
                              GetIconPath(entry->icon).c_str());