[Xfce4-commits] <thunar:master> Don't abort startup if dbus failed.

[Nick Schermer]

Updating branch refs/heads/master
         to 0ba896ba9342f464b284a2513fa49280949cdc13 (commit)
       from 394e115312f2ddc5a06f5ab9f8ab073a614c79a1 (commit)

commit 0ba896ba9342f464b284a2513fa49280949cdc13
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Dec 27 13:07:46 2012 +0100

    Don't abort startup if dbus failed.
    
    This could happen with session startup, multiple
    request the dbus, but only 1 wins.

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

diff --git a/thunar/main.c b/thunar/main.c
index bb42f68..4c31953 100644
--- a/thunar/main.c
+++ b/thunar/main.c
@@ -293,7 +293,7 @@ error0:
 
       /* check if the name was requested successfully */
       if (!thunar_dbus_service_has_connection (dbus_service))
-        goto dbus_name_failed;
+        thunar_application_set_daemon (application, FALSE);
 #endif
     }
   else
@@ -310,7 +310,6 @@ error0:
   gtk_main ();
 
 #ifdef HAVE_DBUS
-  dbus_name_failed:
   if (dbus_service != NULL)
     g_object_unref (G_OBJECT (dbus_service));
 #endif