From bb7580e9fb5f2e6be29db46f4636fd3995a89ccf Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 20 Sep 2007 16:19:34 +0000 Subject: [PATCH] fix get_events when no jid is given but types are given --- src/common/events.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/common/events.py b/src/common/events.py index cf570982f..db765321a 100644 --- a/src/common/events.py +++ b/src/common/events.py @@ -164,11 +164,18 @@ class Events: optionnaly only from given type''' if not self._events.has_key(account): return [] + events_list = [] # list of events if not jid: - return self._events[account] + for jid_ in self._events[account]: + events = [] + for ev in self._events[account][jid_]: + if not types or ev.type_ in types: + events.append(ev) + if events: + events_list[jid_] = events + return events_list if not self._events[account].has_key(jid): return [] - events_list = [] # list of events for ev in self._events[account][jid]: if not types or ev.type_ in types: events_list.append(ev)