copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

look in all events (not only systray events) when using gajim-remote show_next_pending_event. Fixes #2791

Browse source
This commit is contained in:
Yann Leboulanger 2011-08-01 19:31:22 +02:00
parent 7d6bbdb38e
commit fd81c3f6d0
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/events.py
View file

@ -219,10 +219,12 @@ class Events:
events_list.append(ev) events_list.append(ev)
return events_list return events_list
def get_first_event(self, account, jid = None, type_ = None): def get_first_event(self, account=None, jid=None, type_=None):
""" """
Return the first event of type type_ if given Return the first event of type type_ if given
""" """
if not account:
return self._get_first_event_with_attribute(self._events)
events_list = self.get_events(account, jid, type_) events_list = self.get_events(account, jid, type_)
# be sure it's bigger than latest event # be sure it's bigger than latest event
first_event_time = time.time() + 1 first_event_time = time.time() + 1

5
src/remote_control.py
View file

@ -594,7 +594,10 @@ class SignalObject(dbus.service.Object):
Show the window(s) with next pending event in tabbed/group chats Show the window(s) with next pending event in tabbed/group chats
""" """
if gajim.events.get_nb_events(): if gajim.events.get_nb_events():
gajim.interface.systray.handle_first_event() account, jid, event = gajim.events.get_first_event()
if not event:
return
gajim.interface.handle_event(account, jid, event.type_)
@dbus.service.method(INTERFACE, in_signature='s', out_signature='a{sv}') @dbus.service.method(INTERFACE, in_signature='s', out_signature='a{sv}')
def contact_info(self, jid): def contact_info(self, jid):