Ticket #1423: sugar-1423-sugar.patch

File sugar-1423-sugar.patch, 2.2 KB (added by alsroot, 15 years ago)

  • extensions/deviceicon/volume.py 

    From 6dc69c8efa9d0da0476827ad4c49ca070927c31e Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 24 Sep 2009 14:19:02 +0000
Subject: Present windows in non-active process #1423

---
 extensions/deviceicon/volume.py       |    2 +-
 src/jarabe/journal/journalactivity.py |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 8955313..e7f62a2 100644
    a b class DeviceView(TrayIcon): 
    6767    def __button_release_event_cb(self, widget, event):
    6868        journal = journalactivity.get_journal()
    6969        journal.set_active_volume(self._mount)
    70         journal.present()
     70        journal.reveal()
    7171        return True
    7272
    7373def setup(tray):

  • src/jarabe/journal/journalactivity.py 

    diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 852d407..7dbef28 100644
    a b class JournalActivityDBusService(dbus.service.Object): 
    6767        logging.debug('Trying to show object %s', object_id)
    6868
    6969        if self._parent.show_object(object_id):
    70             self._parent.present()
    71             if self._parent.window is not None:
    72                 # have to use gdk level, looks like metacity
    73                 # doesn't raise windows from non-icon state, see #1339
    74                 self._parent.window.focus()
     70            self._parent.reveal()
    7571
    7672    def _chooser_response_cb(self, chooser, response_id, chooser_id):
    7773        logging.debug('JournalActivityDBusService._chooser_response_cb')
    … … class JournalActivity(Window): 
    330326
    331327    def __alert_closed_cb(self, data):
    332328        self.show_main_view()
    333         self.present()
     329        self.reveal()
    334330        self._critical_space_alert = None
    335331
    336332    def set_active_volume(self, mount):
    … … class JournalActivity(Window): 
    339335    def focus_search(self):
    340336        """Become visible and give focus to the search entry
    341337        """
    342         self.present()
     338        self.reveal()
    343339        self.show_main_view()
    344340        self.search_grab_focus()
    345341