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

save events when no visual plugin (like gtkgui) is registered and restore them when such a plugin resiters

This commit is contained in:
Yann Leboulanger 2004-08-01 23:49:21 +00:00
parent 6ad688ec62
commit e4ef4f4396
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/hub.py
View File

@ -29,6 +29,9 @@ class GajimHub:
# {event1:[queue1, queue2]} # {event1:[queue1, queue2]}
self.events = {} self.events = {}
self.queueIn = self.newQueue('in', 100) self.queueIn = self.newQueue('in', 100)
self.saveQueue = Queue.Queue(100)
self.events_to_store = ['WARNING', 'MSG', 'MSGERROR', 'SUBSCRIBED', 'UNSUBSCRIBED', 'SUBSCRIBE']
self.queue_to_send = None
# END __init__ # END __init__
def newQueue(self, name, size): def newQueue(self, name, size):
@ -52,7 +55,11 @@ class GajimHub:
if not self.queues.has_key(name): if not self.queues.has_key(name):
return return
qu = self.queues[name] qu = self.queues[name]
if self.events.has_key(event) : if event == 'VISUAL' and not self.saveQueue.empty():
# we save the queue in whitch we must send saved events
# after the roster is sent
self.queue_to_send = qu
if self.events.has_key(event):
if not qu in self.events[event]: if not qu in self.events[event]:
self.events[event].append(qu) self.events[event].append(qu)
else : else :
@ -82,8 +89,17 @@ class GajimHub:
def sendPlugin(self, event, con, data, qu=None): def sendPlugin(self, event, con, data, qu=None):
""" Sends an event to registered plugins""" """ Sends an event to registered plugins"""
if self.events.has_key(event): if self.events.has_key(event):
if event in self.events_to_store and len(self.events['VISUAL']) == 0:
# Save event if no visual plugin is registered
self.saveQueue.put((event, con, data))
for queue in self.events[event]: for queue in self.events[event]:
if qu == None or qu == queue: if qu == None or qu == queue:
queue.put((event, con, data)) queue.put((event, con, data))
if event == 'ROSTER' and self.queue_to_send in self.events[event]:
# send saved events
while not self.saveQueue.empty():
ev = self.saveQueue.get()
self.queue_to_send.put(ev)
self.queue_to_send = None
# END sendPlugin # END sendPlugin
# END GajimHub # END GajimHub

2
plugins/gtkgui/gtkgui.py
View File

@ -1817,7 +1817,7 @@ class plugin:
self.send('REG_MESSAGE', 'gtkgui', ['ROSTER', 'WARNING', 'STATUS', \ self.send('REG_MESSAGE', 'gtkgui', ['ROSTER', 'WARNING', 'STATUS', \
'NOTIFY', 'MSG', 'MSGERROR', 'SUBSCRIBED', 'UNSUBSCRIBED', \ 'NOTIFY', 'MSG', 'MSGERROR', 'SUBSCRIBED', 'UNSUBSCRIBED', \
'SUBSCRIBE', 'AGENTS', 'AGENT_INFO', 'QUIT', 'ACC_OK', 'CONFIG', \ 'SUBSCRIBE', 'AGENTS', 'AGENT_INFO', 'QUIT', 'ACC_OK', 'CONFIG', \
'MYVCARD', 'VCARD', 'LOG_NB_LINE', 'LOG_LINE']) 'MYVCARD', 'VCARD', 'LOG_NB_LINE', 'LOG_LINE', 'VISUAL'])
self.send('ASK_CONFIG', None, ('GtkGui', 'GtkGui', {'autopopup':1,\ self.send('ASK_CONFIG', None, ('GtkGui', 'GtkGui', {'autopopup':1,\
'autopopupaway':1,\ 'autopopupaway':1,\
'showoffline':0,\ 'showoffline':0,\