From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 2 Jan 2014 06:38:07 +0000 (-0500)
Subject: GDBusConnection: don't write to stdout
X-Git-Tag: 2.39.3~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b3dd73329ddabfd4fd72c23fa220ee948a854f;p=platform%2Fupstream%2Fglib.git

GDBusConnection: don't write to stdout

When losing the D-Bus connection, we would write to stdout about it just
before killing ourselves with SIGTERM.  We're a library, so we should
probably use stderr instead.

https://bugzilla.gnome.org/show_bug.cgi?id=721324
---

diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index fef04a5..43f7c93 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -799,14 +799,14 @@ g_dbus_connection_real_closed (GDBusConnection *connection,
     {
       if (error != NULL)
         {
-          g_print ("%s: Remote peer vanished with error: %s (%s, %d). Exiting.\n",
-                   G_STRFUNC,
-                   error->message,
-                   g_quark_to_string (error->domain), error->code);
+          g_printerr ("%s: Remote peer vanished with error: %s (%s, %d). Exiting.\n",
+                      G_STRFUNC,
+                      error->message,
+                      g_quark_to_string (error->domain), error->code);
         }
       else
         {
-          g_print ("%s: Remote peer vanished. Exiting.\n", G_STRFUNC);
+          g_printerr ("%s: Remote peer vanished. Exiting.\n", G_STRFUNC);
         }
       raise (SIGTERM);
     }
diff --git a/gio/tests/gdbus-exit-on-close.c b/gio/tests/gdbus-exit-on-close.c
index befad74..c431331 100644
--- a/gio/tests/gdbus-exit-on-close.c
+++ b/gio/tests/gdbus-exit-on-close.c
@@ -191,12 +191,12 @@ test_exit_on_close (gconstpointer test_data)
   if (td->exit_on_close == EXPLICITLY_FALSE ||
       td->who_closes == LOCAL)
     {
-      g_test_trap_assert_stdout_unmatched (VANISHED_PATTERN);
+      g_test_trap_assert_stderr_unmatched (VANISHED_PATTERN);
       g_test_trap_assert_passed ();
     }
   else
     {
-      g_test_trap_assert_stdout (VANISHED_PATTERN);
+      g_test_trap_assert_stderr (VANISHED_PATTERN);
       g_test_trap_assert_failed();
     }
 }