@ -21,6 +21,8 @@ import __future__
import gobject
import gobject
import dbus
import dbus
import os
from os import path
import dbus.mainloop.glib
import dbus.mainloop.glib
from calculate.lib.datavars import DataVars, VariableError
from calculate.lib.datavars import DataVars, VariableError
from calculate.lib.utils.files import isMount, getRunCommands
from calculate.lib.utils.files import isMount, getRunCommands
@ -95,13 +97,6 @@ class ResourceRemounter:
self.remount_user_resources()
self.remount_user_resources()
def unlock_screensaver(status):
"""
Handle screensaver unlock
"""
if status == 0:
self.check_server(True)
def main(argv):
def main(argv):
# processing the user argument
# processing the user argument
argp = ArgumentParser(add_help=True)
argp = ArgumentParser(add_help=True)
@ -111,7 +106,6 @@ def main(argv):
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
bus = dbus.SystemBus()
bus = dbus.SystemBus()
sessionbus = dbus.SessionBus()
# initialization calculate datavars and quitting on an error
# initialization calculate datavars and quitting on an error
try:
try:
dv = DataVars()
dv = DataVars()
@ -128,8 +122,6 @@ def main(argv):
rm = ResourceRemounter(dv)
rm = ResourceRemounter(dv)
bus.add_signal_receiver(rm.handle_resuming,dbus_interface="org.freedesktop.UPower",
bus.add_signal_receiver(rm.handle_resuming,dbus_interface="org.freedesktop.UPower",
signal_name = "NotifyResume")
signal_name = "NotifyResume")
sessionbus.add_signal_receiver(rm.unlock_screensaver,dbus_interface="org.gnome.ScreenSaver",
signal_name = "ActiveChanged")
loop = gobject.MainLoop()
loop = gobject.MainLoop()
context = loop.get_context()
context = loop.get_context()
while True:
while True: