Swap D-Bus and IBus initialization order to avoid race conditions.

chromeos_input_method.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos_input_method.h"
 
 #include <dbus/dbus-glib-lowlevel.h>  // for dbus_g_connection_get_connection.
 #include <ibus.h>
 
 #include <algorithm>  // for std::reverse.
@@ skipping 517 matching lines @@
           this);
       // Since the connection which ibus_ has is a "shared connection". We
       // should not close the connection. Just call g_object_unref.
       g_object_unref(ibus_);
     }
     // |dbus_connection_| and |dbus_proxy_| will be destructed by ~scoped_ptr().
   }
 
   // Initializes IBus and DBus connections.
   bool Init() {
-    // Establish IBus connection between ibus-daemon to retrieve the list of
-    // available input method engines, change the current input method engine,
-    // and so on.
     ibus_init();
-    ibus_ = ibus_bus_new();
-
-    // Check the IBus connection status.
-    if (!ibus_) {
-      LOG(ERROR) << "ibus_bus_new() failed";
-      return false;
-    }
-    if (!ibus_bus_is_connected(ibus_)) {
-      DLOG(INFO) << "ibus_bus_is_connected() failed";
-      return false;
-    }
 
     // Establish a DBus connection between the candidate_window process for
     // Chromium OS to handle signals (e.g. "FocusIn") from the process.
     const char* address = ibus_get_address();
     if (!address) {
       LOG(ERROR) << "ibus_get_address returned NULL";
       return false;
     }
     dbus_connection_.reset(
         new dbus::BusConnection(dbus::GetPrivateBusConnection(address)));
@@ skipping 14 matching lines @@
       return false;
     }
 
     // Register the callback function for "destroy".
     dbus_proxy_is_alive_ = true;
     g_signal_connect(dbus_proxy_->gproxy(),
                      "destroy",
                      G_CALLBACK(DBusProxyDestroyCallback),
                      this);
 
+    // Establish IBus connection between ibus-daemon to retrieve the list of
+    // available input method engines, change the current input method engine,
+    // and so on.
+    ibus_ = ibus_bus_new();
+
+    // Check the IBus connection status.
+    if (!ibus_) {
+      LOG(ERROR) << "ibus_bus_new() failed";
+      return false;
+    }
+    if (!ibus_bus_is_connected(ibus_)) {
+      DLOG(INFO) << "ibus_bus_is_connected() failed";
+      return false;
+    }
+
     // Register the callback function for IBusBus signals.
     g_signal_connect(ibus_,
                      "disconnected",
                      G_CALLBACK(IBusBusDisconnectedCallback),
                      this);
     g_signal_connect(ibus_,
                      "global-engine-changed",
                      G_CALLBACK(IBusBusGlobalEngineChangedCallback),
                      this);
     
@@ skipping 599 matching lines @@
     InputMethodStatusConnection* connection) {
   g_return_val_if_fail(connection, false);
   const bool is_connected = connection->ConnectionIsAlive();
   if (!is_connected) {
     LOG(WARNING) << "ChromeOSInputMethodStatusConnectionIsAlive: NOT alive";
   }
   return is_connected;
 }
 
 }  // namespace chromeos