# HG changeset patch
# User Alex Baines <alex@abaines.me.uk>
# Date 1405541883 -3600
# Node ID ebc5144cfcabebf9b5749de6fec1fe5c57f5a517
# Parent  f061a86fbb08cdbb3cee1d75b232f66cc8c99980
Fix shadowing in SDL_ibus.c and send a blank TextEditingEvent when ibus sends a HidePreeditText signal.

diff -r f061a86fbb08 -r ebc5144cfcab src/core/linux/SDL_ibus.c
--- a/src/core/linux/SDL_ibus.c	Sun Jul 13 09:04:55 2014 -0700
+++ b/src/core/linux/SDL_ibus.c	Wed Jul 16 21:18:03 2014 +0100
@@ -169,6 +169,11 @@
         return DBUS_HANDLER_RESULT_HANDLED;
     }
     
+    if(dbus->message_is_signal(msg, IBUS_INPUT_INTERFACE, "HidePreeditText")){
+    	SDL_SendEditingText("", 0, 0);
+    	return DBUS_HANDLER_RESULT_HANDLED;
+    }
+    
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
@@ -331,22 +336,22 @@
     }
 
     if(result){
-        DBusMessage *msg = dbus->message_new_method_call(IBUS_SERVICE,
+        DBusMessage *msg2 = dbus->message_new_method_call(IBUS_SERVICE,
                                                          input_ctx_path,
                                                          IBUS_INPUT_INTERFACE,
                                                          "SetCapabilities");
         if(msg){
             Uint32 caps = IBUS_CAP_FOCUS | IBUS_CAP_PREEDIT_TEXT;
-            dbus->message_append_args(msg,
+            dbus->message_append_args(msg2,
                                       DBUS_TYPE_UINT32, &caps,
                                       DBUS_TYPE_INVALID);
         }
         
         if(msg){
-            if(dbus->connection_send(ibus_conn, msg, NULL)){
+            if(dbus->connection_send(ibus_conn, msg2, NULL)){
                 dbus->connection_flush(ibus_conn);
             }
-            dbus->message_unref(msg);
+            dbus->message_unref(msg2);
         }
         
         dbus->bus_add_match(ibus_conn, "type='signal',interface='org.freedesktop.IBus.InputContext'", NULL);