[Xfce4-commits] <thunar:master> Unset DBUS variables once registered (bug #8800).

[Nick Schermer]

Updating branch refs/heads/master
         to ae5f4024ea255d762627babcbdff967d722bbb6a (commit)
       from 28cf90311c3f8b66211838867f1a256d863d4bec (commit)

commit ae5f4024ea255d762627babcbdff967d722bbb6a
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Sep 28 20:49:48 2012 +0200

    Unset DBUS variables once registered (bug #8800).
    
    Remove the DBUS_STARTER_ADDRESS and DBUS_STARTER_BUS_TYPE
    environment variables when the dbus service is registered
    and started from the service file (by thunar-settings for
    exampple).
    
    Else these variables will also be in the child environ causing
    problems in some applications that are execute by thunar.

 thunar/thunar-dbus-service.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c
index 6b31a06..33b9709 100644
--- a/thunar/thunar-dbus-service.c
+++ b/thunar/thunar-dbus-service.c
@@ -272,6 +272,10 @@ thunar_dbus_service_init (ThunarDBusService *dbus_service)
 
       /* request the org.xfce.FileManager name for Thunar */
       dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service->connection), "org.xfce.FileManager", DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
+
+      /* once we registered, unset dbus variables (bug #8800) */
+      g_unsetenv ("DBUS_STARTER_ADDRESS");
+      g_unsetenv ("DBUS_STARTER_BUS_TYPE");
     }
   else
     {