Commits April 2008

commits@gajim.org

4 participants
121 discussions

[commit-gajim] r9538 - trunk/src/common
by asterix＠gajim.org 27 Apr '08

27 Apr '08

Author: asterix Date: 2008-04-27 20:11:34 +0200 (Sun, 27 Apr 2008) New Revision: 9538 Modified: trunk/src/common/helpers.py Log: don't depend on python2.5 Fixes #3888 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-04-26 23:36:03 UTC (rev 9537) +++ trunk/src/common/helpers.py 2008-04-27 18:11:34 UTC (rev 9538) @@ -30,7 +30,6 @@ import errno import select import sha -import hashlib import base64 import sys from encodings.punycode import punycode_encode @@ -42,6 +41,18 @@ from xmpp_stringprep import nodeprep, resourceprep, nameprep import xmpp +try: + # Python 2.5 + import hashlib + hash_md5 = hashlib.md5 + hash_sha1 = hashlib.sha1 +except: + # Python 2.4 + import md5 + import sha + hash_md5 = md5.new + hash_sha1 = sha.new + if sys.platform == 'darwin': from osx import nsapp @@ -1256,9 +1267,9 @@ for f in features: S += '%s<' % f if hash_method == 'sha-1': - hash = hashlib.sha1(S) + hash = hash_sha1(S) elif hash_method == 'md5': - hash = hashlib.md5(S) + hash = hash_md5(S) else: return '' return base64.b64encode(hash.digest())

1 0

[commit-gajim] r9537 - trunk/src
by asterix＠gajim.org 26 Apr '08

26 Apr '08

Author: asterix Date: 2008-04-27 01:36:03 +0200 (Sun, 27 Apr 2008) New Revision: 9537 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: fix arguments of on_open_chat_window functions. It is called from callbacks, so first argument is widget. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-04-26 10:18:33 UTC (rev 9536) +++ trunk/src/gajim.py 2008-04-26 23:36:03 UTC (rev 9537) @@ -2775,7 +2775,7 @@ mc = mw.get_control(fjid, account) mc.user_nick = gajim.nicks[account] - def on_open_chat_window(self, contact, account, resource = None, + def on_open_chat_window(self, widget, contact, account, resource = None, session = None): # Get the window containing the chat fjid = contact.jid Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-04-26 10:18:33 UTC (rev 9536) +++ trunk/src/roster_window.py 2008-04-26 23:36:03 UTC (rev 9537) @@ -3347,7 +3347,7 @@ gajim.contacts.get_contact_with_highest_priority(account, jid) if jid == gajim.get_jid_from_account(account): resource = contact.resource - gajim.interface.on_open_chat_window(contact, account, \ + gajim.interface.on_open_chat_window(None, contact, account, \ resource = resource, session = session) def on_roster_treeview_row_activated(self, widget, path, col = 0):

1 0

[commit-gajim] r9536 - trunk/src
by steve-e＠gajim.org 26 Apr '08

26 Apr '08

Author: steve-e Date: 2008-04-26 12:18:33 +0200 (Sat, 26 Apr 2008) New Revision: 9536 Modified: trunk/src/roster_window.py Log: Fixing a few modelfilter bugs. * Show all groups in merged accounts view that have online contacts. Fixes #3890 * Allow metacontacts over several accounts. Fixes #3889 * Fix on_drop_in_group when two accounts in merged view have the same contact * Fix potential traceback when receiving a message Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-04-26 02:06:08 UTC (rev 9535) +++ trunk/src/roster_window.py 2008-04-26 10:18:33 UTC (rev 9536) @@ -298,7 +298,8 @@ print "" - def _add_entity(self, contact, account, groups = None, big_brother_contact = None): + def _add_entity(self, contact, account, groups = None, big_brother_contact = None, + big_brother_account = None): '''Add the given contact to roster data model. Contact is added regardless if he is already in roster or not. @@ -316,7 +317,7 @@ # Add contact under big brother parent_iters = self._get_contact_iter(big_brother_contact.jid, - account, self.model) + big_brother_account, self.model) assert len(parent_iters) > 0,\ "Big brother is not yet in roster!" @@ -356,6 +357,11 @@ i_ = self.model.append(child_iterG, (None, contact.get_shown_name(), typestr, contact.jid, account, None, None)) added_iters.append(i_) + + # Restore the group expand state + if group not in gajim.groups[account]: + # FIXME: care about expand/collapse state + gajim.groups[account][group] = {'expand': True} assert len(added_iters), "%s has not been added to roster!" % contact.jid return added_iters @@ -406,7 +412,7 @@ return True - def _add_metacontact_family(self, family): + def _add_metacontact_family(self, family, account): '''Add the give Metacontact family to roster data model. Add Big Brother to his groups and all others under him. @@ -416,17 +422,27 @@ Keyword arguments: family -- the family, see Contacts.get_metacontacts_family() ''' - big_brother_data = gajim.contacts.get_metacontacts_big_brother(family) + + if self.regroup: + # group all together + nearby_family = family + else: + # we want one nearby_family per account + nearby_family = [data for data in family + if account == data['account']] + + big_brother_data = gajim.contacts.get_metacontacts_big_brother(nearby_family) big_brother_jid = big_brother_data['jid'] big_brother_account = big_brother_data['account'] big_brother_contact = gajim.contacts.get_first_contact_from_jid(big_brother_account, big_brother_jid) assert len(self._get_contact_iter(big_brother_jid, big_brother_account, self.model)) == 0,\ - "Big brother %s already in roster" % big_brother_jid + "Big brother %s already in roster \n Family: %s" % (big_brother_jid, family) self._add_entity(big_brother_contact, big_brother_account) brothers = [] - for data in family: + # Filter family members + for data in nearby_family: if data == big_brother_data: continue # already added @@ -437,35 +453,47 @@ if not _contact: # Corresponding account is not connected continue - + assert len(self._get_contact_iter(_jid, _account, self.model)) == 0,\ - "%s already in roster" % _jid - self._add_entity(_contact, _account, big_brother_contact = big_brother_contact) + "%s already in roster. \n Family: " % (_jid, nearby_family) + self._add_entity(_contact, _account, big_brother_contact = big_brother_contact, + big_brother_account = big_brother_account) brothers.append((_contact, _account)) brothers.insert(0, (big_brother_contact, big_brother_account)) return brothers - def _remove_metacontact_family(self, family): + def _remove_metacontact_family(self, family, account): '''Remove the give Metacontact family from roster data model. See Contacts.get_metacontacts_family() and RosterWindow._remove_entity() ''' + if self.regroup: + # remove all + nearby_family = family + else: + # remove nearby_family per account + nearby_family = [data for data in family + if account == data['account']] + # Family might has changed (actual big brother not on top). - # Remove in correct order: Childs first - for data in family: + # Remove childs first then big brother + family_in_roster = False + for data in nearby_family: _account = data['account'] _jid = data['jid'] _contact = gajim.contacts.get_first_contact_from_jid(_account, _jid) - if not _contact: - # Corresponding account is not online + iters = self._get_contact_iter(_jid, _account, self.model) + if not iters or not _contact: + # Family might not be up to date. + # Only try to remove what is actually in the roster continue - - iters = self._get_contact_iter(_jid, _account, self.model) - assert iters, "%s shall be removed but is not in roster" % _jid + assert iters, "%s shall be removed but is not in roster \n Family: %s" % (_jid, family) + family_in_roster = True + parent_iter = self.model.iter_parent(iters[0]) parent_type = self.model[parent_iter][C_TYPE] @@ -480,7 +508,10 @@ assert ok, "%s was not removed" % _jid assert len(self._get_contact_iter(_jid, _account, self.model)) == 0,\ "%s is removed but still in roster" % _jid - + + if not family_in_roster: + return False + iters = self._get_contact_iter(old_big_jid, old_big_account, self.model) assert len(iters) > 0, "Old Big Brother %s is not in roster anymore" % old_big_jid assert not self.model.iter_children(iters[0]),\ @@ -558,14 +589,17 @@ contacts = [] if family: # We have a family. So we are a metacontact. - # Add our whole family - contacts = self._add_metacontact_family(family) + # Add all family members that we shall be grouped with + if self.regroup: + # remove existing family members to regroup them + self._remove_metacontact_family(family, account) + contacts = self._add_metacontact_family(family, account) else: # We are a normal contact contacts = [(contact, account),] self._add_entity(contact, account) - # Draw all groups of the contact + # Draw the contact and its groups contact if contact.is_transport(): contact.groups = [_('Transports')] if is_observer: @@ -573,24 +607,14 @@ groups = contact.groups if not groups: groups = [_('General')] - for group in groups: - # Restore the group expand state - if group not in gajim.groups[account]: - #if account + group in self.collapsed_rows: - #ishidden = False - #else: - ishidden = True - gajim.groups[account][group] = {'expand': ishidden} - - if not self.starting: - self.draw_group(group, account) - if not self.starting: for c, acc in contacts: self.draw_contact(c.jid, acc) self.draw_avatar(c.jid, acc) + for group in groups: + self.draw_group(group, account) self.draw_account(account) - + return contacts[0][0] # it's contact/big brother with highest priority @@ -617,7 +641,7 @@ family = gajim.contacts.get_metacontacts_family(account, jid) if family: # We have a family. So we are a metacontact. - self._remove_metacontact_family(family) + self._remove_metacontact_family(family, account) else: self._remove_entity(contact, account) @@ -730,7 +754,7 @@ for contact in gajim.contacts.get_contacts(account, jid): for group in groups: if group not in contact.groups: - # statement needed for drap from meta to group + # we might be dropped from meta to group contact.groups.append(group) gajim.connections[account].update_contact(jid, contact.name, contact.groups) @@ -961,7 +985,16 @@ brothers = [] family = gajim.contacts.get_metacontacts_family(account, jid) if family: # Are we a metacontact (have a familiy) - big_brother_data = gajim.contacts.get_metacontacts_big_brother(family) + + if self.regroup: + # group all together + nearby_family = family + else: + # we want one nearby_family per account + nearby_family = [data for data in family + if account == data['account']] + + big_brother_data = gajim.contacts.get_metacontacts_big_brother(nearby_family) big_brother_jid = big_brother_data['jid'] big_brother_account = big_brother_data['account'] @@ -975,8 +1008,8 @@ else: # We are the new big brother but haven't been before # Remove us and all our brothers and then re-add us so that - self._remove_metacontact_family(family) - brothers = self._add_metacontact_family(family) + self._remove_metacontact_family(family, account) + brothers = self._add_metacontact_family(family, account) big_brother_c, big_brother_acc = brothers[0] brothers = brothers[1:] self.draw_avatar(big_brother_c.jid, big_brother_acc) @@ -1177,11 +1210,22 @@ if not type_: return False if type_ == 'account': + # Always show account return True + account = model[iter][C_ACCOUNT] if not account: return False + account = account.decode('utf-8') + if self.regroup: + # C_ACCOUNT for groups depends on the order + # accounts were connected + # Check all accounts for online group contacts + accounts = gajim.contacts.get_accounts() + else: + accounts = [account] + jid = model[iter][C_JID] if not jid: return False @@ -1191,12 +1235,13 @@ group = jid if group == _('Transports'): return gajim.config.get('show_transports_group') - for contact in gajim.contacts.iter_contacts(account): - # Is this contact in this group ? - if group in contact.groups or (group == _('General') and not \ - contact.groups): - if self.contact_is_visible(contact, account): - return True + for _acc in accounts: + for contact in gajim.contacts.iter_contacts(_acc): + # Is this contact in this group ? + if group in contact.groups or (group == _('General') and not \ + contact.groups): + if self.contact_is_visible(contact, _acc): + return True return False if type_ == 'contact': contact = gajim.contacts.get_first_contact_from_jid(account, jid) @@ -1903,6 +1948,7 @@ # If visible, try to get first line of contact in roster + path = None iters = self._get_contact_iter(jid, account) if iters: path = self.modelfilter.get_path(iters[0]) @@ -3526,11 +3572,12 @@ else: gajim.config.set('confirm_metacontacts', 'yes') - # We might have dropped on a metacontact. Readd it. + # We might have dropped on a metacontact. + # Remove it and readd later with updated family info dest_family = gajim.contacts.get_metacontacts_family(account_dest, c_dest.jid) if dest_family: - self._remove_metacontact_family(dest_family) + self._remove_metacontact_family(dest_family, account_dest) else: self._remove_entity(c_dest, account_dest) @@ -3541,18 +3588,25 @@ # Remove old source contact(s) if was_big_brother: # We have got little brothers. Readd them all - self._remove_metacontact_family(old_family) + self._remove_metacontact_family(old_family, account_source) else: # We are only a litle brother. Simply remove us from our big brother - self._remove_entity(c_source, account_source) + if self._get_contact_iter(c_source.jid, account_source): + # When we have been in the group before. + # Do not try to remove us again + self._remove_entity(c_source, account_source) - own_data = {} - own_data['jid'] = c_source.jid - own_data['account'] = account_source - old_family.append(own_data) + own_data = {} + own_data['jid'] = c_source.jid + own_data['account'] = account_source + # Don't touch the rest of the family + old_family = [own_data] # Apply new tag and update contact for data in old_family: + if account_source != data['account'] and not self.regroup: + continue + _account = data['account'] _jid = data['jid'] _contact = gajim.contacts.get_first_contact_from_jid(_account, _jid) @@ -3566,7 +3620,7 @@ # Re-add all and update GUI new_family = gajim.contacts.get_metacontacts_family(account_source, c_source.jid) - brothers = self._add_metacontact_family(new_family) + brothers = self._add_metacontact_family(new_family, account_source) for c, acc in brothers: self.draw_contact(c.jid, acc) @@ -3608,18 +3662,21 @@ # Little brother # Remove whole family. Remove us from the family. # Then re-add other family members. - self._remove_metacontact_family(family) + self._remove_metacontact_family(family, account) gajim.contacts.remove_metacontact(account, c_source.jid) for data in family: - if data['jid'] == c_source.jid: + if account != data['account'] and not self.regroup: continue + if data['jid'] == c_source.jid and\ + data['account'] == account: + continue self.add_contact(data['jid'], data['account']) break; self.add_contact_to_groups(c_source.jid, account, [grp_dest,]) else: - # Simple contact + # Normal contact self.remove_contact_from_groups(c_source.jid, account, [grp_source,]) self.add_contact_to_groups(c_source.jid, account, [grp_dest,]) @@ -5656,8 +5713,8 @@ self.tree = self.xml.get_widget('roster_treeview') sel = self.tree.get_selection() sel.set_mode(gtk.SELECTION_MULTIPLE) - sel.connect('changed', - self.on_treeview_selection_changed) + #sel.connect('changed', + # self.on_treeview_selection_changed) self._last_selected_contact = [] # holds a list of (jid, account) tupples self.transports_state_images = {'16': {}, '32': {}, 'opened': {},

1 0

[commit-gajim] r9535 - branches/session_centric/src
by bct＠gajim.org 26 Apr '08

26 Apr '08

Author: bct Date: 2008-04-26 04:06:08 +0200 (Sat, 26 Apr 2008) New Revision: 9535 Modified: branches/session_centric/src/tictactoe.py Log: tictactoe: notify user of when won/lost Modified: branches/session_centric/src/tictactoe.py =================================================================== --- branches/session_centric/src/tictactoe.py 2008-04-26 01:52:03 UTC (rev 9534) +++ branches/session_centric/src/tictactoe.py 2008-04-26 02:06:08 UTC (rev 9535) @@ -15,12 +15,15 @@ pass class TicTacToeSession(stanza_session.StanzaSession): + # initiate a session def begin(self, rows = 3, cols = 3, role_s = 'x'): self.rows = rows self.cols = cols self.role_s = role_s + self.strike = 3 + if self.role_s == 'x': self.role_o = 'o' else: @@ -68,6 +71,7 @@ else: self.cols = 3 + # number in a row needed to win if form.getField('strike'): self.strike = int(form.getField('strike').getValues()[0]) else: @@ -104,10 +108,6 @@ self.our_turn() - def is_my_turn(self): - # XXX not great semantics - return self.received == self.ignore - # just sent an invitation, expecting a reply def wait_for_invite_response(self, msg): if msg.getTag('join', namespace=games_ns): @@ -119,12 +119,22 @@ self.their_turn() elif msg.getTag('decline', namespace=games_ns): - self.XXX() + # XXX notify the user + # XXX end session + pass + # silently ignores any received messages def ignore(self, msg): pass + def game_over(self, msg): + invite = msg.getTag('invite', namespace=games_ns) + + # ignore messages unless they're renewing the game + if invite and invite.getAttr('type') == 'renew': + self.invited(msg) + def wait_for_move(self, msg): turn = msg.getTag('turn', namespace=games_ns) move = turn.getTag('move', namespace='http://jabber.org/protocol/games/tictactoe') @@ -135,12 +145,15 @@ if id != self.next_move_id: print 'unexpected move id, lost a move somewhere?' - raise + return try: self.board.mark(row, col, self.role_o) except InvalidMove, e: - print 'received invalid move' + # received an invalid move, end the game. + + # XXX notify the user + self.terminate('cheating') return # check win conditions @@ -153,14 +166,18 @@ self.our_turn() + def is_my_turn(self): + # XXX not great semantics + return self.received == self.ignore + def our_turn(self): # ignore messages until we've made our move self.received = self.ignore - self.board.win.set_title(self.board.title + ': your turn') + self.board.set_title('your turn') def their_turn(self): self.received = self.wait_for_move - self.board.win.set_title(self.board.title + ': their turn') + self.board.set_title('their turn') # called when the board receives input def move(self, row, col): @@ -173,7 +190,7 @@ self.send_move(row, col) # check win conditions - if self.board.check_for_strike(self.role_s, row, col,self.strike): + if self.board.check_for_strike(self.role_s, row, col, self.strike): self.won() elif self.board.full(): self.drawn() @@ -182,6 +199,7 @@ self.their_turn() + # sends a move message def send_move(self, row, column): msg = xmpp.Message() msg.setType('chat') @@ -198,13 +216,50 @@ self.send(msg) + # sends a termination message and ends the game + def terminate(self, reason): + msg = xmpp.Message() + + terminate = msg.NT.terminate + terminate.setNamespace(games_ns) + terminate.setAttr('reason', reason) + + self.send(msg) + + self.received = self.game_over + + def won(self): + self.terminate('won') + self.board.won() + + def lost(self): + self.terminate('lost') + self.board.lost() + + def drawn(self): + self.terminate('draw') + self.board.drawn() + class TicTacToeBoard: + def __init__(self, session, rows, cols): + self.session = session + + self.state = 'None' + + self.rows = rows + self.cols = cols + + self.board = [ [None] * self.cols for r in xrange(self.rows) ] + + self.setup_window() + def check_for_strike(self, p, r, c, strike): - # up and down, left and right + # number in a row: up and down, left and right tallyI = 0 tally_ = 0 - # right triangles: L\ , F/ + # number in a row: diagonal + # (imagine L or F as two sides of a right triangle: L\ or F/) tallyL = 0 tallyF = 0 @@ -241,16 +296,6 @@ return False - def __init__(self, session, rows, cols): - self.session = session - - self.rows = rows - self.cols = cols - - self.board = [ [None] * self.cols for r in xrange(self.rows) ] - - self.setup_window() - # is the board full? def full(self): for r in xrange(self.rows): @@ -263,9 +308,9 @@ def setup_window(self): self.win = gtk.Window() - self.title = 'tic-tac-toe with %s' % self.session.jid + self.title_prefix = 'tic-tac-toe with %s' % self.session.jid + self.set_title() - self.win.set_title(self.title) self.win.set_app_paintable(True) self.win.add_events(gdk.BUTTON_PRESS_MASK) @@ -313,6 +358,8 @@ elif self.board[i][j] == 'o': self.draw_o(cr, i, j, row_height, col_width) + # XXX draw 'won', 'lost', 'draw' + def draw_x(self, cr, row, col, row_height, col_width): cr.set_source_rgb(0, 0, 0) @@ -351,3 +398,26 @@ self.board[row-1][column-1] = player self.win.queue_draw() + + def set_title(self, suffix = None): + str = self.title_prefix + + if suffix: + str += ': ' + suffix + + self.win.set_title(str) + + def won(self): + self.state = 'won' + self.set_title('you won!') + self.win.queue_draw() + + def lost(self): + self.state = 'lost' + self.set_title('you lost.') + self.win.queue_draw() + + def drawn(self): + self.state = 'drawn' + self.win.set_title(self.title_prefix + ': a draw.') + self.win.queue_draw()

1 0

[commit-gajim] r9534 - branches/session_centric/src/common
by bct＠gajim.org 26 Apr '08

26 Apr '08

Author: bct Date: 2008-04-26 03:52:03 +0200 (Sat, 26 Apr 2008) New Revision: 9534 Modified: branches/session_centric/src/common/stanza_session.py Log: fixed e2ee traceback Modified: branches/session_centric/src/common/stanza_session.py =================================================================== --- branches/session_centric/src/common/stanza_session.py 2008-04-24 13:47:37 UTC (rev 9533) +++ branches/session_centric/src/common/stanza_session.py 2008-04-26 01:52:03 UTC (rev 9534) @@ -83,7 +83,7 @@ def cancelled_negotiation(self): '''A negotiation has been cancelled, so reset this session to its default state.''' - if hasattr(self, 'control'): + if self.control: self.control.on_cancel_session_negotiation() self.status = None @@ -778,7 +778,7 @@ self.status = 'active' self.enable_encryption = True - if hasattr(self, 'control'): + if self.control: self.control.print_esession_details() def final_steps_alice(self, form): @@ -798,15 +798,14 @@ self.do_retained_secret(k, srs) - # don't need to calculate ks_s here - + # ks_s doesn't need to be calculated here self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(k) self.kc_o, self.km_o, self.ks_o = self.generate_responder_keys(k) # 4.6.2 Verifying Bob's Identity self.verify_identity(form, self.d, False, 'b') -# Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza. + # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza. if self.negotiated['logging'] == 'mustnot': self.loggable = False @@ -814,7 +813,7 @@ self.status = 'active' self.enable_encryption = True - if hasattr(self, 'control'): + if self.control: self.control.print_esession_details() # calculate and store the new retained secret

1 0

[commit-gajim] r9533 - trunk/src
by asterix＠gajim.org 24 Apr '08

24 Apr '08

Author: asterix Date: 2008-04-24 15:47:37 +0200 (Thu, 24 Apr 2008) New Revision: 9533 Modified: trunk/src/gajim.py Log: [elghinn] codding standards Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-04-24 13:44:09 UTC (rev 9532) +++ trunk/src/gajim.py 2008-04-24 13:47:37 UTC (rev 9533) @@ -2326,8 +2326,7 @@ if no_queue: # We didn't have a queue: we change icons if not gajim.contacts.get_contact_with_highest_priority(account, jid): if type_ == 'gc-invitation': - self.roster.add_groupchat(jid, account, - status = 'offline') + self.roster.add_groupchat(jid, account, status='offline') else: # add contact to roster ("Not In The Roster") if he is not self.roster.add_to_not_in_the_roster(account, jid)

1 0

[commit-gajim] r9532 - trunk/src/common
by asterix＠gajim.org 24 Apr '08

24 Apr '08

Author: asterix Date: 2008-04-24 15:44:09 +0200 (Thu, 24 Apr 2008) New Revision: 9532 Modified: trunk/src/common/caps.py Log: category is mendatory Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-04-24 07:52:11 UTC (rev 9531) +++ trunk/src/common/caps.py 2008-04-24 13:44:09 UTC (rev 9532) @@ -135,7 +135,7 @@ ciself._identities = [] for identity in value: # dict are not hashable, so transform it into a tuple - t = (identity.get('category'), identity.get('type'), identity.get('xml:lang'), identity.get('name')) + t = (identity['category'], identity.get('type'), identity.get('xml:lang'), identity.get('name')) ciself._identities.append(ciself.__names.setdefault(t, t)) identities = property(_get_identities, _set_identities)

1 0

[commit-gajim] r9531 - trunk/src
by asterix＠gajim.org 24 Apr '08

24 Apr '08

Author: asterix Date: 2008-04-24 09:52:11 +0200 (Thu, 24 Apr 2008) New Revision: 9531 Modified: trunk/src/roster_window.py Log: fix groupchat addition to roster Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-04-23 22:52:22 UTC (rev 9530) +++ trunk/src/roster_window.py 2008-04-24 07:52:11 UTC (rev 9531) @@ -645,8 +645,7 @@ if contact is None: contact = gajim.contacts.create_contact(jid = jid, name = jid, groups = [_('Groupchats')], show = 'online', - status = status, sub = 'none', - resource = resource) + status = status, sub = 'none') gajim.contacts.add_contact(account, contact) self.add_contact(jid, account) else:

1 0

[commit-gajim] r9530 - trunk/src
by steve-e＠gajim.org 23 Apr '08

23 Apr '08

Author: steve-e Date: 2008-04-24 00:52:22 +0200 (Thu, 24 Apr 2008) New Revision: 9530 Modified: trunk/src/roster_window.py Log: Add parameter checks to public API. Remove boiler code. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-04-23 22:34:10 UTC (rev 9529) +++ trunk/src/roster_window.py 2008-04-23 22:52:22 UTC (rev 9530) @@ -808,6 +808,9 @@ def draw_account(self, account): child_iter = self._get_account_iter(account, self.model) + if not child_iter: + assert False, 'Account iter of %s could not be found.' % account + return num_of_accounts = gajim.get_number_of_connected_accounts() num_of_secured = gajim.get_number_of_securely_connected_accounts() @@ -860,6 +863,8 @@ def draw_parent_contact(self, jid, account): child_iters = self._get_contact_iter(jid, account, self.model) + if not child_iters: + return False parent_iter = self.model.iter_parent(child_iters[0]) if self.model[parent_iter][C_TYPE] != 'contact': # parent is not a contact @@ -1046,12 +1051,7 @@ def draw_avatar(self, jid, account): iters = self._get_contact_iter(jid, account, self.model) - self.draw_avatar_from_iters(iters) - - def draw_avatar_from_iters(self, iters): - '''draw the avatar - iters are iters in treemodel, not treemodelfilter''' - if not gajim.config.get('show_avatars_in_roster'): + if not iters or not gajim.config.get('show_avatars_in_roster'): return jid = self.model[iters[0]][C_JID] jid = jid.decode('utf-8') @@ -1069,7 +1069,6 @@ Show contact if it has pending events ''' contact = gajim.contacts.get_first_contact_from_jid(account, jid) - self.draw_contact(jid, account) groups = contact.groups if contact.is_transport():

1 0

[commit-gajim] r9529 - trunk/src
by steve-e＠gajim.org 23 Apr '08

23 Apr '08

Author: steve-e Date: 2008-04-24 00:34:10 +0200 (Thu, 24 Apr 2008) New Revision: 9529 Modified: trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: Small roster API cleanups. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-04-22 23:52:04 UTC (rev 9528) +++ trunk/src/gajim.py 2008-04-23 22:34:10 UTC (rev 9529) @@ -2326,8 +2326,8 @@ if no_queue: # We didn't have a queue: we change icons if not gajim.contacts.get_contact_with_highest_priority(account, jid): if type_ == 'gc-invitation': - self.roster.add_groupchat(account, jid, - status='offline') + self.roster.add_groupchat(jid, account, + status = 'offline') else: # add contact to roster ("Not In The Roster") if he is not self.roster.add_to_not_in_the_roster(account, jid) @@ -2694,7 +2694,7 @@ gajim.connections[account].join_gc(nick, room_jid, password) if password: gajim.gc_passwords[room_jid] = password - self.roster.add_groupchat(account, room_jid) + self.roster.add_groupchat(room_jid, account) return if not minimized_control_exists and \ not self.msg_win_mgr.has_window(room_jid, account): @@ -2709,7 +2709,7 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, \ room_jid) if contact or minimized_control_exists: - self.roster.add_groupchat(account, room_jid) + self.roster.add_groupchat(room_jid, account) def new_room(self, room_jid, nick, account, is_continued=False): # Get target window, create a control, and associate it with the window Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-04-22 23:52:04 UTC (rev 9528) +++ trunk/src/groupchat_control.py 2008-04-23 22:34:10 UTC (rev 9529) @@ -1587,8 +1587,8 @@ del win._controls[self.account][self.contact.jid] - gajim.interface.roster.add_groupchat(self.account, - self.contact.jid, status = self.subject) + gajim.interface.roster.add_groupchat(self.contact.jid, self.account, + status = self.subject) def shutdown(self, status='offline'): # destroy banner tooltip - bug #pygtk for that! Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-04-22 23:52:04 UTC (rev 9528) +++ trunk/src/roster_window.py 2008-04-23 22:34:10 UTC (rev 9529) @@ -232,7 +232,7 @@ ################################################################################ def add_account(self, account): - '''Add account to roster but do nothing if it is already in.''' + '''Add account to roster and draw it. Do nothing if it is already in.''' # no redraw, add only if self._get_account_iter(account): # Will happen on reconnect or for merged accounts @@ -255,6 +255,9 @@ self.model.append(None, [gajim.interface.jabber_state_images['16'][show], gobject.markup_escape_text(account), 'account', our_jid, account, None, tls_pixbuf]) + + if not self.starting: + self.draw_account(account) def add_account_contacts(self, account): @@ -264,15 +267,18 @@ c1 = time.clock() jids = gajim.contacts.get_jid_list(account) - self.starting = True # don't draw contacts self.tree.freeze_child_notify() c5 = time.clock() for jid in jids: self.add_contact(jid, account) c6 = time.clock() self.tree.thaw_child_notify() - self.starting = False + # Do not freeze the GUI when drawing the contacts + if jids: + # Overhead is big, only invoke when needed + self._idle_draw_jids_of_account(jids, account) + c9 = time.clock() # Draw all known groups for group in gajim.groups[account].keys(): @@ -280,15 +286,11 @@ self.draw_account(account) c10 = time.clock() - # Do not freeze the GUI when drawing the contacts if jids: - # Overhead is big, only invoke when needed - self._idle_draw_jids_of_account(jids, account) - c4 = time.clock() print "" - print "--- Add account contacts -----------------------------" + print "--- Add account contacts of %s ---------" % account print "Total Time", c4-c1 print "Add contact without draw", c6-c5 print "Draw groups and account", c10-c9 @@ -542,11 +544,10 @@ if jid == gajim.get_jid_from_account(account): if contact.resource != gajim.connections[account].server_resource: return self._add_self_contact(account) - #FIXME When does this happen? - assert False return - - if contact.is_observer(): + + is_observer = contact.is_observer() + if is_observer: # if he has a tag, remove it tag = gajim.contacts.get_metacontacts_tag(account, jid) if tag: @@ -567,7 +568,7 @@ # Draw all groups of the contact if contact.is_transport(): contact.groups = [_('Transports')] - if contact.is_observer(): + if is_observer: contact.groups = [_('Observers')] groups = contact.groups if not groups: @@ -581,8 +582,8 @@ ishidden = True gajim.groups[account][group] = {'expand': ishidden} - #if not self.starting: - self.draw_group(group, account) + if not self.starting: + self.draw_group(group, account) if not self.starting: for c, acc in contacts: @@ -636,7 +637,7 @@ return True - def add_groupchat(self, account, jid, resource = '', status = ''): + def add_groupchat(self, jid, account, status = ''): '''Add groupchat to roster and draw it. Return the added contact instance. ''' @@ -647,9 +648,10 @@ status = status, sub = 'none', resource = resource) gajim.contacts.add_contact(account, contact) + self.add_contact(jid, account) else: contact.show = 'online' - self.add_contact(jid, account) + self.draw_contact(jid, account) return contact @@ -658,28 +660,36 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) self.remove_contact(jid, account) gajim.contacts.remove_contact(account, contact) - #FIXME: stupid hack. # When we redraw the group in remove_contact the # contact does still exist and so the group is still showing # the old numbers. - # Maybe use timeout to draw groups so that there is enough time - # to remove the contact instance. self.draw_group(_('Groupchats'), account) return True - def add_transport(self, account, transport): + def add_transport(self, jid, account): '''Add transport to roster and draw it. Return the added contact instance.''' - contact = gajim.contacts.create_contact(jid = transport, name = transport, + contact = gajim.contacts.create_contact(jid = jid, name = jid, groups = [_('Transports')], show = 'offline', status = 'offline', sub = 'from') gajim.contacts.add_contact(account, contact) self.add_contact(transport, account) return contact - # FIXME: remove_transport method is missing + def remove_transport(self, jid, account): + '''Remove transport from roster and redraw account and group.''' + contact = gajim.contacts.get_contact_with_highest_priority(account, jid) + self.remove_contact(jid, account) + gajim.contacts.remove_contact(account, contact) + # When we redraw the group in remove_contact the + # contact does still exist and so the group is still showing + # the old numbers. + self.draw_group(_('Transports'), account) + return True + + #FIXME: Better never even remove.... def _readd_contact_to_roster_if_needed(self, contact, account): # FIXME What am I REALLY needed for @@ -857,6 +867,7 @@ parent_jid = self.model[parent_iter][C_JID].decode('utf-8') parent_account = self.model[parent_iter][C_ACCOUNT].decode('utf-8') self.draw_contact(parent_jid, parent_account) + return False def draw_contact(self, jid, account, selected = False, focus = False): '''draw the correct state image, name BUT not avatar''' @@ -968,7 +979,9 @@ else: # We are a simple brother # Let our big brother know of our existence (and possible events) - self.draw_contact(big_brother_jid, big_brother_account) + if not self.starting: + # Our account is currently added. Parent will be drawn anyway. + self.draw_contact(big_brother_jid, big_brother_account) icon_name = helpers.get_icon_name_to_show(contact, account) # look if another resource has awaiting events @@ -1084,7 +1097,7 @@ self.draw_contact(jid, account) self.draw_avatar(jid, account) yield True - print "--- Idle draw -----------------" + print "--- Idle draw of %s -----------" % account print "Draw contact and avatar", time.clock() - t print "-------------------------------" yield False @@ -1098,9 +1111,11 @@ # clear the model, only if it is not empty if self.model: self.model.clear() + self.starting = True for acct in gajim.connections: self.add_account(acct) self.add_account_contacts(acct) + self.starting = False # Recalculate column width for ellipsizing self.tree.columns_autosize()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2008