Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2007-06-14 08:25:58 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2007-06-14 08:25:58 (GMT)
commit361b8372b69af315dbbab2b8d1662736223a92ff (patch)
tree40e5b83395709cfc52d2ae0e1bfa386d70cfd9e9
parent3c66cb899ff109c7351efaa64c8a88b543a68221 (diff)
s/get_hardware_manager/get_manager.
It was redundant.
-rw-r--r--shell/hardware/hardwaremanager.py6
-rw-r--r--shell/view/keyhandler.py14
2 files changed, 10 insertions, 10 deletions
diff --git a/shell/hardware/hardwaremanager.py b/shell/hardware/hardwaremanager.py
index f23af25..d531dae 100644
--- a/shell/hardware/hardwaremanager.py
+++ b/shell/hardware/hardwaremanager.py
@@ -90,13 +90,13 @@ class HardwareManager(object):
else:
self._service.set_keyboard_brightness(True)
-def get_hardware_manager():
- return _hardware_manager
+def get_manager():
+ return _manager
def get_network_manager():
return _network_manager
-_hardware_manager = HardwareManager()
+_manager = HardwareManager()
try:
_network_manager = NMClient()
diff --git a/shell/view/keyhandler.py b/shell/view/keyhandler.py
index 6945ca5..6327a3b 100644
--- a/shell/view/keyhandler.py
+++ b/shell/view/keyhandler.py
@@ -62,7 +62,7 @@ class KeyHandler(object):
self._key_grabber.grab(key)
def _set_display_brightness(self, level):
- hw_manager = hardwaremanager.get_hardware_manager()
+ hw_manager = hardwaremanager.get_manager()
hw_manager.set_display_brightness(level)
if level == 0:
self._set_display_mode(hardwaremanager.B_AND_W_MODE)
@@ -70,7 +70,7 @@ class KeyHandler(object):
self._set_display_mode(hardwaremanager.COLOR_MODE)
def _set_display_mode(self, mode):
- hw_manager = hardwaremanager.get_hardware_manager()
+ hw_manager = hardwaremanager.get_manager()
hw_manager.set_display_mode(mode)
def handle_zoom_mesh(self):
@@ -98,21 +98,21 @@ class KeyHandler(object):
self._set_display_brightness(15)
def handle_volume_1(self):
- hw_manager = hardwaremanager.get_hardware_manager()
+ hw_manager = hardwaremanager.get_manager()
hw_manager.set_mute(True)
def handle_volume_2(self):
- hw_manager = hardwaremanager.get_hardware_manager()
+ hw_manager = hardwaremanager.get_manager()
hw_manager.set_mute(False)
hw_manager.set_volume(50)
def handle_volume_3(self):
- hw_manager = hardwaremanager.get_hardware_manager()
+ hw_manager = hardwaremanager.get_manager()
hw_manager.set_mute(False)
hw_manager.set_volume(80)
def handle_volume_4(self):
- hw_manager = hardwaremanager.get_hardware_manager()
+ hw_manager = hardwaremanager.get_manager()
hw_manager.set_mute(False)
hw_manager.set_volume(100)
@@ -156,7 +156,7 @@ class KeyHandler(object):
mgr.Shutdown()
def handle_keyboard_brightness(self):
- hw_manager = hardwaremanager.get_hardware_manager()
+ hw_manager = hardwaremanager.get_manager()
if hw_manager:
hw_manager.toggle_keyboard_brightness()