[kdeplasma-addons] Remove another usage of the removed function
Kevin Kofler
kkofler at fedoraproject.org
Sat Mar 10 23:31:13 UTC 2012
commit ff75223d168d46d67a4313eec3e0f997ca14e644
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Mar 11 00:30:56 2012 +0100
Remove another usage of the removed function
kdeplasma-addons-4.8.1-kimpanel-ibus15.patch | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/kdeplasma-addons-4.8.1-kimpanel-ibus15.patch b/kdeplasma-addons-4.8.1-kimpanel-ibus15.patch
index 62411e2..221d4b6 100644
--- a/kdeplasma-addons-4.8.1-kimpanel-ibus15.patch
+++ b/kdeplasma-addons-4.8.1-kimpanel-ibus15.patch
@@ -1,6 +1,6 @@
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
++++ kdeplasma-addons-4.8.1-kimpanel-ibus15/applets/kimpanel/backend/ibus/panel.c 2012-03-11 00:29:58.000000000 +0100
@@ -337,9 +337,11 @@
ibus_panel_impanel_exec_dialog((IBusPanelService *)user_data);
else if (g_ascii_strncasecmp (prop_key, "Engine/", 7) == 0) {
@@ -25,7 +25,19 @@ diff -ur kdeplasma-addons-4.8.1/applets/kimpanel/backend/ibus/panel.c kdeplasma-
// fprintf(stderr, "enable %d %s\n", enable, input_context_path);
-@@ -1249,6 +1255,7 @@
+@@ -1174,7 +1180,11 @@
+ ibus_panel_impanel_state_changed (IBusPanelService *panel)
+ #endif
+ {
++#if !IBUS_CHECK_VERSION(1,4,99)
+ gboolean enable = ibus_input_context_is_enabled(IBUS_PANEL_IMPANEL (panel)->input_context);
++#else
++ gboolean enable = TRUE;
++#endif
+
+ if (enable == 0) {
+ ibus_property_set_icon (IBUS_PANEL_IMPANEL (panel)->logo_prop, "ibus");
+@@ -1249,6 +1259,7 @@
g_variant_builder_add (&builder, "s", propstr);
}
@@ -33,7 +45,7 @@ diff -ur kdeplasma-addons-4.8.1/applets/kimpanel/backend/ibus/panel.c kdeplasma-
ibus_engine_desc_args_to_propstr("None",
NULL,
"Disable",
-@@ -1257,6 +1264,7 @@
+@@ -1257,6 +1268,7 @@
propstr);
g_variant_builder_add (&builder, "s", propstr);
More information about the scm-commits
mailing list