[kdeplasma-addons] fix kimpanel ibus backend build with ibus 1.4.99

[Kevin Kofler]

commit ab7102ce9dd547c4e6f55ae0ab3d5497c8deef22
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Mar 11 00:17:07 2012 +0100

    fix kimpanel ibus backend build with ibus 1.4.99

 kdeplasma-addons-4.8.1-kimpanel-ibus15.patch |   43 ++++++++++++++++++++++++++
 kdeplasma-addons.spec                        |    4 ++
 2 files changed, 47 insertions(+), 0 deletions(-)
---
diff --git a/kdeplasma-addons-4.8.1-kimpanel-ibus15.patch b/kdeplasma-addons-4.8.1-kimpanel-ibus15.patch
new file mode 100644
index 0000000..62411e2
--- /dev/null
+++ b/kdeplasma-addons-4.8.1-kimpanel-ibus15.patch
@@ -0,0 +1,43 @@
+diff -ur kdeplasma-addons-4.8.1/applets/kimpanel/backend/ibus/panel.c kdeplasma-addons-4.8.1-kimpanel-ibus15/applets/kimpanel/backend/ibus/panel.c
+--- kdeplasma-addons-4.8.1/applets/kimpanel/backend/ibus/panel.c	2012-02-29 23:57:26.000000000 +0100
++++ kdeplasma-addons-4.8.1-kimpanel-ibus15/applets/kimpanel/backend/ibus/panel.c	2012-03-11 00:11:20.000000000 +0100
+@@ -337,9 +337,11 @@
+         ibus_panel_impanel_exec_dialog((IBusPanelService *)user_data);
+     else if (g_ascii_strncasecmp (prop_key, "Engine/", 7) == 0) {
+         prop_key += 7;// +7 to skip "Engine/"
++#if !IBUS_CHECK_VERSION(1,4,99)
+         if (g_ascii_strncasecmp (prop_key, "None", 4) == 0)
+             ibus_input_context_disable(((IBusPanelImpanel *)user_data)->input_context);
+         else
++#endif
+             ibus_input_context_set_engine(((IBusPanelImpanel *)user_data)->input_context, prop_key);
+     }
+     else
+@@ -578,7 +580,11 @@
+     IBusInputContext *ic = ibus_input_context_get_input_context(input_context_path, ibusconn);
+     IBUS_PANEL_IMPANEL (panel)->input_context = ic;
+ 
++#if !IBUS_CHECK_VERSION(1,4,99)
+     gboolean enable = ibus_input_context_is_enabled(ic);
++#else
++    gboolean enable = TRUE;
++#endif
+ 
+ //     fprintf(stderr, "enable %d %s\n", enable, input_context_path);
+ 
+@@ -1249,6 +1255,7 @@
+         g_variant_builder_add (&builder, "s", propstr);
+     }
+ 
++#if !IBUS_CHECK_VERSION(1,4,99)
+     ibus_engine_desc_args_to_propstr("None",
+                                      NULL,
+                                      "Disable",
+@@ -1257,6 +1264,7 @@
+                                      propstr);
+ 
+     g_variant_builder_add (&builder, "s", propstr);
++#endif
+ 
+     g_dbus_connection_emit_signal (IBUS_PANEL_IMPANEL (panel)->conn,
+                                    NULL, "/kimpanel", "org.kde.kimpanel.inputmethod", "ExecMenu",
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 6bece8b..5207237 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -16,6 +16,8 @@ Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.t
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
+# fix kimpanel ibus backend build with ibus 1.4.99
+Patch50: kdeplasma-addons-4.8.1-kimpanel-ibus15.patch
 
 ## upstream patches
 
@@ -92,6 +94,7 @@ Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}%{?alphatag}
+%patch50 -p1 -b .ibus15
 
 
 %build
@@ -383,6 +386,7 @@ fi
 %changelog
 * Sat Mar 10 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.1-2
 - reenable kimpanel ibus backend
+- fix kimpanel ibus backend build with ibus 1.4.99
 
 * Mon Mar 05 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.1-1
 - 4.8.1