Don't abort startup if dbus failed.
authorNick Schermer <nick@xfce.org>
Thu, 27 Dec 2012 12:07:46 +0000 (13:07 +0100)
committerNick Schermer <nick@xfce.org>
Thu, 27 Dec 2012 12:07:46 +0000 (13:07 +0100)
This could happen with session startup, multiple
request the dbus, but only 1 wins.

thunar/main.c

index bb42f68..4c31953 100644 (file)
@@ -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