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

roster.on_quit_request() cleanups : 

-Check if there are pending events and send offline even if we don't ask a status message (was a indentation
mistake I think)
- Really make unread and recent working according to 'notify_on_all_muc_messages' value
- be faster, hopefully
This commit is contained in:
Jean-Marie Traissard 2008-03-20 20:26:58 +00:00
parent 9e15e4bcab
commit ff32d0ccb3
2 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat_control.py
View File

@ -663,7 +663,13 @@ class ChatControlBase(MessageControl):
if not count_as_new: if not count_as_new:
return return
if kind == 'incoming': if kind == 'incoming':
gajim.last_message_time[self.account][full_jid] = time.time() if not self.type_id == message_control.TYPE_GC or \
gajim.config.get('notify_on_all_muc_messages') or \
'marked' in other_tags_for_text:
# it's a normal message, or a muc message with want to be
# notified about if quitting just after
# other_tags_for_text == ['marked'] --> highlighted gc message
gajim.last_message_time[self.account][full_jid] = time.time()
if kind in ('incoming', 'incoming_queue'): if kind in ('incoming', 'incoming_queue'):
gc_message = False gc_message = False

67
src/roster_window.py
View File

@ -4245,45 +4245,38 @@ class RosterWindow:
if message is None: if message is None:
# user pressed Cancel to change status message dialog # user pressed Cancel to change status message dialog
return return
# check if we have unread or recent mesages
unread = False
recent = False
if gajim.events.get_nb_events() > 0:
unread = True
for win in gajim.interface.msg_win_mgr.windows():
unrd = 0
for ctrl in win.controls():
if ctrl.type_id == message_control.TYPE_GC:
if gajim.config.get('notify_on_all_muc_messages'):
unrd += ctrl.get_nb_unread()
else:
if ctrl.attention_flag:
unrd += 1
if unrd:
unread = True
break
for ctrl in win.controls(): # check if we have unread messages
fjid = ctrl.get_full_jid() unread = gajim.events.get_nb_events()
if gajim.last_message_time[ctrl.account].has_key(fjid): if not gajim.config.get('notify_on_all_muc_messages'):
if time.time() - gajim.last_message_time[ctrl.account][fjid]\ unread_not_to_notify = gajim.events.get_nb_events(['printed_gc_msg'])
< 2: unread -= unread_not_to_notify
recent = True
break # check if we have recent messages
if unread or recent: recent = False
dialog = dialogs.ConfirmationDialog(_('You have unread messages'), for win in gajim.interface.msg_win_mgr.windows():
_('Messages will only be available for reading them later if you' for ctrl in win.controls():
' have history enabled and contact is in your roster.')) fjid = ctrl.get_full_jid()
if dialog.get_response() != gtk.RESPONSE_OK: if gajim.last_message_time[ctrl.account].has_key(fjid):
return if time.time() - gajim.last_message_time[ctrl.account][fjid] < 2:
recent = True
break
if recent:
break
if unread or recent:
dialog = dialogs.ConfirmationDialog(_('You have unread messages'),
_('Messages will only be available for reading them later if you'
' have history enabled and contact is in your roster.'))
if dialog.get_response() != gtk.RESPONSE_OK:
return
self.quit_on_next_offline = 0
for acct in accounts:
if gajim.connections[acct].connected:
self.quit_on_next_offline += 1
self.send_status(acct, 'offline', message)
self.quit_on_next_offline = 0
for acct in accounts:
if gajim.connections[acct].connected:
self.quit_on_next_offline += 1
self.send_status(acct, 'offline', message)
else:
self.quit_on_next_offline = 0
if not self.quit_on_next_offline: if not self.quit_on_next_offline:
self.quit_gtkgui_interface() self.quit_gtkgui_interface()