Ticket #1421: sugar-1421.patch

File sugar-1421.patch, 3.4 KB (added by alsroot, 15 years ago)

  • src/jarabe/desktop/favoritesview.py 

    From 7e993e3940327fdd9658cf1f34705c8b4ebc2788 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 24 Sep 2009 20:01:42 +0000
Subject: Starting/resuming an entry from Journal shows wrong colours #1421

---
 src/jarabe/desktop/favoritesview.py |   10 ----------
 src/jarabe/journal/misc.py          |   16 ++++++++++++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 490e5c0..eccd517 100644
    a b class ActivityIcon(CanvasIcon): 
    522522    def _resume(self, journal_entry):
    523523        if not journal_entry['activity_id']:
    524524            journal_entry['activity_id'] = activityfactory.create_activity_id()
    525 
    526         shell_model = shell.get_model()
    527         activity = shell_model.get_activity_by_id(journal_entry['activity_id'])
    528         if activity:
    529             activity.get_window().activate(gtk.get_current_event_time())
    530             return
    531 
    532         launcher.add_launcher(journal_entry['activity_id'],
    533                               self._activity_info.get_icon(),
    534                               misc.get_icon_color(journal_entry))
    535525        misc.resume(journal_entry, self._activity_info.get_bundle_id())
    536526
    537527    def _activate(self):

  • src/jarabe/journal/misc.py 

    diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index a9baec8..24ad216 100644
    a b from gettext import gettext as _ 
    2121
    2222import gio
    2323import gconf
     24import gtk
    2425
    2526from sugar.activity import activityfactory
    2627from sugar.activity.activityhandle import ActivityHandle
    … … from sugar.bundle.activitybundle import ActivityBundle 
    3132from sugar.bundle.contentbundle import ContentBundle
    3233from sugar import util
    3334
    34 from jarabe.model import bundleregistry
     35from jarabe.view import launcher
     36from jarabe.model import bundleregistry, shell
    3537from jarabe.journal.journalentrybundle import JournalEntryBundle
    3638from jarabe.journal import model
    3739
    … … def resume(metadata, bundle_id=None): 
    192194        activity_bundle = registry.get_bundle(activities[0].get_bundle_id())
    193195        activityfactory.create_with_uri(activity_bundle, bundle.get_start_uri())
    194196    else:
     197        activity_id = metadata.get('activity_id', '')
     198
     199        if activity_id:
     200            shell_model = shell.get_model()
     201            activity = shell_model.get_activity_by_id(activity_id)
     202            if activity:
     203                activity.get_window().activate(gtk.get_current_event_time())
     204                return
     205
    195206        if bundle_id is None:
    196207            activities = get_activities(metadata)
    197208            if not activities:
    … … def resume(metadata, bundle_id=None): 
    202213
    203214        bundle = registry.get_bundle(bundle_id)
    204215
    205         activity_id = metadata.get('activity_id', '')
    206216
    207217        if metadata.get('mountpoint', '/') == '/':
    208218            object_id = metadata['uid']
    … … def resume(metadata, bundle_id=None): 
    210220            object_id = model.copy(metadata, '/')
    211221
    212222        if activity_id:
     223            launcher.add_launcher(activity_id, bundle.get_icon(),
     224                    get_icon_color(metadata))
    213225            handle = ActivityHandle(object_id=object_id,
    214226                                    activity_id=activity_id)
    215227            activityfactory.create(bundle, handle)