[gnome-shell] GDBus: restore non-fatality of name acquisition error

[Colin Walters <walters src gnome org>]

commit fc8d13f4bd9c3c4116e99d471d90047c23c18cc6
Author: Marc-Antoine Perennou <Marc-Antoine Perennou com>
Date:   Sun Nov 13 00:37:47 2011 +0100

    GDBus: restore non-fatality of name acquisition error
    
    commit 5350302b09ddbbfa98091a943ae878c9aaf9eb6e dropped the possibility
    to make a dbus name acquisition failure non-fatal.
    Btw, it has also overriden the name in the error message.
    
    Signed-off-by: Marc-Antoine Perennou <Marc-Antoine Perennou com>
    Signed-off-by: Colin Walters <walters verbum org>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=663941

 src/main.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index 81cdce9..42d1446 100644
--- a/src/main.c
+++ b/src/main.c
@@ -58,7 +58,9 @@ shell_dbus_acquire_name (GDBusProxy *bus,
                                                        NULL, /* cancellable */
                                                        &error)))
     {
-      g_printerr ("failed to acquire org.gnome.Shell: %s\n", error->message);
+      g_printerr ("failed to acquire %s: %s\n", name, error->message);
+      if (!fatal)
+        return;
       exit (1);
     }
   g_variant_get (request_name_variant, "(u)", request_name_result);