diff options
| author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-05-06 13:49:12 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-05-06 13:49:12 (GMT) |
| commit | 8026aa1dfab89e1b370e7eda1b0ef62deafbb136 (patch) | |
| tree | ab32913786002e456df40da8494718949414cf39 | |
| parent | 7d664d6df209b598d0f96ce33fe1dfa302fdc481 (diff) | |
Remove references to _sugarext
| -rw-r--r-- | src/jarabe/desktop/grid.py | 4 | ||||
| -rw-r--r-- | src/jarabe/model/sound.py | 4 | ||||
| -rw-r--r-- | src/jarabe/view/keyhandler.py | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/jarabe/desktop/grid.py b/src/jarabe/desktop/grid.py index eb7fabc..09aaa99 100644 --- a/src/jarabe/desktop/grid.py +++ b/src/jarabe/desktop/grid.py @@ -20,14 +20,14 @@ import random import gobject import gtk -from sugar import _sugarext +#from sugar import _sugarext _PLACE_TRIALS = 20 _MAX_WEIGHT = 255 _REFRESH_RATE = 200 _MAX_COLLISIONS_PER_REFRESH = 20 -class Grid(_sugarext.Grid): +class Grid(gobject.GObject): #_sugarext.Grid): __gsignals__ = { 'child-changed' : (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, diff --git a/src/jarabe/model/sound.py b/src/jarabe/model/sound.py index 65090a4..656a909 100644 --- a/src/jarabe/model/sound.py +++ b/src/jarabe/model/sound.py @@ -17,7 +17,7 @@ import gconf from sugar import env -from sugar import _sugarext +#from sugar import _sugarext from sugar import dispatch VOLUME_STEP = 10 @@ -55,4 +55,4 @@ def restore(): client = gconf.client_get_default() set_volume(client.get_int('/desktop/sugar/sound/volume')) -_volume = _sugarext.VolumeAlsa() +_volume = None #_sugarext.VolumeAlsa() diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 08856c0..408d9d1 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -25,7 +25,7 @@ import sys import dbus import gtk -from sugar._sugarext import KeyGrabber +#from sugar._sugarext import KeyGrabber from jarabe.model import screen from jarabe.model import sound @@ -86,12 +86,13 @@ class KeyHandler(object): self._keystate_pressed = 0 self._speech_proxy = None + """ self._key_grabber = KeyGrabber() self._key_grabber.connect('key-pressed', self._key_pressed_cb) self._key_grabber.connect('key-released', self._key_released_cb) - + """ self._tabbing_handler = TabbingHandler(self._frame, _TABBING_MODIFIER) for f in os.listdir(os.path.join(config.ext_path, 'globalkey')): @@ -109,7 +110,7 @@ class KeyHandler(object): logging.error('Exception while loading extension:\n' + \ traceback.format_exc()) - self._key_grabber.grab_keys(_actions_table.keys()) + #self._key_grabber.grab_keys(_actions_table.keys()) def _change_volume(self, step=None, value=None): if step is not None: |