1.1 --- a/OpenSecurity/bin/vmmanager.pyw	Tue Mar 18 18:00:12 2014 +0100
     1.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Wed Apr 02 10:41:00 2014 +0100
     1.3 @@ -518,9 +518,12 @@
     1.4          raise OpenSecurityException('Command failed:' + ''.join(result[2]))
     1.5      return result
     1.6  
     1.7 +
     1.8 +            
     1.9  # handles browsing request                    
    1.10  class BrowsingHandler(threading.Thread):   
    1.11      vmm = None
    1.12 +    #Cygwin.start_X11()
    1.13      def __init__(self, vmmanager):
    1.14          threading.Thread.__init__(self)
    1.15          self.vmm = vmmanager
    1.16 @@ -528,7 +531,6 @@
    1.17      def run(self):
    1.18          drive = None
    1.19          try:
    1.20 -            Cygwin.start_X11()
    1.21              new_sdvm = self.vmm.generateSDVMName()
    1.22              self.vmm.createVM(new_sdvm)
    1.23              self.vmm.storageAttach(new_sdvm)
    1.24 @@ -536,12 +538,17 @@
    1.25              self.vmm.attachCertificateISO(new_sdvm)
    1.26              self.vmm.startVM(new_sdvm)
    1.27              new_ip = self.vmm.waitStartup(new_sdvm)
    1.28 -            drive = self.vmm.genNetworkDrive()
    1.29 -            if new_ip != None:
    1.30 -                self.vmm.mapNetworkDrive(drive, '\\\\' + new_ip + '\\Download', None, None)
    1.31 +            #drive = self.vmm.genNetworkDrive()
    1.32 +            #if new_ip != None:
    1.33 +            #    self.vmm.mapNetworkDrive(drive, '\\\\' + new_ip + '\\Download', None, None)
    1.34              #browser = '/usr/bin/iceweasel'
    1.35              #browser = '/usr/bin/midori'
    1.36 -            browser = '/usr/bin/chromium'
    1.37 +            #browser = '/usr/bin/chromium '
    1.38 +            browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
    1.39 +            Cygwin.start_X11()
    1.40 +           
    1.41 +            #if Cygwin.is_X11_running()==True:
    1.42 +            #result = checkResult(Cygwin.bashExecute('DISPLAY=:0 xhost '+new_ip))
    1.43              result = checkResult(Cygwin.sshExecuteX11(browser, new_ip, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + new_sdvm + '/dvm_key'))
    1.44          except:
    1.45              logger.error("BrowsingHandler failed. Cleaning up")