Fix race condition between ibus_bus_set_global_engine() and ibus_bus_get_global_engine().

If focus moves between the two API calls, ibus_bus_get_global_engine() might return an unexpected engine name:

1. context A is focused, and the current global engine is "X".
2. ibus_bus_set_global_engine("Y") is called.
3. a user moves the focus from A to B. First, A's engine is set to NULL in bus_ibus_impl_set_focused_context(). Then, in the same function, B's engine is set to "X" (not "Y") since the _ibus_set_global_engine asynchronous call is not finished yet.
4. ibus_bus_set_global_engine("Y") async call successfully finishes. Context A's (not B's) engine is set to "Y", but context B, which has a focus, is not updated.
5. ibus_bus_get_global_engine() is called.

expected:
Y is returned.

actual:
X is returned. Since the context B has a focus, and B's engine is X.

BUG=http://crosbug.com/11031
TEST=see the bug

Review URL: http://codereview.appspot.com/4063041

diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
index 4fa8c3f46dc84008cb2514308c80a96df8989026..cbcf7f426dc4b2603f87e514e8131fc3b9769489 100644 (file)
--- a/bus/ibusimpl.c
+++ b/bus/ibusimpl.c
@@ -1614,23 +1614,50 @@ _ibus_get_global_engine (BusIBusImpl           *ibus,
                     "No global engine.");
 }
 
+struct _SetGlobalEngineData {
+    BusIBusImpl *ibus;
+    GDBusMethodInvocation *invocation;
+};
+typedef struct _SetGlobalEngineData SetGlobalEngineData;
+
 static void
 _ibus_set_global_engine_ready_cb (BusInputContext       *context,
                                   GAsyncResult          *res,
-                                  GDBusMethodInvocation *invocation)
+                                  SetGlobalEngineData   *data)
 {
+    BusIBusImpl *ibus = data->ibus;
+
     GError *error = NULL;
     if (!bus_input_context_set_engine_by_desc_finish (context, res, &error)) {
         g_error_free (error);
-        g_dbus_method_invocation_return_error (invocation,
+        g_dbus_method_invocation_return_error (data->invocation,
                                                G_DBUS_ERROR,
                                                G_DBUS_ERROR_FAILED,
                                                "Set global engine failed.");
 
     }
     else {
-        g_dbus_method_invocation_return_value (invocation, NULL);
+        g_dbus_method_invocation_return_value (data->invocation, NULL);
+
+        if (ibus->use_global_engine && (context != ibus->focused_context)) {
+            /* context and ibus->focused_context don't match. This means that
+             * the focus is moved before _ibus_set_global_engine() asynchronous
+             * call finishes. In this case, the engine for the context currently
+             * being focused hasn't been updated. Update the engine here so that
+             * subsequent _ibus_get_global_engine() call could return a
+             * consistent engine name. */
+            BusEngineProxy *engine = bus_input_context_get_engine (context);
+            if (engine && ibus->focused_context != NULL) {
+                g_object_ref (engine);
+                bus_input_context_set_engine (context, NULL);
+                bus_input_context_set_engine (ibus->focused_context, engine);
+                g_object_unref (engine);
+            }
+        }
     }
+
+    g_object_unref (ibus);
+    g_slice_free (SetGlobalEngineData, data);
 }
 
 /**
@@ -1682,12 +1709,15 @@ _ibus_set_global_engine (BusIBusImpl           *ibus,
         return;
     }
 
+    SetGlobalEngineData *data = g_slice_new0 (SetGlobalEngineData);
+    data->ibus = g_object_ref (ibus);
+    data->invocation = invocation;
     bus_input_context_set_engine_by_desc (context,
                                           desc,
                                           g_gdbus_timeout, /* timeout in msec. */
                                           NULL, /* we do not cancel the call. */
                                           (GAsyncReadyCallback) _ibus_set_global_engine_ready_cb,
-                                          invocation);
+                                          data);
 }
 
 /**