Commits June 2008

commits@gajim.org

7 participants
141 discussions

[commit-gajim] r9790 - in trunk: src/common test
by bct＠gajim.org 12 Jun '08

12 Jun '08

Author: bct Date: 2008-06-12 05:56:47 +0200 (Thu, 12 Jun 2008) New Revision: 9790 Added: trunk/test/test_caps.py Modified: trunk/src/common/caps.py Log: CapsCache: made docstring match the API, fixed minor bugs, added tests Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-06-12 03:56:41 UTC (rev 9789) +++ trunk/src/common/caps.py 2008-06-12 03:56:47 UTC (rev 9790) @@ -24,7 +24,7 @@ class CapsCache(object): ''' This object keeps the mapping between caps data and real disco - features they represent, and provides simple way to query that info. + features they represent, and provides simple way to query that info. It is application-wide, that is there's one object for all connections. Goals: @@ -44,46 +44,39 @@ # object creation >>> cc=CapsCache(logger_object) - >>> caps=('http://exodus.jabberstudio.org/caps', '0.9', None) # node, ver, ext - >>> muc='http://jabber.org/protocol/muc' - >>> chatstates='http://jabber.org/protocol/chatstates' + >>> caps = ('sha-1', '66/0NaeaBKkwk85efJTGmU47vXI=') + >>> muc = 'http://jabber.org/protocol/muc' + >>> chatstates = 'http://jabber.org/protocol/chatstates' + # setting data + >>> cc[caps].identities = [{'category':'client', 'type':'pc'}] + >>> cc[caps].features = [muc] + # retrieving data >>> muc in cc[caps].features True - >>> muc in cc[caps] - True - >>> chatstates in cc[caps] + >>> chatstates in cc[caps].features False >>> cc[caps].identities - set({'category':'client', 'type':'pc'}) - >>> x=cc[caps] # more efficient if making several queries for one set of caps + [{'category': 'client', 'type': 'pc'}] + >>> x = cc[caps] # more efficient if making several queries for one set of caps ATypicalBlackBoxObject - >>> muc in x + >>> muc in x.features True - >>> x.node - 'http://exodus.jabberstudio.org/caps' # retrieving data (multiple exts case) >>> caps=('http://gajim.org/caps', '0.9', ('csn', 'ft')) - >>> muc in cc[caps] + >>> muc in cc[caps].features True - # setting data - >>> newcaps=('http://exodus.jabberstudio.org/caps', '0.9a', None) - >>> cc[newcaps].identities.add({'category':'client', 'type':'pc', 'name':'Gajim'}) - >>> cc[newcaps].features+=muc # same as: - >>> cc[newcaps]+=muc - >>> cc[newcaps]['csn']+=chatstates # adding data as if ext was 'csn' - # warning: no feature removal! ''' def __init__(self, logger=None): ''' Create a cache for entity capabilities. ''' # our containers: - # __cache is a dictionary mapping: pair of node and version maps + # __cache is a dictionary mapping: pair of hash method and hash maps # to CapsCacheItem object # __CacheItem is a class that stores data about particular - # client (node/version pair) + # client (hash method/hash pair) self.__cache = {} class CacheItem(object): @@ -129,7 +122,7 @@ d['xml:lang'] = i[2] if i[3]: d['name'] = i[3] - list.append(d) + list_.append(d) return list_ def _set_identities(ciself, value): ciself._identities = [] @@ -172,7 +165,9 @@ def __getitem__(self, caps): if caps in self.__cache: return self.__cache[caps] - hash_method, hash = caps[0], caps[1] + + hash_method, hash = caps + x = self.__CacheItem(hash_method, hash) self.__cache[(hash_method, hash)] = x return x Added: trunk/test/test_caps.py =================================================================== --- trunk/test/test_caps.py (rev 0) +++ trunk/test/test_caps.py 2008-06-12 03:56:47 UTC (rev 9790) @@ -0,0 +1,47 @@ +# tests for capabilities and the capabilities cache +import unittest + +import testlib +testlib.setup_env() + +from common import gajim +from common import xmpp + +from common.caps import CapsCache + +from mock import Mock + +class MockLogger(Mock): + def __init__(self, *args): + Mock.__init__(self, *args) + +class TestCapsCache(unittest.TestCase): + def setUp(self): + self.logger = MockLogger() + self.cc = CapsCache(self.logger) + + def test_examples(self): + '''tests the examples given in common/caps.py''' + + caps = ('sha-1', '66/0NaeaBKkwk85efJTGmU47vXI=') + identity = {'category': 'client', 'type': 'pc'} + + muc = 'http://jabber.org/protocol/muc' + chatstates = 'http://jabber.org/protocol/chatstates' + + self.cc[caps].identities = [identity] + self.cc[caps].features = [muc] + + self.assert_(muc in self.cc[caps].features) + self.assert_(chatstates not in self.cc[caps].features) + + id = self.cc[caps].identities + + self.assertEqual(1, len(id)) + + id = id[0] + self.assertEqual('client', id['category']) + self.assertEqual('pc', id['type']) + +if __name__ == '__main__': + unittest.main()

1 0

[commit-gajim] r9789 - trunk/src
by bct＠gajim.org 12 Jun '08

12 Jun '08

Author: bct Date: 2008-06-12 05:56:41 +0200 (Thu, 12 Jun 2008) New Revision: 9789 Modified: trunk/src/session.py Log: fix lack of notification Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-06-12 03:56:30 UTC (rev 9788) +++ trunk/src/session.py 2008-06-12 03:56:41 UTC (rev 9789) @@ -183,6 +183,12 @@ self.control = ctrl self.control.set_session(self) + # Is it a first or next message received ? + first = False + if not self.control and not gajim.events.get_events(self.conn.name, \ + jid_of_control, [msg_type]): + first = True + if pm: nickname = resource groupchat_control.on_private_message(nickname, msgtxt, tim, @@ -200,17 +206,11 @@ msg = _('Subject: %s') % subject + '\n' + msg focused = False - # Is it a first or next message received ? - first = False - if self.control: parent_win = self.control.parent_win if self.control == parent_win.get_active_control() and \ parent_win.window.has_focus: focused = True - elif not gajim.events.get_events(self.conn.name, \ - jid_of_control, [msg_type]): - first = True notify.notify('new_message', jid_of_control, self.conn.name, [msg_type, first, nickname, msg, focused], advanced_notif_num)

1 0

[commit-gajim] r9788 - trunk/test
by bct＠gajim.org 12 Jun '08

12 Jun '08

Author: bct Date: 2008-06-12 05:56:30 +0200 (Thu, 12 Jun 2008) New Revision: 9788 Added: trunk/test/testlib.py Modified: trunk/test/test_sessions.py Log: split off test initialization code Modified: trunk/test/test_sessions.py =================================================================== --- trunk/test/test_sessions.py 2008-06-11 23:56:11 UTC (rev 9787) +++ trunk/test/test_sessions.py 2008-06-12 03:56:30 UTC (rev 9788) @@ -1,42 +1,16 @@ import unittest -import sys -import os.path - -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') - -sys.path.append(gajim_root + '/src') - -# a temporary version of ~/.gajim for testing -configdir = gajim_root + '/test/tmp' - -# define _ for i18n -import __builtin__ -__builtin__._ = lambda x: x - -# wipe config directory -import os -if os.path.isdir(configdir): - import shutil - shutil.rmtree(configdir) - -os.mkdir(configdir) - -import common.configpaths -common.configpaths.gajimpaths.init(configdir) -common.configpaths.gajimpaths.init_profile() - import time -# for some reason common.gajim needs to be imported before xmpppy? +import testlib +testlib.setup_env() + from common import gajim from common import xmpp from mock import Mock, expectParams from mocks import * -gajim.DATA_DIR = gajim_root + '/data' - from common.stanza_session import StanzaSession # name to use for the test account Added: trunk/test/testlib.py =================================================================== --- trunk/test/testlib.py (rev 0) +++ trunk/test/testlib.py 2008-06-12 03:56:30 UTC (rev 9788) @@ -0,0 +1,32 @@ +import sys +import os.path + +gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') + +sys.path.append(gajim_root + '/src') + +# a temporary version of ~/.gajim for testing +configdir = gajim_root + '/test/tmp' + +# define _ for i18n +import __builtin__ +__builtin__._ = lambda x: x + +import os + +def setup_env(): + # wipe config directory + if os.path.isdir(configdir): + import shutil + shutil.rmtree(configdir) + + os.mkdir(configdir) + + import common.configpaths + common.configpaths.gajimpaths.init(configdir) + common.configpaths.gajimpaths.init_profile() + + # for some reason common.gajim needs to be imported before xmpppy? + from common import gajim + + gajim.DATA_DIR = gajim_root + '/data'

1 0

[commit-gajim] r9787 - trunk/src
by steve-e＠gajim.org 11 Jun '08

11 Jun '08

Author: steve-e Date: 2008-06-12 01:56:11 +0200 (Thu, 12 Jun 2008) New Revision: 9787 Modified: trunk/src/roster_window.py Log: Add missing import. Fixes PEP tune checkbox toggeling. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-11 21:44:04 UTC (rev 9786) +++ trunk/src/roster_window.py 2008-06-11 23:56:11 UTC (rev 9787) @@ -3108,6 +3108,7 @@ if gajim.connections[account].pep_supported: # As many implementations don't support retracting items, we send a # "Stopped" event first + from common import pep pep.user_send_tune(account, '') pep.user_retract_tune(account) helpers.update_optional_features(account)

1 0

[commit-gajim] r9786 - trunk/src
by steve-e＠gajim.org 11 Jun '08

11 Jun '08

Author: steve-e Date: 2008-06-11 23:44:04 +0200 (Wed, 11 Jun 2008) New Revision: 9786 Modified: trunk/src/roster_window.py Log: Comment non working callback, but still keep it for reference. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-10 21:18:55 UTC (rev 9785) +++ trunk/src/roster_window.py 2008-06-11 21:44:04 UTC (rev 9786) @@ -3403,35 +3403,35 @@ elif type_ == 'account': self._adjust_account_expand_collapse_state(account) - def on_treeview_selection_changed(self, selection): - '''Called when selection in TreeView has changed. +# Selection can change when the model is filtered +# Only write to the model when filtering is finished! +# +# FIXME: When we are filtering our custom colors are somehow lost +# +# def on_treeview_selection_changed(self, selection): +# '''Called when selection in TreeView has changed. +# +# Redraw unselected rows to make status message readable +# on all possible backgrounds. +# ''' +# model, list_of_paths = selection.get_selected_rows() +# if len(self._last_selected_contact): +# # update unselected rows +# for (jid, account) in self._last_selected_contact: +# gobject.idle_add(self.draw_contact, jid, account) +# self._last_selected_contact = [] +# if len(list_of_paths) == 0: +# return +# for path in list_of_paths: +# row = model[path] +# if row[C_TYPE] != 'contact': +# self._last_selected_contact = [] +# return +# jid = row[C_JID].decode('utf-8') +# account = row[C_ACCOUNT].decode('utf-8') +# self._last_selected_contact.append((jid, account)) +# gobject.idle_add(self.draw_contact, jid, account, True) - Redraw unselected rows to make status message readable - on all possible backgrounds. - ''' - # Selection can change when the model is filtered - # Only write to the model when filtering is finished! - - # FIXME: When we are filtering our custom colors are somehow lost - - model, list_of_paths = selection.get_selected_rows() - if len(self._last_selected_contact): - # update unselected rows - for (jid, account) in self._last_selected_contact: - gobject.idle_add(self.draw_contact, jid, account) - self._last_selected_contact = [] - if len(list_of_paths) == 0: - return - for path in list_of_paths: - row = model[path] - if row[C_TYPE] != 'contact': - self._last_selected_contact = [] - return - jid = row[C_JID].decode('utf-8') - account = row[C_ACCOUNT].decode('utf-8') - self._last_selected_contact.append((jid, account)) - gobject.idle_add(self.draw_contact, jid, account, True) - def on_service_disco_menuitem_activate(self, widget, account): server_jid = gajim.config.get_per('accounts', account, 'hostname') if gajim.interface.instances[account]['disco'].has_key(server_jid):

1 0

[commit-gajim] r9785 - trunk/src
by steve-e＠gajim.org 10 Jun '08

10 Jun '08

Author: steve-e Date: 2008-06-10 23:18:55 +0200 (Tue, 10 Jun 2008) New Revision: 9785 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Various roster fixes. * don't traceback when selfcontact is disconnecting * make more use of "remove contact after last event removed" mechanism * correctly redraw bigbrothers after status change * handle situation where we receive a message, go offline without reading it and reconnect after another resource has moved the sending contact to another group. know bugs: newly added transports added to "not in roster group" Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-10 02:58:17 UTC (rev 9784) +++ trunk/src/gajim.py 2008-06-10 21:18:55 UTC (rev 9785) @@ -609,7 +609,11 @@ def handle_event_notify(self, account, array): # 'NOTIFY' (account, (jid, status, status message, resource, priority, # keyID, timestamp, contact_nickname)) - # if we're here it means contact changed show + # + # Contact changed show + + # FIXME: Drop and rewrite... + statuss = ['offline', 'error', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible'] # Ignore invalid show @@ -664,17 +668,20 @@ if contact1: if contact1.show in statuss: old_show = statuss.index(contact1.show) + # nick changed if contact_nickname is not None and \ contact1.contact_name != contact_nickname: contact1.contact_name = contact_nickname self.roster.draw_contact(jid, account) + if old_show == new_show and contact1.status == status_message and \ contact1.priority == priority: # no change return else: contact1 = gajim.contacts.get_first_contact_from_jid(account, ji) if not contact1: - # presence of another resource of our jid + # Presence of another resource of our jid + # Create SelfContact and add to roster if resource == gajim.connections[account].server_resource: return contact1 = gajim.contacts.create_contact(jid = ji, @@ -687,14 +694,15 @@ lcontact.append(contact1) elif contact1.show in statuss: old_show = statuss.index(contact1.show) + # FIXME: What Am I? if (resources != [''] and (len(lcontact) != 1 or lcontact[0].show != 'offline')) and jid.find('@') > 0: old_show = 0 contact1 = gajim.contacts.copy_contact(contact1) lcontact.append(contact1) contact1.resource = resource - # FIXME ugly workaround for self contact - self.roster.add_contact(contact1.jid, account) + + self.roster.add_contact(contact1.jid, account) if contact1.jid.find('@') > 0 and len(lcontact) == 1: # It's not an agent @@ -725,6 +733,7 @@ # We're connected since more that 30 seconds contact1.last_status_time = time.localtime() contact1.contact_nickname = contact_nickname + if gajim.jid_is_transport(jid): # It must be an agent if ji in jid_list: @@ -852,10 +861,7 @@ if jid in gajim.contacts.get_jid_list(account): c = gajim.contacts.get_first_contact_from_jid(account, jid) c.resource = array[1] - self.roster.remove_contact(c.jid, account) - if _('Not in Roster') in c.groups: - c.groups.remove(_('Not in Roster')) - self.roster.add_contact(c.jid, account) + self.roster.remove_contact_from_groups(c.jid, account, [('Not in Roster'),]) else: keyID = '' attached_keys = gajim.config.get_per('accounts', account, @@ -922,8 +928,7 @@ if c.jid in gajim.to_be_removed[account]: # This way we'll really remove it gajim.to_be_removed[account].remove(c.jid) - gajim.contacts.remove_jid(account, c.jid) - self.roster.remove_contact(c.jid, account) + self.roster.remove_contact(c.jid, account, backend = True) def handle_event_register_agent_info(self, account, array): # ('REGISTER_AGENT_INFO', account, (agent, infos, is_form)) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-10 02:58:17 UTC (rev 9784) +++ trunk/src/roster_window.py 2008-06-10 21:18:55 UTC (rev 9785) @@ -760,33 +760,6 @@ self.remove_contact(jid, account, force = True, backend = True) return True - #FIXME: - # We need to define a generic way to keep contacts in roster - # as long as they have pending events or as we - # still chat with them - def _readd_contact_to_roster_if_needed(self, contact, account): - need_readd = False - if len(gajim.events.get_events(account, contact.jid)): - need_readd = True - elif gajim.interface.msg_win_mgr.has_window(contact.jid, account): - if _('Not in Roster') in contact.groups: - # Close chat window - msg_win = gajim.interface.msg_win_mgr.get_window(contact.jid, - account) - for ctrl in gajim.interface.msg_win_mgr.get_chat_controls( - contact.jid, account): - msg_win.remove_tab(ctrl, msg_win.CLOSE_CLOSE_BUTTON) - else: - need_readd = True - if need_readd: - c = gajim.contacts.create_contact(jid = contact.jid, - name = '', groups = [_('Not in Roster')], - show = 'not in roster', status = '', ask = 'none', - keyID = contact.keyID) - gajim.contacts.add_contact(account, c) - self.add_contact(contact.jid, account) - - def add_contact_to_groups(self, jid, account, groups): '''Add contact to given groups and redraw them. @@ -1165,13 +1138,15 @@ Show contact if it has pending events ''' contact = gajim.contacts.get_first_contact_from_jid(account, jid) + if not contact: + # idle draw or just removed SelfContact + return family = gajim.contacts.get_metacontacts_family(account, jid) if family: # There might be a new big brother self._recalibrate_metacontact_family(family, account) - else: - self.draw_contact(jid, account) + self.draw_contact(jid, account) self.draw_account(account) for group in contact.groups: @@ -1496,7 +1471,7 @@ gajim.groups[account] = {} for jid in array.keys(): # Remove the contact in roster. It might has changed - self.remove_contact(jid, account) + self.remove_contact(jid, account, force = True) # Remove old Contact instances gajim.contacts.remove_jid(account, jid, remove_meta=False) jids = jid.split('/') @@ -1827,6 +1802,7 @@ # We come back from invisible, join bookmarks gajim.interface.auto_join_bookmarks(account) + def chg_contact_status(self, contact, show, status, account): '''When a contact changes his or her status''' contact_instances = gajim.contacts.get_contacts(account, contact.jid) @@ -1834,10 +1810,13 @@ contact.status = status # name is to show in conversation window name = contact.get_shown_name() - + + # The contact has several resources if len(contact_instances) > 1: if contact.resource != '': name += '/' + contact.resource + + # Remove resource when going offline if show in ('offline', 'error') and \ len(gajim.events.get_events(account, contact.get_full_jid())) == 0: jid_with_resource = contact.jid + '/' + contact.resource @@ -1848,13 +1827,13 @@ for ctrl in win.get_controls(jid_with_resource, account): ctrl.update_ui() win.redraw_tab(ctrl) - gajim.contacts.remove_contact(account, contact) + elif contact.jid == gajim.get_jid_from_account(account) and \ - show == 'offline': - # Our SelfContact went offline. Remove him from roster and contacts - self.remove_contact(contact.jid, account) - gajim.contacts.remove_contact(account, contact) + show in ('offline', 'error'): + # SelfContact went offline. Remove him when last pending message was read + self.remove_contact(contact.jid, account, backend = True) + # print status in chat window and update status/GPG image if gajim.interface.msg_win_mgr.has_window(contact.jid, account): win = gajim.interface.msg_win_mgr.get_window(contact.jid, account) @@ -1909,8 +1888,7 @@ # Remove SelfContact from roster and remove it. # It might be gone when we return self_jid = gajim.get_jid_from_account(account) - self.remove_contact(self_jid, account) - gajim.contacts.remove_jid(account, self_jid) + self.remove_contact(self_jid, account, backend = True) self.actions_menu_needs_rebuild = True self.update_status_combobox() # Force the rebuild now since the on_activates on the menu itself does @@ -2310,7 +2288,6 @@ def on_remove_agent(self, widget, list_): '''When an agent is requested to be removed. list_ is a list of (contact, account) tuple''' - # FIXME remove transport contacts for (contact, account) in list_: if gajim.config.get_per('accounts', account, 'hostname') == \ contact.jid: @@ -2579,16 +2556,9 @@ for contact in gajim.contacts.get_contacts_from_group(account, group): if not dlg.is_checked(): self.remove_contact_from_groups(contact.jid,account, [group]) - gajim.connections[account].update_contact(contact.jid, - contact.name, contact.groups) - self.add_contact(contact.jid, account) else: gajim.connections[account].unsubscribe(contact.jid) - for c in gajim.contacts.get_contacts(account, contact.jid): - self.remove_contact(c.jid, account) - gajim.contacts.remove_jid(account, c.jid) - self._readd_contact_to_roster_if_needed(contact, account) - self.draw_account(account) + self.remove_contact(contact.jid, account, backend = True) def on_assign_pgp_key(self, widget, contact, account): attached_keys = gajim.config.get_per('accounts', account, @@ -2964,21 +2934,13 @@ remove_auth = False for (contact, account) in list_: gajim.connections[account].unsubscribe(contact.jid, remove_auth) - for c in gajim.contacts.get_contacts(account, contact.jid): - self.remove_contact(c.jid, account) - gajim.contacts.remove_jid(account, contact.jid) - self.draw_account(account) + self.remove_contact(contact.jid, account, backend = True) if not remove_auth and contact.sub == 'both': contact.name = '' contact.groups = [] contact.sub = 'from' gajim.contacts.add_contact(account, contact) self.add_contact(contact.jid, account) - else: - if _('Not in Roster') in contact.groups: - gajim.events.remove_events(account, contact.jid) - self._readd_contact_to_roster_if_needed(contact, account) - def on_ok2(list_): on_ok(False, list_)

1 0

[commit-gajim] r9784 - in trunk/src: . common
by bct＠gajim.org 10 Jun '08

10 Jun '08

Author: bct Date: 2008-06-10 04:58:17 +0200 (Tue, 10 Jun 2008) New Revision: 9784 Modified: trunk/src/common/connection_handlers.py trunk/src/gajim.py trunk/src/session.py Log: detach sessions from controls when the highest priority contact changes. this way we don't get multiple tabs when the remote user moves to another resource. Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-06-10 02:58:04 UTC (rev 9783) +++ trunk/src/common/connection_handlers.py 2008-06-10 02:58:17 UTC (rev 9784) @@ -1323,7 +1323,7 @@ orphaned = filter(lambda s: not s.control, chat_sessions) return orphaned[0] - except KeyError: + except (KeyError, IndexError): return None def make_new_session(self, jid, thread_id=None, type='chat', cls=None): @@ -2104,6 +2104,13 @@ self.dispatch('ERROR_ANSWER', ('', jid_stripped, errmsg, errcode)) + if ptype == 'unavailable' and jid_stripped in self.sessions: + # automatically terminate sessions that they haven't sent a thread ID in + for sess in self.sessions[jid_stripped].values(): + if not sess.received_thread_id: + sess.terminate() + del self.sessions[jid_stripped][sess.thread_id] + if avatar_sha and ptype != 'error': if not self.vcard_shas.has_key(jid_stripped): cached_vcard = self.get_cached_vcard(jid_stripped) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-10 02:58:04 UTC (rev 9783) +++ trunk/src/gajim.py 2008-06-10 02:58:17 UTC (rev 9784) @@ -621,7 +621,7 @@ jid = array[0].split('/')[0] keyID = array[5] contact_nickname = array[7] - + # Get the proper keyID keyID = helpers.prepare_and_validate_gpg_keyID(account, jid, keyID) @@ -647,6 +647,20 @@ if c.resource == resource: contact1 = c break + + highest = gajim.contacts.get_highest_prio_contact_from_contacts(lcontact) + if not highest or \ + (highest.priority < priority and highest.resource != resource) or \ + (highest.resource == resource and highest.priority > priority): + # either this contact is the new highest priority contact or it was the + # highest and dropped in priority (so may no longer be the highest) + + # disconnect sessions from this contact's chat controls so we + # don't have to open a new tab if a new session comes in + + for ctrl in self.msg_win_mgr.get_chat_controls(jid, account): + ctrl.set_session(None) + if contact1: if contact1.show in statuss: old_show = statuss.index(contact1.show) Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-06-10 02:58:04 UTC (rev 9783) +++ trunk/src/session.py 2008-06-10 02:58:17 UTC (rev 9784) @@ -125,15 +125,12 @@ pm = True msg_type = 'pm' - jid_of_control = full_jid_with_resource - highest_contact = gajim.contacts.get_contact_with_highest_priority( self.conn.name, jid) - if not pm: - if not highest_contact or not highest_contact.resource or \ - resource == highest_contact.resource or highest_contact.show == 'offline': - jid_of_control = jid + # does this resource have the highest priority of any available? + is_highest = not highest_contact or not highest_contact.resource or \ + resource == highest_contact.resource or highest_contact.show == 'offline' # Handle chat states contact = gajim.contacts.get_contact(self.conn.name, jid, resource) @@ -174,11 +171,10 @@ advanced_notif_num = notify.get_advanced_notification('message_received', self.conn.name, contact) - # Is it a first or next message received ? - first = False - if not self.control and not gajim.events.get_events(self.conn.name, - jid_of_control, [msg_type]): - first = True + if not pm and is_highest: + jid_of_control = jid + else: + jid_of_control = full_jid_with_resource if not self.control: # look for an existing chat control without a session @@ -186,7 +182,6 @@ if ctrl: self.control = ctrl self.control.set_session(self) - first = False if pm: nickname = resource @@ -198,17 +193,24 @@ xhtml=xhtml, form_node=form_node) nickname = gajim.get_name_from_jid(self.conn.name, jid) + # Check and do wanted notifications msg = msgtxt if subject: msg = _('Subject: %s') % subject + '\n' + msg focused = False + # Is it a first or next message received ? + first = False + if self.control: parent_win = self.control.parent_win if self.control == parent_win.get_active_control() and \ parent_win.window.has_focus: focused = True + elif not gajim.events.get_events(self.conn.name, \ + jid_of_control, [msg_type]): + first = True notify.notify('new_message', jid_of_control, self.conn.name, [msg_type, first, nickname, msg, focused], advanced_notif_num)

1 0

[commit-gajim] r9783 - trunk/src
by bct＠gajim.org 10 Jun '08

10 Jun '08

Author: bct Date: 2008-06-10 04:58:04 +0200 (Tue, 10 Jun 2008) New Revision: 9783 Modified: trunk/src/message_control.py Log: minor fixes for ctrl.set_session Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-06-09 22:53:45 UTC (rev 9782) +++ trunk/src/message_control.py 2008-06-10 02:58:04 UTC (rev 9783) @@ -134,6 +134,8 @@ new_key = session.thread_id if oldsession: + oldsession.control = None + jid = self.contact.jid if self.resource: jid += '/' + self.resource @@ -143,7 +145,7 @@ if oldsession.enable_encryption: self.print_esession_details() - else: + elif session: self.parent_win.move_from_sessionless(self) def send_message(self, message, keyID = '', type = 'chat',

1 0

[commit-gajim] r9782 - trunk/src
by steve-e＠gajim.org 09 Jun '08

09 Jun '08

Author: steve-e Date: 2008-06-10 00:53:45 +0200 (Tue, 10 Jun 2008) New Revision: 9782 Modified: trunk/src/roster_window.py Log: Some fixes for draw_contact. * show correct expand icon for metacontacts in different groups * only redraw parent when really necessary * remove obscure code * fix draw_parent_contact Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-09 21:01:12 UTC (rev 9781) +++ trunk/src/roster_window.py 2008-06-09 22:53:45 UTC (rev 9782) @@ -811,9 +811,8 @@ self.add_contact(jid, account) - # FIXME: Jim, what was the exact need of this? -# for group in groups: -# self._adjust_group_expand_collapse_state(group, account) + for group in groups: + self._adjust_group_expand_collapse_state(group, account) def remove_contact_from_groups(self, jid, account, groups): '''Remove contact from given groups and redraw them. @@ -939,7 +938,7 @@ return False def draw_parent_contact(self, jid, account): - child_iters = self._get_contact_iter(jid, account, self.model) + child_iters = self._get_contact_iter(jid, account, model = self.model) if not child_iters: return False parent_iter = self.model.iter_parent(child_iters[0]) @@ -954,6 +953,8 @@ def draw_contact(self, jid, account, selected = False, focus = False): '''draw the correct state image, name BUT not avatar''' # focus is about if the roster window has toplevel-focus or not + # FIXME: We really need a custom cell_renderer + contact_instances = gajim.contacts.get_contacts(account, jid) contact = gajim.contacts.get_highest_prio_contact_from_contacts( contact_instances) @@ -1004,7 +1005,6 @@ if account_ == account: # useless to add accout name continue for jid_ in gajim.contacts.get_jid_list(account_): - # [0] cause it'fster than highest_prio contact_ = gajim.contacts.get_first_contact_from_jid(account_, jid_) if contact_.get_shown_name() == contact.get_shown_name() and \ @@ -1030,21 +1030,6 @@ '\n<span size="small" style="italic" foreground="%s">%s</span>' \ % (colorstring, gobject.markup_escape_text(status)) - # Check if our metacontacts family has changed - brothers = [] - family = gajim.contacts.get_metacontacts_family(account, jid) - if family: # Are we a metacontact (have a family) - - nearby_family, big_brother_jid, big_brother_account = \ - self._get_nearby_family_and_big_brother(family, account) - - if big_brother_jid != jid or big_brother_account != account: - # We are a simple brother - # Let our big brother know of our existence (and possible events) - 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 for c in contact_instances: @@ -1053,54 +1038,59 @@ icon_name = c_icon_name break - iters = self._get_contact_iter(jid, account, contact) - if iters and self.modelfilter.iter_has_child(iters[0]): - # We are big brother contact and visible in the roster - titer = iters[0] - path = self.modelfilter.get_path(titer) + # Check for events of collapsed (hidden) brothers + family = gajim.contacts.get_metacontacts_family(account, jid) + is_big_brother = False + have_visible_children = False + if family: + nearby_family, bb_jid, bb_account = \ + self._get_nearby_family_and_big_brother(family, account) + is_big_brother = (jid, account) == (bb_jid, bb_account) + iters = self._get_contact_iter(jid, account) + have_visible_children = iters and self.modelfilter.iter_has_child(iters[0]) - if not self.tree.row_expanded(path) and \ - icon_name not in ('event', 'muc_active', 'muc_inactive'): + if have_visible_children: + # We are the big brother and have a visible family + # that is not just us + for child_iter in child_iters: + path = self.model.get_path(child_iter) - iterC = self.modelfilter.iter_children(titer) - if icon_name in ('error', 'offline'): - # get the icon from the first child as they are sorted by show - jidC = self.modelfilter[iterC][C_JID].decode('utf-8') - accountC = self.modelfilter[iterC][C_ACCOUNT].decode( - 'utf-8') - contactC = gajim.contacts.get_contact_with_highest_priority( - accountC, jidC) - icon_nameC = helpers.get_icon_name_to_show(contactC, accountC) - if icon_nameC not in ('error', 'not in roster'): - icon_name = icon_nameC - while iterC: - # a child has awaiting messages ? - jidC = self.modelfilter[iterC][C_JID].decode('utf-8') - accountC = self.modelfilter[iterC][C_ACCOUNT].decode('utf-8') - if len(gajim.events.get_events(accountC, jidC)): - icon_name = 'event' - break - iterC = self.modelfilter.iter_next(iterC) + if not self.tree.row_expanded(path) and icon_name != 'event': + iterC = self.model.iter_children(child_iter) + while iterC: + # a child has awaiting messages? + jidC = self.model[iterC][C_JID].decode('utf-8') + accountC = self.model[iterC][C_ACCOUNT].decode('utf-8') + if len(gajim.events.get_events(accountC, jidC)): + icon_name = 'event' + break + iterC = self.model.iter_next(iterC) - if self.tree.row_expanded(path): - state_images = self.get_appropriate_state_images(jid, - size = 'opened', icon_name = icon_name) - else: - state_images = self.get_appropriate_state_images(jid, - size = 'closed', icon_name = icon_name) + if self.tree.row_expanded(path): + state_images = self.get_appropriate_state_images(jid, + size = 'opened', icon_name = icon_name) + else: + state_images = self.get_appropriate_state_images(jid, + size = 'closed', icon_name = icon_name) + + # Expand/collapse icon might differ per iter (group) + img = state_images[icon_name] + self.model[child_iter][C_IMG] = img + self.model[child_iter][C_NAME] = name else: - # We might be a normal contact or a little brother - #self.draw_parent_contact(jid, account) # simply call, it's save + # All iters have the same icon (no expand/collapse) state_images = self.get_appropriate_state_images(jid, icon_name = icon_name) - img = state_images[icon_name] - # Old iters might be invalid! - child_iters = self._get_contact_iter(jid, account, model = self.model) - for child_iter in child_iters: - self.model[child_iter][C_IMG] = img - self.model[child_iter][C_NAME] = name + img = state_images[icon_name] + for child_iter in child_iters: + self.model[child_iter][C_IMG] = img + self.model[child_iter][C_NAME] = name + # We are a little brother + if family and not is_big_brother and not self.starting: + self.draw_parent_contact(jid, account) + for group in contact.groups: # We need to make sure that _visible_func is called for # our groups otherwise we might not be shown @@ -1186,8 +1176,7 @@ for group in contact.groups: self.draw_group(group, account) - # FIXME: Is this needed, Jim? - #self._adjust_group_expand_collapse_state(group, account) + self._adjust_group_expand_collapse_state(group, account) def _idle_draw_jids_of_account(self, jids, account): '''Draw given contacts and their avatars in a lazy fashion.

1 0

[commit-gajim] r9781 - trunk/src
by steve-e＠gajim.org 09 Jun '08

09 Jun '08

Author: steve-e Date: 2008-06-09 23:01:12 +0200 (Mon, 09 Jun 2008) New Revision: 9781 Modified: trunk/src/roster_window.py Log: Create new method for extracting the nearby_family. DRY! Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-09 18:31:05 UTC (rev 9780) +++ trunk/src/roster_window.py 2008-06-09 21:01:12 UTC (rev 9781) @@ -445,18 +445,8 @@ family -- the family, see Contacts.get_metacontacts_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'] + nearby_family, big_brother_jid, big_brother_account = \ + self._get_nearby_family_and_big_brother(family, account) big_brother_contact = gajim.contacts.get_first_contact_from_jid( big_brother_account, big_brother_jid) @@ -469,15 +459,13 @@ brothers = [] # Filter family members for data in nearby_family: - if data == big_brother_data: - continue # already added - _account = data['account'] _jid = data['jid'] _contact = gajim.contacts.get_first_contact_from_jid(_account, _jid) - if not _contact: + if not _contact or _contact == big_brother_contact: # Corresponding account is not connected + # or brother already added continue assert len(self._get_contact_iter(_jid, _account, _contact, self.model) @@ -494,13 +482,8 @@ 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']] + nearby_family = self._get_nearby_family_and_big_brother( + family, account)[0] # Family might has changed (actual big brother not on top). # Remove childs first then big brother @@ -558,19 +541,8 @@ '''Regroup metacontact family if necessary.''' brothers = [] - 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'] - + nearby_family, big_brother_jid, big_brother_account = \ + self._get_nearby_family_and_big_brother(family, account) child_iters = self._get_contact_iter(big_brother_jid, big_brother_account, model = self.model) parent_iter = self.model.iter_parent(child_iters[0]) @@ -587,6 +559,31 @@ self.draw_avatar(c.jid, acc) + def _get_nearby_family_and_big_brother(self, family, account): + '''Return the nearby family and its Big Brother + + Nearby family is the part of the family that is grouped with the metacontact. + A metacontact may be over different accounts. If regroup is s False the + given family is split account wise. + + (nearby_family, big_brother_jid, big_brother_account) + ''' + 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'] + + return (nearby_family, big_brother_jid, big_brother_account) + + def _add_self_contact(self, account): '''Add account's SelfContact to roster and draw it and the account. @@ -1037,20 +1034,10 @@ brothers = [] family = gajim.contacts.get_metacontacts_family(account, jid) if family: # Are we a metacontact (have a family) + + nearby_family, big_brother_jid, big_brother_account = \ + self._get_nearby_family_and_big_brother(family, account) - 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'] - if big_brother_jid != jid or big_brother_account != account: # We are a simple brother # Let our big brother know of our existence (and possible events)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
15
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2008