[Xfce4-commits] <xfce4-session:nick/shutdown-cleanup> Exit errors should not terminate.

[Nick Schermer]

Updating branch refs/heads/nick/shutdown-cleanup
         to 0ec24553d3f2417e2e52a6789e7e40b9692af9c4 (commit)
       from a9bffdd52ecc0bd4fa9421c93e9b876fe295cdd5 (commit)

commit 0ec24553d3f2417e2e52a6789e7e40b9692af9c4
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Dec 1 20:12:07 2011 +0100

    Exit errors should not terminate.

 xfce4-session/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index e7ac755..01ef93e 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -90,7 +90,7 @@ setup_environment (void)
   sm = g_getenv ("SESSION_MANAGER");
   if (sm != NULL && strlen (sm) > 0)
     {
-      fprintf (stderr, "xfce4-session: Another session manager is already running\n");
+      g_printerr ("%s: Another session manager is already running\n", PACKAGE_NAME);
       exit (EXIT_FAILURE);
     }
 
@@ -172,8 +172,8 @@ xfsm_dbus_init (void)
                                NULL);
   if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret)
     {
-      g_error ("Another session manager is already running");
-      exit (1);
+      g_printerr ("%s: Another session manager is already running\n", PACKAGE_NAME);
+      exit (EXIT_FAILURE);
     }
 }