minor fixes

x11docker

@@ -3977,7 +3977,7 @@ create_dockerrc() {             # create dockerrc: This script runs as root (or
   esac
   echo "[ \"\$Dockerpull\" = 'yes' ] && {"
   echo "  note 'Pulling image $Imagename from docker hub'"
-  echo "  env DISPLAY='$Hostdisplay' DBUS_SESSION_BUS_ADDRESS='$DBUS_SESSION_BUS_ADDRESS' su '$Hostuser' -c \"notify-send 'x11docker: Pulling image $Imagename from docker hub'\" 2>/dev/null"
+  echo "  env DISPLAY='$Hostdisplay' DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS:-}' su '$Hostuser' -c \"notify-send 'x11docker: Pulling image $Imagename from docker hub'\" 2>/dev/null"
   echo "  $Sudo $Dockerexe pull $Imagename 1>&2"
   echo "}"
   echo "$Dockerexe inspect --type=image $Imagename >>$Containerlogfile 2>&1 || {"
@@ -4944,7 +4944,6 @@ $(tail $Xpraserverlogfile)"
           $Mksu "env $Newxenv XPRA_OPENGL_DOUBLE_BUFFERED=1 $Xpraservercommand" >> $Xpraserverlogfile 2>&1 &
           Xpraserverpid=$! && storepid $Xpraserverpid xpraserver
           waitforlogentry "xpra server" $Xpraserverlogfile 'xpra is ready' && verbose "Xpra server is ready" || {
-            warning xpra
             rocknroll && error "Xpra server startup failed.
   Last lines of Xpra server log:
 $(tail $Xpraserverlogfile)"