[Xfce4-commits] <xfce4-settings:master> Make the already running message friendly and not an error.

[Nick Schermer]

Updating branch refs/heads/master
         to deb27ba7c4e17114bbe77b058865a17ea1e70246 (commit)
       from 3acf2bee9f1d3ffd4a0995936988422837d14269 (commit)

commit deb27ba7c4e17114bbe77b058865a17ea1e70246
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Jun 17 17:41:49 2011 +0200

    Make the already running message friendly and not an error.

 xfsettingsd/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
index 3bcc920..a460ccb 100644
--- a/xfsettingsd/main.c
+++ b/xfsettingsd/main.c
@@ -204,7 +204,8 @@ main (gint argc, gchar **argv)
         result = dbus_bus_request_name (dbus_connection, XFSETTINGS_DBUS_NAME, dbus_flags, NULL);
         if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
         {
-            g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance is already running. Leaving...");
+            g_print (G_LOG_DOMAIN ": %s\n", _("Fallback startup in not needed, xfsettingsd is already running. Leaving..."));
+            dbus_connection_unref (dbus_connection);
             return EXIT_SUCCESS;
         }