changeset 25c13cc61f07 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=25c13cc61f07
description: raise event through ged before generating child events
diffstat:
src/common/nec.py | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diffs (44 lines):
diff -r 2c0a0c1658b2 -r 25c13cc61f07 src/common/nec.py
--- a/src/common/nec.py Fri Aug 27 11:47:38 2010 +0200
+++ b/src/common/nec.py Fri Aug 27 22:45:16 2010 +0200
@@ -58,8 +58,8 @@
def push_incoming_event(self, event_object):
if event_object.generate():
- if self._generate_events_based_on_incoming_event(event_object):
- gajim.ged.raise_event(event_object.name, event_object)
+ gajim.ged.raise_event(event_object.name, event_object)
+ self._generate_events_based_on_incoming_event(event_object)
def push_outgoing_event(self, event_object):
pass
@@ -78,9 +78,8 @@
for new_event_class in
self.incoming_events_generators[base_event_name]:
new_event_object = new_event_class(None,
base_event=event_object)
if new_event_object.generate():
- if
self._generate_events_based_on_incoming_event(new_event_object):
- gajim.ged.raise_event(new_event_object.name,
new_event_object)
- return True
+ gajim.ged.raise_event(new_event_object.name,
new_event_object)
+
self._generate_events_based_on_incoming_event(new_event_object)
class NetworkEvent(object):
name = ''
@@ -96,7 +95,7 @@
def init(self):
pass
-
+
def generate(self):
'''
Generates new event (sets it's attributes) based on event object.
@@ -122,7 +121,7 @@
def __repr__(self):
return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__))
-
+
class NetworkIncomingEvent(NetworkEvent):
base_network_events = []
'''
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
