Handle the case where there is not an hardware manager service installed.

This commit is contained in:
Marco Pesenti Gritti 2007-01-22 01:47:58 +01:00
parent e210a16d31
commit 1cadd9ac0a
2 changed files with 19 additions and 47 deletions

View File

@ -1,43 +0,0 @@
# Copyright (C) 2006, Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import dbus
HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
HARDWARE_MANAGER_SERVICE = 'org.laptop.HardwareManager'
HARDWARE_MANAGER_OBJECT_PATH = '/org/laptop/HardwareManager'
class HardwareManager(object):
COLOR_MODE = 0
B_AND_W_MODE = 1
def __init__(self):
bus = dbus.SystemBus()
proxy = bus.get_object(HARDWARE_MANAGER_SERVICE,
HARDWARE_MANAGER_OBJECT_PATH)
self._service = dbus.Interface(proxy, HARDWARE_MANAGER_INTERFACE)
def set_display_mode(self, mode):
self._service.set_display_mode(mode)
def set_display_brightness(self, level):
self._service.set_display_brightness(level)
def toggle_keyboard_brightness(self):
if self._service.get_keyboard_brightness():
self._service.set_keyboard_brightness(False)
else:
self._service.set_keyboard_brightness(True)

View File

@ -14,6 +14,8 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import logging
import dbus import dbus
HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager' HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
@ -25,18 +27,31 @@ class HardwareManager(object):
B_AND_W_MODE = 1 B_AND_W_MODE = 1
def __init__(self): def __init__(self):
try:
bus = dbus.SystemBus() bus = dbus.SystemBus()
proxy = bus.get_object(HARDWARE_MANAGER_SERVICE, proxy = bus.get_object(HARDWARE_MANAGER_SERVICE,
HARDWARE_MANAGER_OBJECT_PATH) HARDWARE_MANAGER_OBJECT_PATH)
self._service = dbus.Interface(proxy, HARDWARE_MANAGER_INTERFACE) self._service = dbus.Interface(proxy, HARDWARE_MANAGER_INTERFACE)
except dbus.DBusException:
self._service = None
logging.error('Hardware manager service not found.')
def set_display_mode(self, mode): def set_display_mode(self, mode):
if not self._service:
logging.error('Cannot set display mode. Service not found.')
self._service.set_mode(mode) self._service.set_mode(mode)
def set_display_brightness(self, level): def set_display_brightness(self, level):
if not self._service:
logging.error('Cannot set display brightness. Service not found.')
self._service.set_display_brightness(level) self._service.set_display_brightness(level)
def toggle_keyboard_brightness(self): def toggle_keyboard_brightness(self):
if not self._service:
logging.error('Cannot set keyboard brightness. Service not found.')
if self._service.get_keyboard_brightness(): if self._service.get_keyboard_brightness():
self._service.set_keyboard_brightness(False) self._service.set_keyboard_brightness(False)
else: else: