GDBus: restore non-fatality of name acquisition error

commit 5350302b09 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
This commit is contained in:
Marc-Antoine Perennou 2011-11-13 00:37:47 +01:00 committed by Colin Walters
parent d1aa7de5d0
commit fc8d13f4bd

View File

@ -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);