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

Coding style.

This commit is contained in:
js 2008-07-22 14:13:37 +00:00
parent 6239ae57c3
commit 229006a28e
1 changed files with 105 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
src/gajim.py
View File

@ -589,15 +589,15 @@ class Interface:
gajim.connections[account].request_vcard(jid) gajim.connections[account].request_vcard(jid)
def handle_event_notify(self, account, array): def handle_event_notify(self, account, array):
# 'NOTIFY' (account, (jid, status, status message, resource, priority, # 'NOTIFY' (account, (jid, status, status message, resource,
# keyID, timestamp, contact_nickname)) # priority, # keyID, timestamp, contact_nickname))
# #
# Contact changed show # Contact changed show
# FIXME: Drop and rewrite... # FIXME: Drop and rewrite...
statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa',
'invisible'] 'dnd', 'invisible']
# Ignore invalid show # Ignore invalid show
if array[1] not in statuss: if array[1] not in statuss:
return return
@ -622,7 +622,8 @@ class Interface:
else: else:
ji = jid ji = jid
highest = gajim.contacts.get_contact_with_highest_priority(account, jid) highest = gajim.contacts. \
get_contact_with_highest_priority(account, jid)
was_highest = (highest and highest.resource == resource) was_highest = (highest and highest.resource == resource)
# Update contact # Update contact
@ -646,30 +647,42 @@ class Interface:
contact1.contact_name = contact_nickname contact1.contact_name = contact_nickname
self.roster.draw_contact(jid, account) self.roster.draw_contact(jid, account)
if old_show == new_show and contact1.status == status_message and \ if old_show == new_show and \
contact1.status == status_message and \
contact1.priority == priority: # no change contact1.priority == priority: # no change
return return
else: else:
contact1 = gajim.contacts.get_first_contact_from_jid(account, ji) contact1 = gajim.contacts. \
get_first_contact_from_jid(account, ji)
if not contact1: if not contact1:
# Presence of another resource of our jid # Presence of another resource of our
# Create SelfContact and add to roster # jid
if resource == gajim.connections[account].server_resource: # Create self contact and add to roster
if resource == gajim.connections \
[account].server_resource:
return return
contact1 = gajim.contacts.create_contact(jid=ji, contact1 = gajim.contacts. \
name=gajim.nicks[account], groups=['self_contact'], create_contact(jid=ji,
show=array[1], status=status_message, sub='both', ask='none', name=gajim.nicks[account],
priority=priority, keyID=keyID, resource=resource) groups=['self_contact'],
show=array[1],
status=status_message,
sub='both', ask='none',
priority=priority, keyID=keyID,
resource=resource)
old_show = 0 old_show = 0
gajim.contacts.add_contact(account, contact1) gajim.contacts.add_contact(account,
contact1)
lcontact.append(contact1) lcontact.append(contact1)
elif contact1.show in statuss: elif contact1.show in statuss:
old_show = statuss.index(contact1.show) old_show = statuss.index(contact1.show)
# FIXME: What Am I? # FIXME: What am I?
if (resources != [''] and (len(lcontact) != 1 or if (resources != [''] and (len(lcontact) != 1 or
lcontact[0].show != 'offline')) and jid.find('@') > 0: lcontact[0].show != 'offline')) and \
jid.find('@') > 0:
old_show = 0 old_show = 0
contact1 = gajim.contacts.copy_contact(contact1) contact1 = gajim.contacts. \
copy_contact(contact1)
lcontact.append(contact1) lcontact.append(contact1)
contact1.resource = resource contact1.resource = resource
@ -678,20 +691,31 @@ class Interface:
if contact1.jid.find('@') > 0 and len(lcontact) == 1: if contact1.jid.find('@') > 0 and len(lcontact) == 1:
# It's not an agent # It's not an agent
if old_show == 0 and new_show > 1: if old_show == 0 and new_show > 1:
if not contact1.jid in gajim.newly_added[account]: if not contact1.jid in \
gajim.newly_added[account].append(contact1.jid) gajim.newly_added[account]:
if contact1.jid in gajim.to_be_removed[account]: gajim.newly_added[account]. \
gajim.to_be_removed[account].remove(contact1.jid) append(contact1.jid)
gobject.timeout_add_seconds(5, self.roster.remove_newly_added, if contact1.jid in \
gajim.to_be_removed[account]:
gajim.to_be_removed[account]. \
remove(contact1.jid)
gobject.timeout_add_seconds(5, self. \
roster.remove_newly_added,
contact1.jid, account) contact1.jid, account)
elif old_show > 1 and new_show == 0 and gajim.connections[account].\ elif old_show > 1 and new_show == 0 and \
connected > 1: gajim.connections[account].connected > 1:
if not contact1.jid in gajim.to_be_removed[account]: if not contact1.jid in \
gajim.to_be_removed[account].append(contact1.jid) gajim.to_be_removed[account]:
if contact1.jid in gajim.newly_added[account]: gajim.to_be_removed[account]. \
gajim.newly_added[account].remove(contact1.jid) append(contact1.jid)
self.roster.draw_contact(contact1.jid, account) if contact1.jid in \
gobject.timeout_add_seconds(5, self.roster.remove_to_be_removed, gajim.newly_added[account]:
gajim.newly_added[account]. \
remove(contact1.jid)
self.roster.draw_contact(contact1.jid,
account)
gobject.timeout_add_seconds(5, self. \
roster.remove_to_be_removed,
contact1.jid, account) contact1.jid, account)
contact1.show = array[1] contact1.show = array[1]
contact1.status = status_message contact1.status = status_message
@ -710,24 +734,33 @@ class Interface:
if ji in jid_list: if ji in jid_list:
# Update existing iter # Update existing iter
self.roster.draw_contact(ji, account) self.roster.draw_contact(ji, account)
if new_show > 1 and ji in gajim.transport_avatar[account]: if new_show > 1 and ji in \
# transport just signed in. request avatars gajim.transport_avatar[account]:
for jid_ in gajim.transport_avatar[account][ji]: # transport just signed in.
gajim.connections[account].request_vcard(jid_) # request avatars
# transport just signed in/out, don't show popup notifications for jid_ in gajim.transport_avatar \
# for 30s [account][ji]:
gajim.connections[account]. \
request_vcard(jid_)
# transport just signed in/out, don't show
# popup notifications for 30s
account_ji = account + '/' + ji account_ji = account + '/' + ji
gajim.block_signed_in_notifications[account_ji] = True gajim.block_signed_in_notifications \
gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, [account_ji] = True
gobject.timeout_add_seconds(30,
self.unblock_signed_in_notifications,
account_ji) account_ji)
locations = (self.instances, self.instances[account]) locations = (self.instances, self.instances[account])
for location in locations: for location in locations:
if location.has_key('add_contact'): if location.has_key('add_contact'):
if old_show == 0 and new_show > 1: if old_show == 0 and new_show > 1:
location['add_contact'].transport_signed_in(jid) location['add_contact']. \
transport_signed_in(jid)
break break
elif old_show > 1 and new_show == 0: elif old_show > 1 and new_show == 0:
location['add_contact'].transport_signed_out(jid) location['add_contact']. \
transport_signed_out(
jid)
break break
elif ji in jid_list: elif ji in jid_list:
# It isn't an agent # It isn't an agent
@ -736,34 +769,48 @@ class Interface:
if array[1] in ('offline', 'error'): if array[1] in ('offline', 'error'):
contact1.our_chatstate = contact1.chatstate = \ contact1.our_chatstate = contact1.chatstate = \
contact1.composing_xep = None contact1.composing_xep = None
gajim.connections[account].remove_transfers_for_contact(contact1) # TODO: This causes problems when another
self.roster.chg_contact_status(contact1, array[1], status_message, # resource signs off!
account) gajim.connections[account]. \
remove_transfers_for_contact(contact1)
self.roster.chg_contact_status(contact1, array[1],
status_message, account)
# Notifications # Notifications
if old_show < 2 and new_show > 1: if old_show < 2 and new_show > 1:
notify.notify('contact_connected', jid, account, status_message) notify.notify('contact_connected', jid,
account, status_message)
if self.remote_ctrl: if self.remote_ctrl:
self.remote_ctrl.raise_signal('ContactPresence', self.remote_ctrl.raise_signal(
'ContactPresence',
(account, array)) (account, array))
elif old_show > 1 and new_show < 2: elif old_show > 1 and new_show < 2:
notify.notify('contact_disconnected', jid, account, status_message) notify.notify('contact_disconnected', jid,
ccount, status_message)
if self.remote_ctrl: if self.remote_ctrl:
self.remote_ctrl.raise_signal('ContactAbsence', (account, array)) self.remote_ctrl.raise_signal(
'ContactAbsence',
(account, array))
# FIXME: stop non active file transfers # FIXME: stop non active file transfers
elif new_show > 1: # Status change (not connected/disconnected or error (<1)) # Status change (not connected/disconnected or
notify.notify('status_change', jid, account, [new_show, # error (<1))
status_message]) elif new_show > 1:
notify.notify('status_change', jid, account,
[new_show, status_message])
if self.remote_ctrl: if self.remote_ctrl:
self.remote_ctrl.raise_signal('ContactStatus', (account, array)) self.remote_ctrl.raise_signal(
'ContactStatus',
(account, array))
else: else:
# FIXME: Msn transport (CMSN1.2.1 and PyMSN) doesn't follow the XEP # FIXME: MSN transport (CMSN1.2.1 and PyMSN) don't
# still the case in 2008 # follow the XEP, still the case in 2008.
# It's maybe a GC_NOTIFY (specialy for MSN gc) # It's maybe a GC_NOTIFY (specialy for MSN gc)
self.handle_event_gc_notify(account, (jid, array[1], status_message, self.handle_event_gc_notify(account, (jid, array[1],
array[3], None, None, None, None, None, [], None, None)) status_message, array[3], None, None, None,
None, None, [], None, None))
highest = gajim.contacts.get_contact_with_highest_priority(account, jid) highest = gajim.contacts.get_contact_with_highest_priority(
account, jid)
is_highest = (highest and highest.resource == resource) is_highest = (highest and highest.resource == resource)
if was_highest and not is_highest: if was_highest and not is_highest: