storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix other conflicts

Browse Source
This commit is contained in:
chrys 2017-04-30 22:19:31 +02:00
parent 57fbe011dc
commit 50ba02756b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fenrir/screenDriver/vcsaDriver.py
View File

@ -71,7 +71,6 @@ class driver():
obj = bus.get_object('org.freedesktop.login1', '/org/freedesktop/login1') obj = bus.get_object('org.freedesktop.login1', '/org/freedesktop/login1')
inf = dbus.Interface(obj, 'org.freedesktop.login1.Manager') inf = dbus.Interface(obj, 'org.freedesktop.login1.Manager')
self.ListSessions = inf.get_dbus_method('ListSessions') self.ListSessions = inf.get_dbus_method('ListSessions')
sessions = self.ListSessions() sessions = self.ListSessions()
self.env['screen']['autoIgnoreScreens'] = [] self.env['screen']['autoIgnoreScreens'] = []
for session in sessions: for session in sessions:
@ -86,11 +85,11 @@ class driver():
self.env['runtime']['debug'].writeDebugOut('No TTY found for session:' + session[4],debug.debugLevel.ERROR) self.env['runtime']['debug'].writeDebugOut('No TTY found for session:' + session[4],debug.debugLevel.ERROR)
return return
if sessionType.upper() == 'X11': if sessionType.upper() == 'X11':
self.env['screenData']['autoIgnoreScreens'].append(screen) self.env['screen']['autoIgnoreScreens'].append(screen)
if screen == self.env['screenData']['newTTY'] : if screen == self.env['screen']['newTTY'] :
if self.env['generalInformation']['currUser'] != session[2]: if self.env['general']['currUser'] != session[2]:
self.env['generalInformation']['prevUser'] = self.env['generalInformation']['currUser'] self.env['general']['prevUser'] = self.env['general']['currUser']
self.env['generalInformation']['currUser'] = session[2] self.env['general']['currUser'] = session[2]
except Exception as e: except Exception as e:
self.env['runtime']['debug'].writeDebugOut('getSessionInformation: Maybe no LoginD:' + str(e),debug.debugLevel.ERROR) self.env['runtime']['debug'].writeDebugOut('getSessionInformation: Maybe no LoginD:' + str(e),debug.debugLevel.ERROR)
self.env['screen']['autoIgnoreScreens'] = [] self.env['screen']['autoIgnoreScreens'] = []