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

merge conflict

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

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

@ -73,7 +73,7 @@ class driver():
self.ListSessions = inf.get_dbus_method('ListSessions') self.ListSessions = inf.get_dbus_method('ListSessions')
sessions = self.ListSessions() sessions = self.ListSessions()
self.env['screenData']['autoIgnoreScreens'] = [] self.env['screen']['autoIgnoreScreens'] = []
for session in sessions: for session in sessions:
obj = bus.get_object('org.freedesktop.login1', session[4]) obj = bus.get_object('org.freedesktop.login1', session[4])
inf = dbus.Interface(obj, 'org.freedesktop.DBus.Properties') inf = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
@ -93,7 +93,7 @@ class driver():
self.env['generalInformation']['currUser'] = session[2] self.env['generalInformation']['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['screenData']['autoIgnoreScreens'] = [] self.env['screen']['autoIgnoreScreens'] = []
def update(self, trigger='onUpdate'): def update(self, trigger='onUpdate'):
newContentBytes = b'' newContentBytes = b''