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

use much better varname and comment the heck out of it

This commit is contained in:
Nikos Kouremenos 2006-03-27 23:32:39 +00:00
parent 04b0485c89
commit 6caf013f52
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/gajim.py
View File

@ -107,7 +107,10 @@ awaiting_events = {} # list of messages/FT reveived but not printed
# file-completed, file-stopped: # file-completed, file-stopped:
# data = file_props # data = file_props
nicks = {} # list of our nick names in each account nicks = {} # list of our nick names in each account
allow_notifications = {} # do we allow notifications for each account ? # should we block 'contact signed in' notifications for this account?
# this is only only for the first 30 seconds after we change our show to sth
# else than offline
block_signed_in_notifications = {}
con_types = {} # type of each connection (ssl, tls, tcp, ...) con_types = {} # type of each connection (ssl, tls, tcp, ...)
sleeper_state = {} # whether we pass auto away / xa or not sleeper_state = {} # whether we pass auto away / xa or not

4
src/common/helpers.py
View File

@ -719,8 +719,8 @@ def sanitize_filename(filename):
return filename return filename
def allow_showing_notification(account): def allow_showing_notification(account):
'''is it allowed to show nofication?''' '''is it allowed to show nofication?
# check OUR status and if we allow notifications for that status check OUR status and if we allow notifications for that status'''
if gajim.config.get('autopopupaway'): # always show notification if gajim.config.get('autopopupaway'): # always show notification
return True return True
if gajim.connections[account].connected in (2, 3): # we're online or chat if gajim.connections[account].connected in (2, 3): # we're online or chat

19
src/gajim.py
View File

@ -259,8 +259,8 @@ class Interface:
gajim.con_types[account] = con_type gajim.con_types[account] = con_type
self.roster.draw_account(account) self.roster.draw_account(account)
def allow_notif(self, account): def unblock_signed_in_notifications(self, account):
gajim.allow_notifications[account] = True gajim.block_signed_in_notifications[account] = False
def handle_event_status(self, account, status): # OUR status def handle_event_status(self, account, status): # OUR status
#('STATUS', account, status) #('STATUS', account, status)
@ -268,10 +268,13 @@ class Interface:
if status == 'offline': if status == 'offline':
# sensitivity for this menuitem # sensitivity for this menuitem
model[self.roster.status_message_menuitem_iter][3] = False model[self.roster.status_message_menuitem_iter][3] = False
gajim.allow_notifications[account] = False gajim.block_signed_in_notifications[account] = True
else: else:
gobject.timeout_add(30000, self.allow_notif, account) # 30 seconds after we change our status to sth else than offline
# we stop blocking notifications of any kind
# this prevents from getting the roster items as 'just signed in'
# contacts. 30 seconds should be enough time
gobject.timeout_add(30000, self.unblock_signed_in_notifications, account)
# sensitivity for this menuitem # sensitivity for this menuitem
model[self.roster.status_message_menuitem_iter][3] = True model[self.roster.status_message_menuitem_iter][3] = True
@ -390,11 +393,11 @@ class Interface:
# play sound # play sound
if old_show < 2 and new_show > 1: if old_show < 2 and new_show > 1:
if gajim.config.get_per('soundevents', 'contact_connected', if gajim.config.get_per('soundevents', 'contact_connected',
'enabled') and gajim.allow_notifications[account]: 'enabled') and not gajim.block_signed_in_notifications[account]:
helpers.play_sound('contact_connected') helpers.play_sound('contact_connected')
if not gajim.awaiting_events[account].has_key(jid) and \ if not gajim.awaiting_events[account].has_key(jid) and \
gajim.config.get('notify_on_signin') and \ gajim.config.get('notify_on_signin') and \
gajim.allow_notifications[account]: not gajim.block_signed_in_notifications[account]:
if helpers.allow_showing_notification(account): if helpers.allow_showing_notification(account):
transport_name = gajim.get_transport_name_from_jid(jid) transport_name = gajim.get_transport_name_from_jid(jid)
img = None img = None
@ -1655,7 +1658,7 @@ class Interface:
gajim.to_be_removed[a] = [] gajim.to_be_removed[a] = []
gajim.awaiting_events[a] = {} gajim.awaiting_events[a] = {}
gajim.nicks[a] = gajim.config.get_per('accounts', a, 'name') gajim.nicks[a] = gajim.config.get_per('accounts', a, 'name')
gajim.allow_notifications[a] = False gajim.block_signed_in_notifications[a] = True
gajim.sleeper_state[a] = 0 gajim.sleeper_state[a] = 0
gajim.encrypted_chats[a] = [] gajim.encrypted_chats[a] = []
gajim.last_message_time[a] = {} gajim.last_message_time[a] = {}