diff options
| -rw-r--r-- | modules/xo1/kspost.50.xo1-tweaks.inc | 1 | ||||
| -rw-r--r-- | rpms/sugar/sl328-disable-start-menu-options-for-unk-items.patch | 48 | ||||
| -rw-r--r-- | rpms/sugar/sugar.spec | 7 |
3 files changed, 55 insertions, 1 deletions
diff --git a/modules/xo1/kspost.50.xo1-tweaks.inc b/modules/xo1/kspost.50.xo1-tweaks.inc index a5d2aa2..08cd416 100644 --- a/modules/xo1/kspost.50.xo1-tweaks.inc +++ b/modules/xo1/kspost.50.xo1-tweaks.inc @@ -10,3 +10,4 @@ echo "%__dbi_cdb create private nommap" > /etc/rpm/macros.rpmdb # what's more, olpc.fth really shouldnt specify a root device sed -i -e 's:root=mtd0:root=/dev/mtdblock0:g' /boot/olpc.fth +rm /usr/share/gnome/autostart/libcanberra-login-sound.desktop diff --git a/rpms/sugar/sl328-disable-start-menu-options-for-unk-items.patch b/rpms/sugar/sl328-disable-start-menu-options-for-unk-items.patch new file mode 100644 index 0000000..40e5183 --- /dev/null +++ b/rpms/sugar/sl328-disable-start-menu-options-for-unk-items.patch @@ -0,0 +1,48 @@ +--- a/src/jarabe/journal/palettes.py ++++ b/src/jarabe/journal/palettes.py +@@ -62,22 +62,30 @@ class ObjectPalette(Palette): + Palette.__init__(self, primary_text=title, + icon=activity_icon) + +- if metadata.get('activity_id', ''): +- resume_label = _('Resume') +- resume_with_label = _('Resume with') +- else: +- resume_label = _('Start') +- resume_with_label = _('Start with') +- menu_item = MenuItem(resume_label, 'activity-start') +- menu_item.connect('activate', self.__start_activate_cb) +- self.menu.append(menu_item) +- menu_item.show() ++ if misc.get_activities(metadata) or misc.is_bundle(metadata): ++ if metadata.get('activity_id', ''): ++ resume_label = _('Resume') ++ resume_with_label = _('Resume with') ++ else: ++ resume_label = _('Start') ++ resume_with_label = _('Start with') ++ menu_item = MenuItem(resume_label, 'activity-start') ++ menu_item.connect('activate', self.__start_activate_cb) ++ self.menu.append(menu_item) ++ menu_item.show() + +- menu_item = MenuItem(resume_with_label, 'activity-start') +- self.menu.append(menu_item) +- menu_item.show() +- start_with_menu = StartWithMenu(self._metadata) +- menu_item.set_submenu(start_with_menu) ++ menu_item = MenuItem(resume_with_label, 'activity-start') ++ self.menu.append(menu_item) ++ menu_item.show() ++ start_with_menu = StartWithMenu(self._metadata) ++ menu_item.set_submenu(start_with_menu) ++ ++ else: ++ resume_label = _('No activity to start entry') ++ menu_item = MenuItem(resume_label) ++ menu_item.set_sensitive(False) ++ self.menu.append(menu_item) ++ menu_item.show() + + client = gconf.client_get_default() + color = XoColor(client.get_string('/desktop/sugar/user/color')) diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index 9b645a9..1013934 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -33,7 +33,8 @@ Patch20: indicate-inactive-state-in-mesh-device-icon.patch Patch21: sl1673-fix-network-disconnect-and-discard-history-v2.patch #Patch22: sl1814-consolidate-activity-launch-entry-point.patch Patch23: sl1940-register-session-failed-fix.patch -Patch24: sl1725-homewindow-resize-on-resolution-change.patch +Patch24: sl328-disable-start-menu-options-for-unk-items.patch +Patch25: sl1725-homewindow-resize-on-resolution-change.patch # Andres' journal filesize enhancement Patch101: sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch @@ -177,6 +178,7 @@ multiple instances of sugar. #%patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 %patch101 -p1 %patch102 -p1 @@ -300,6 +302,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg %changelog +* Wed Oct 20 2010 Steven M. Parrish <smparrish@gmail.com> - 0.88.1-5.38 +- Partial Fix for SL328, Fix for SL2163, SL1725, SL2249 + * Thu Jun 3 2010 Peter Robinson <pbrobinson@gmail.com> - 0.88.1-1 - New upstream stable 0.88.1 release |