From 57fbe011dc128e8c04eefc79ca982718a3f5d980 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 30 Apr 2017 22:14:19 +0200 Subject: [PATCH] merge conflict --- src/fenrir/screenDriver/vcsaDriver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrir/screenDriver/vcsaDriver.py index b617e8cf..4cc300f6 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -73,7 +73,7 @@ class driver(): self.ListSessions = inf.get_dbus_method('ListSessions') sessions = self.ListSessions() - self.env['screenData']['autoIgnoreScreens'] = [] + self.env['screen']['autoIgnoreScreens'] = [] for session in sessions: obj = bus.get_object('org.freedesktop.login1', session[4]) inf = dbus.Interface(obj, 'org.freedesktop.DBus.Properties') @@ -93,7 +93,7 @@ class driver(): self.env['generalInformation']['currUser'] = session[2] except Exception as e: 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'): newContentBytes = b''