diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2008-12-22 13:18:35 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2008-12-22 13:18:35 (GMT) |
commit | 2fb3d75b6a64630f7a2b9d0a621245301385f80d (patch) | |
tree | 8f66c3f9583cecbebb454841574d55ca3df8c462 | |
parent | 9bc1c67764994e4e6e0c441f5c4e7eea73034647 (diff) | |
parent | baa6d77522dd1aab3301a55885fd3989a4dbaef9 (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
-rw-r--r-- | extensions/deviceicon/battery.py | 2 | ||||
-rw-r--r-- | extensions/deviceicon/speaker.py | 2 | ||||
-rw-r--r-- | extensions/deviceicon/xomenu.py | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py index f83a80d..e295b3d 100644 --- a/extensions/deviceicon/battery.py +++ b/extensions/deviceicon/battery.py @@ -44,7 +44,7 @@ _PRESENT_PROP = 'battery.present' class DeviceView(TrayIcon): - FRAME_POSITION_RELATIVE = 101 + FRAME_POSITION_RELATIVE = 102 def __init__(self, udi): client = gconf.client_get_default() diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py index ffb38cb..db993fa 100644 --- a/extensions/deviceicon/speaker.py +++ b/extensions/deviceicon/speaker.py @@ -34,7 +34,7 @@ _ICON_NAME = 'speaker' class DeviceView(TrayIcon): - FRAME_POSITION_RELATIVE = 102 + FRAME_POSITION_RELATIVE = 103 def __init__(self): client = gconf.client_get_default() diff --git a/extensions/deviceicon/xomenu.py b/extensions/deviceicon/xomenu.py index 59cdeab..359832f 100644 --- a/extensions/deviceicon/xomenu.py +++ b/extensions/deviceicon/xomenu.py @@ -17,8 +17,6 @@ from gettext import gettext as _ import gconf -import gtk - from sugar.graphics.menuitem import MenuItem from sugar.graphics.tray import TrayIcon from sugar.graphics.palette import Palette @@ -33,7 +31,7 @@ _ICON_NAME = 'computer-xo' class SystemView(TrayIcon): - FRAME_POSITION_RELATIVE = 800 + FRAME_POSITION_RELATIVE = 101 def __init__(self): client = gconf.client_get_default() |