Prevent dbus autolaunching (issue #66).

epoptes · Sep 21, 2018 · d42e5dd · d42e5dd
1 parent 4840fd8
commit d42e5dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/data/client-functions b/data/client-functions
@@ -463,6 +463,9 @@ echo "   ...done" >&5
 
 info
 
+# Prevent dbus from getting autolaunched (issue #66)
+export "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS:-unix:path=/dev/null}"
+
 for i in 0 15; do
     trap "on_signal $i" $i
 done
diff --git a/epoptes-client/_common.py b/epoptes-client/_common.py
@@ -32,6 +32,3 @@
 gettext.textdomain('epoptes')
 locale.textdomain('epoptes')
 gettext = gettext.gettext
-# Prevent dbus from getting autolaunched (issue #66)
-if not os.getenv('DBUS_SESSION_BUS_ADDRESS'):
-    os.environ['DBUS_SESSION_BUS_ADDRESS'] = "unix:path=/dev/null"