commit 4a560ab620a75a3ebc469096fc00160a803d73ba
author Yusuke Sato <yusukes@chromium.org> Wed May 18 02:11:27 2011
committer Yusuke Sato <yusukes@chromium.org> Wed May 18 03:15:51 2011
tree be2e9e0bfa9dd1adf0438ec734d0e86623cdade3
parent 9240d0006aaf893707573f8aa5293a955ad312a1

Rewrite old log messages.

BUG=None
TEST=None

Change-Id: I6f47494e9295a8db110a5c46c47de052e935267f
Reviewed-on: http://gerrit.chromium.org/gerrit/1097
Reviewed-by: Yasuhiro Matsuda <mazda@chromium.org>
Tested-by: Yusuke Sato <yusukes@chromium.org>

chromeos_input_method.cc

diff --git a/chromeos_input_method.cc b/chromeos_input_method.cc
index 16bbbf2..1d61fbf 100644
--- a/chromeos_input_method.cc
+++ b/chromeos_input_method.cc
@@ -767,7 +767,7 @@
     ibus_bus_set_watch_ibus_signal(ibus_, TRUE);
 
     if (ibus_bus_is_connected(ibus_)) {
-      LOG(INFO) << "ibus_bus_is_connected(). IBus connection is ready!";
+      LOG(INFO) << "IBus connection is ready.";
     }
   }
 
@@ -784,8 +784,8 @@
     if (!ibus_config_) {
       GDBusConnection* ibus_connection = ibus_bus_get_connection(ibus_);
       if (!ibus_connection) {
-        LOG(ERROR) << "ibus_bus_get_connection() failed. ibus-daemon is "
-                   << "restarted and |ibus_| connection is not recovered yet?";
+        LOG(INFO) << "Couldn't create an ibus config object since "
+                  << "IBus connection is not ready.";
         return;
       }
       const gboolean disconnected
@@ -794,8 +794,8 @@
         // |ibus_| object is not NULL, but the connection between ibus-daemon
         // is not yet established. In this case, we don't create |ibus_config_|
         // object.
-        LOG(WARNING) << "Couldn't create an ibus config object since "
-                     << "ibus_connection_is_connected() returned false.";
+        LOG(ERROR) << "Couldn't create an ibus config object since "
+                   << "IBus connection is closed.";
         return;
       }
       // If memconf is not successfully started yet, ibus_config_new() will
@@ -814,7 +814,7 @@
       // libcros to detect the delivery of the "destroy" glib signal the
       // |ibus_config_| object.
       g_object_ref(ibus_config_);
-      LOG(INFO) << "ibus_config_ is ready!";
+      LOG(INFO) << "ibus_config_ is ready.";
     }
   }
 
@@ -991,7 +991,7 @@
 
   // Handles "disconnected" signal from ibus-daemon.
   static void IBusBusDisconnectedCallback(IBusBus* bus, gpointer user_data) {
-    LOG(WARNING) << "IBus connection is terminated!";
+    LOG(WARNING) << "IBus connection is terminated.";
     g_return_if_fail(user_data);
     InputMethodStatusConnection* self
         = static_cast<InputMethodStatusConnection*>(user_data);

chromeos_input_method_ui.cc

diff --git a/chromeos_input_method_ui.cc b/chromeos_input_method_ui.cc
index 79511ac..6cbb45e 100644
--- a/chromeos_input_method_ui.cc
+++ b/chromeos_input_method_ui.cc
@@ -89,7 +89,7 @@
     bool result = false;
     // Check the IBus connection status.
     if (ibus_bus_is_connected(ibus_)) {
-      LOG(INFO) << "ibus_bus_is_connected(). IBus connection is ready!";
+      LOG(INFO) << "ibus_bus_is_connected(). IBus connection is ready.";
       if (connection_change_handler_) {
         connection_change_handler_(input_method_library_, true);
       }
@@ -335,7 +335,7 @@
   // |ibus_panel_service_| object since the connection the service has will be
   // destroyed soon.
   static void IBusBusDisconnectedCallback(IBusBus* bus, gpointer user_data) {
-    LOG(WARNING) << "IBus connection is terminated!";
+    LOG(WARNING) << "IBus connection is terminated.";
     g_return_if_fail(user_data);
     InputMethodUiStatusConnection* self
         = static_cast<InputMethodUiStatusConnection*>(user_data);