Commits March 2007

commits@gajim.org

4 participants
62 discussions

[commit-gajim] r8040 - trunk/src/common/zeroconf
by asterix＠gajim.org 30 Mar '07

30 Mar '07

Author: asterix Date: 2007-03-30 20:42:58 +0200 (Fri, 30 Mar 2007) New Revision: 8040 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: zeroconf has no resource. Fake an empty one. fix a TB as Roster class access it. Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-03-29 20:24:30 UTC (rev 8039) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-03-30 18:42:58 UTC (rev 8040) @@ -52,6 +52,7 @@ # system username self.username = None self.name = name + self.server_resource = '' # zeroconf has no resource, fake an empty one self.connected = 0 # offline self.connection = None self.gpg = None

1 0

[commit-gajim] r8039 - branches/pep/src/common
by doomhammer＠gajim.org 29 Mar '07

29 Mar '07

Author: doomhammer Date: 2007-03-29 22:24:30 +0200 (Thu, 29 Mar 2007) New Revision: 8039 Modified: branches/pep/src/common/contacts.py branches/pep/src/common/gajim.py Log: Version changed Modified: branches/pep/src/common/contacts.py =================================================================== --- branches/pep/src/common/contacts.py 2007-03-29 19:40:50 UTC (rev 8038) +++ branches/pep/src/common/contacts.py 2007-03-29 20:24:30 UTC (rev 8039) @@ -26,6 +26,7 @@ self.groups = groups self.show = show self.status = status + # FIXME self.mood = dict() self.activity = dict() self.sub = sub Modified: branches/pep/src/common/gajim.py =================================================================== --- branches/pep/src/common/gajim.py 2007-03-29 19:40:50 UTC (rev 8038) +++ branches/pep/src/common/gajim.py 2007-03-29 20:24:30 UTC (rev 8039) @@ -51,7 +51,7 @@ interface = None # The actual interface (the gtk one for the moment) config = config.Config() -version = config.get('version') +version = config.get('version') + 'dh' connections = {} # 'account name': 'account (connection.Connection) instance' verbose = False

1 0

[commit-gajim] r8038 - branches/pep/src/common
by doomhammer＠gajim.org 29 Mar '07

29 Mar '07

Author: doomhammer Date: 2007-03-29 21:40:50 +0200 (Thu, 29 Mar 2007) New Revision: 8038 Modified: branches/pep/src/common/connection_handlers.py branches/pep/src/common/contacts.py branches/pep/src/common/pep.py Log: Mood and Activity shown in tooltips. Caps set properly Modified: branches/pep/src/common/connection_handlers.py =================================================================== --- branches/pep/src/common/connection_handlers.py 2007-03-29 19:04:14 UTC (rev 8037) +++ branches/pep/src/common/connection_handlers.py 2007-03-29 19:40:50 UTC (rev 8038) @@ -1511,7 +1511,7 @@ ''' Called when we receive <message/> with pubsub event. ''' # TODO: Logging? (actually services where logging would be useful, should # TODO: allow to access archives remotely...) - jid = helpers.get_jid_from_iq(msg) + jid = helpers.get_full_jid_from_iq(msg) event = msg.getTag('event') # XEP-0107: User Mood Modified: branches/pep/src/common/contacts.py =================================================================== --- branches/pep/src/common/contacts.py 2007-03-29 19:04:14 UTC (rev 8037) +++ branches/pep/src/common/contacts.py 2007-03-29 19:40:50 UTC (rev 8038) @@ -18,7 +18,7 @@ class Contact: '''Information concerning each contact''' - def __init__(self, jid='', name='', groups=[], show='', status='', mood={}, activity={}, sub='', + def __init__(self, jid='', name='', groups=[], show='', status='', sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, chatstate=None, last_status_time=None, msg_id = None, composing_jep = None): self.jid = jid @@ -26,8 +26,8 @@ self.groups = groups self.show = show self.status = status - self.mood = mood - self.activity = activity + self.mood = dict() + self.activity = dict() self.sub = sub self.ask = ask self.resource = resource @@ -141,19 +141,17 @@ del self._gc_contacts[account] del self._metacontacts_tags[account] - def create_contact(self, jid='', name='', groups=[], show='', status='', mood={}, activity={}, + def create_contact(self, jid='', name='', groups=[], show='', status='', sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, chatstate=None, last_status_time=None, composing_jep=None): - return Contact(jid, name, groups, show, status, mood, - activity, sub, ask, resource, + return Contact(jid, name, groups, show, status, sub, ask, resource, priority, keyID, our_chatstate, chatstate, last_status_time, composing_jep) def copy_contact(self, contact): return self.create_contact(jid = contact.jid, name = contact.name, groups = contact.groups, show = contact.show, status = - contact.status, mood = contact.mood, activity = - contact.activity, sub = contact.sub, ask = contact.ask, resource = contact.resource, + contact.status, sub = contact.sub, ask = contact.ask, resource = contact.resource, priority = contact.priority, keyID = contact.keyID, our_chatstate = contact.our_chatstate, chatstate = contact.chatstate, last_status_time = contact.last_status_time) Modified: branches/pep/src/common/pep.py =================================================================== --- branches/pep/src/common/pep.py 2007-03-29 19:04:14 UTC (rev 8037) +++ branches/pep/src/common/pep.py 2007-03-29 19:40:50 UTC (rev 8038) @@ -3,6 +3,7 @@ def user_mood(items, name, jid): (user, resource) = gajim.get_room_and_nick_from_fjid(jid) + print 'User: %s, Resource: %s' % (user, resource) contacts = gajim.contacts.get_contact(name, user, resource=resource) for item in items.getTags('item'): child = item.getTag('mood')

1 0

[commit-gajim] r8037 - in branches/pep/src: . common
by doomhammer＠gajim.org 29 Mar '07

29 Mar '07

Author: doomhammer Date: 2007-03-29 21:04:14 +0200 (Thu, 29 Mar 2007) New Revision: 8037 Modified: branches/pep/src/common/connection_handlers.py branches/pep/src/common/contacts.py branches/pep/src/common/pep.py branches/pep/src/tooltips.py Log: Buggy. Don\'t touch Modified: branches/pep/src/common/connection_handlers.py =================================================================== --- branches/pep/src/common/connection_handlers.py 2007-03-28 21:18:16 UTC (rev 8036) +++ branches/pep/src/common/connection_handlers.py 2007-03-29 19:04:14 UTC (rev 8037) @@ -717,7 +717,6 @@ iq = iq_obj.buildReply('result') q = iq.getTag('query') if node: - print node q.setAttr('node', node) q.addChild('identity', attrs = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}) @@ -1512,7 +1511,7 @@ ''' Called when we receive <message/> with pubsub event. ''' # TODO: Logging? (actually services where logging would be useful, should # TODO: allow to access archives remotely...) - jid = msg.getAttr('from') + jid = helpers.get_jid_from_iq(msg) event = msg.getTag('event') # XEP-0107: User Mood Modified: branches/pep/src/common/contacts.py =================================================================== --- branches/pep/src/common/contacts.py 2007-03-28 21:18:16 UTC (rev 8036) +++ branches/pep/src/common/contacts.py 2007-03-29 19:04:14 UTC (rev 8037) @@ -18,7 +18,7 @@ class Contact: '''Information concerning each contact''' - def __init__(self, jid='', name='', groups=[], show='', status='', mood='', activity='', sub='', + def __init__(self, jid='', name='', groups=[], show='', status='', mood={}, activity={}, sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, chatstate=None, last_status_time=None, msg_id = None, composing_jep = None): self.jid = jid @@ -141,7 +141,7 @@ del self._gc_contacts[account] del self._metacontacts_tags[account] - def create_contact(self, jid='', name='', groups=[], show='', status='', mood='', activity='', + def create_contact(self, jid='', name='', groups=[], show='', status='', mood={}, activity={}, sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, chatstate=None, last_status_time=None, composing_jep=None): return Contact(jid, name, groups, show, status, mood, Modified: branches/pep/src/common/pep.py =================================================================== --- branches/pep/src/common/pep.py 2007-03-28 21:18:16 UTC (rev 8036) +++ branches/pep/src/common/pep.py 2007-03-29 19:04:14 UTC (rev 8037) @@ -1,17 +1,19 @@ from common import gajim +#from common import helpers def user_mood(items, name, jid): - contacts = gajim.contacts.get_contact(name, jid) + (user, resource) = gajim.get_room_and_nick_from_fjid(jid) + contacts = gajim.contacts.get_contact(name, user, resource=resource) for item in items.getTags('item'): child = item.getTag('mood') if child is not None: for ch in child.getChildren(): if ch.getName() != 'text': for contact in contacts: - contact.mood = ch.getName() + contact.mood['mood'] = ch.getName() else: for contact in contacts: - contact.mood_text = ch.getData() + contact.mood['text'] = ch.getData() def user_tune(items, name, jid): pass @@ -20,14 +22,18 @@ pass def user_activity(items, name, jid): - contacts = gajim.contacts.get_contact(name, jid) + (user, resource) = gajim.get_room_and_nick_from_fjid(jid) + contacts = gajim.contacts.get_contact(name, user, resource=resource) for item in items.getTags('item'): child = item.getTag('activity') if child is not None: for ch in child.getChildren(): if ch.getName() != 'text': for contact in contacts: - contact.activity = ch.getName() + contact.activity['activity'] = ch.getName() + for chi in ch.getChildren(): + for contact in contacts: + contact.activity['subactivity'] = chi.getName() else: for contact in contacts: - contact.activity_text = ch.getData() + contact.activity['text'] = ch.getData() Modified: branches/pep/src/tooltips.py =================================================================== --- branches/pep/src/tooltips.py 2007-03-28 21:18:16 UTC (rev 8036) +++ branches/pep/src/tooltips.py 2007-03-29 19:04:14 UTC (rev 8037) @@ -478,17 +478,27 @@ show = '' + show + '' # we append show below - if contact.mood: - mood = contact.mood.strip() - mood_text = contact.mood_text.strip() + if contact.mood.has_key('mood'): + mood = contact.mood['mood'].strip() + if contact.mood.has_key('text'): + mood_text = contact.mood['text'].strip() + else: + mood_text = '' if mood: - properties.append(('%s: %s' % (mood, mood_text), None)) + properties.append(('Mood: %s (%s)' % (mood, mood_text), None)) - if contact.activity: - activity = contact.activity.strip() - activity_text = contact.activity_text.strip() - if activity: - properties.append(('%s: %s' % (activity, activity_text), None)) + if contact.activity.has_key('activity'): + activity = contact.activity['activity'].strip() + activity_string = 'Activity: %s' % activity + if contact.activity.has_key('subactivity'): + activity_sub = contact.activity['subactivity'].strip() + activity_string += ' (%s)' % activity_sub + else: + activity_string += '' + if contact.activity.has_key('text'): + activity_text = contact.activity['text'].strip() + activity_string += ' (%s)' % activity_text + properties.append((activity_string, None)) if contact.status: status = contact.status.strip()

1 0

[commit-gajim] r8036 - in branches/pep/src: . common common/xmpp
by doomhammer＠gajim.org 28 Mar '07

28 Mar '07

Author: doomhammer Date: 2007-03-28 23:18:16 +0200 (Wed, 28 Mar 2007) New Revision: 8036 Modified: branches/pep/src/common/connection_handlers.py branches/pep/src/common/contacts.py branches/pep/src/common/pep.py branches/pep/src/common/xmpp/protocol.py branches/pep/src/tooltips.py Log: Lame Mood and Activity support. Announcing caps. Modified: branches/pep/src/common/connection_handlers.py =================================================================== --- branches/pep/src/common/connection_handlers.py 2007-03-28 19:59:51 UTC (rev 8035) +++ branches/pep/src/common/connection_handlers.py 2007-03-28 21:18:16 UTC (rev 8036) @@ -717,6 +717,7 @@ iq = iq_obj.buildReply('result') q = iq.getTag('query') if node: + print node q.setAttr('node', node) q.addChild('identity', attrs = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}) @@ -732,6 +733,12 @@ q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC}) q.addChild('feature', attrs = {'var': common.xmpp.NS_COMMANDS}) q.addChild('feature', attrs = {'var': common.xmpp.NS_DISCO_INFO}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_ACTIVITY}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_ACTIVITY + '+notify'}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_TUNE}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_TUNE + '+notify'}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_MOOD}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_MOOD + '+notify'}) if (node is None or extension == 'cstates') and gajim.config.get('outgoing_chat_state_notifactions') != 'disabled': q.addChild('feature', attrs = {'var': common.xmpp.NS_CHATSTATES}) @@ -1509,14 +1516,17 @@ event = msg.getTag('event') # XEP-0107: User Mood - items = event.getTag('items', {'node': 'http://jabber.org/protocol/mood'}) + items = event.getTag('items', {'node': common.xmpp.NS_MOOD}) if items: pep.user_mood(items, self.name, jid) # XEP-0118: User Tune - items = event.getTag('items', {'node': 'http://jabber.org/protocol/tune'}) + items = event.getTag('items', {'node': common.xmpp.NS_TUNE}) if items: pep.user_tune(items, self.name, jid) # XEP-0080: User Geolocation - items = event.getTag('items', {'node': 'http://jabber.org/protocol/geoloc'}) + items = event.getTag('items', {'node': common.xmpp.NS_GEOLOC}) if items: pep.user_geoloc(items, self.name, jid) + # XEP-0108: User Activity + items = event.getTag('items', {'node': common.xmpp.NS_ACTIVITY}) + if items: pep.user_activity(items, self.name, jid) items = event.getTag('items') if items is None: return Modified: branches/pep/src/common/contacts.py =================================================================== --- branches/pep/src/common/contacts.py 2007-03-28 19:59:51 UTC (rev 8035) +++ branches/pep/src/common/contacts.py 2007-03-28 21:18:16 UTC (rev 8036) @@ -18,7 +18,7 @@ class Contact: '''Information concerning each contact''' - def __init__(self, jid='', name='', groups=[], show='', status='', mood='', sub='', + def __init__(self, jid='', name='', groups=[], show='', status='', mood='', activity='', sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, chatstate=None, last_status_time=None, msg_id = None, composing_jep = None): self.jid = jid @@ -27,6 +27,7 @@ self.show = show self.status = status self.mood = mood + self.activity = activity self.sub = sub self.ask = ask self.resource = resource @@ -140,18 +141,19 @@ del self._gc_contacts[account] del self._metacontacts_tags[account] - def create_contact(self, jid='', name='', groups=[], show='', status='', mood='', + def create_contact(self, jid='', name='', groups=[], show='', status='', mood='', activity='', sub='', ask='', resource='', priority=0, keyID='', our_chatstate=None, chatstate=None, last_status_time=None, composing_jep=None): - return Contact(jid, name, groups, show, status, mood, sub, ask, resource, + return Contact(jid, name, groups, show, status, mood, + activity, sub, ask, resource, priority, keyID, our_chatstate, chatstate, last_status_time, composing_jep) def copy_contact(self, contact): return self.create_contact(jid = contact.jid, name = contact.name, groups = contact.groups, show = contact.show, status = - contact.status, mood = contact.mood, - sub = contact.sub, ask = contact.ask, resource = contact.resource, + contact.status, mood = contact.mood, activity = + contact.activity, sub = contact.sub, ask = contact.ask, resource = contact.resource, priority = contact.priority, keyID = contact.keyID, our_chatstate = contact.our_chatstate, chatstate = contact.chatstate, last_status_time = contact.last_status_time) Modified: branches/pep/src/common/pep.py =================================================================== --- branches/pep/src/common/pep.py 2007-03-28 19:59:51 UTC (rev 8035) +++ branches/pep/src/common/pep.py 2007-03-28 21:18:16 UTC (rev 8036) @@ -18,3 +18,16 @@ def user_geoloc(items, name, jid): pass + +def user_activity(items, name, jid): + contacts = gajim.contacts.get_contact(name, jid) + for item in items.getTags('item'): + child = item.getTag('activity') + if child is not None: + for ch in child.getChildren(): + if ch.getName() != 'text': + for contact in contacts: + contact.activity = ch.getName() + else: + for contact in contacts: + contact.activity_text = ch.getData() Modified: branches/pep/src/common/xmpp/protocol.py =================================================================== --- branches/pep/src/common/xmpp/protocol.py 2007-03-28 19:59:51 UTC (rev 8035) +++ branches/pep/src/common/xmpp/protocol.py 2007-03-28 21:18:16 UTC (rev 8036) @@ -27,11 +27,14 @@ NS_AMP ='http://jabber.org/protocol/amp' NS_AMP_ERRORS =NS_AMP+'#errors' NS_AUTH ='jabber:iq:auth' +NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind' NS_BROWSE ='jabber:iq:browse' +NS_BROWSING ='http://jabber.org/protocol/browsing' # XEP-0195 NS_BYTESTREAM ='http://jabber.org/protocol/bytestreams' # JEP-0065 NS_CAPS ='http://jabber.org/protocol/caps' # JEP-0115 NS_CHATSTATES ='http://jabber.org/protocol/chatstates' # JEP-0085 +NS_CHATTING ='http://jabber.org/protocol/chatting' # XEP-0194 NS_CLIENT ='jabber:client' NS_COMMANDS ='http://jabber.org/protocol/commands' NS_COMPONENT_ACCEPT='jabber:component:accept' @@ -48,6 +51,7 @@ NS_EVENT ='jabber:x:event' # JEP-0022 NS_FEATURE ='http://jabber.org/protocol/feature-neg' NS_FILE ='http://jabber.org/protocol/si/profile/file-transfer' # JEP-0096 +NS_GAMING ='http://jabber.org/protocol/gaming' # XEP-0196 NS_GEOLOC ='http://jabber.org/protocol/geoloc' # JEP-0080 NS_GROUPCHAT ='gc-1.0' NS_HTTP_AUTH ='http://jabber.org/protocol/http-auth' # JEP-0070 @@ -87,12 +91,14 @@ NS_TIME ='jabber:iq:time' # JEP-0900 NS_TIME_REVISED ='http://www.xmpp.org/extensions/xep-0202.html#ns' # JEP-0202 NS_TLS ='urn:ietf:params:xml:ns:xmpp-tls' +NS_TUNE ='http://jabber.org/protocol/tune' # XEP-0118 NS_VACATION ='http://jabber.org/protocol/vacation' NS_VCARD ='vcard-temp' NS_GMAILNOTIFY ='google:mail:notify' NS_GTALKSETTING ='google:setting' NS_VCARD_UPDATE =NS_VCARD+':x:update' NS_VERSION ='jabber:iq:version' +NS_VIEWING ='http://jabber.org/protocol/viewing' # XEP--197 NS_PING ='urn:xmpp:ping' # XEP-0199 NS_WAITINGLIST ='http://jabber.org/protocol/waitinglist' # JEP-0130 NS_XHTML_IM ='http://jabber.org/protocol/xhtml-im' # JEP-0071 Modified: branches/pep/src/tooltips.py =================================================================== --- branches/pep/src/tooltips.py 2007-03-28 19:59:51 UTC (rev 8035) +++ branches/pep/src/tooltips.py 2007-03-28 21:18:16 UTC (rev 8036) @@ -482,9 +482,14 @@ mood = contact.mood.strip() mood_text = contact.mood_text.strip() if mood: - #print mood properties.append(('%s: %s' % (mood, mood_text), None)) + if contact.activity: + activity = contact.activity.strip() + activity_text = contact.activity_text.strip() + if activity: + properties.append(('%s: %s' % (activity, activity_text), None)) + if contact.status: status = contact.status.strip() if status:

1 0

[commit-gajim] r8035 - trunk/src/common
by asterix＠gajim.org 28 Mar '07

28 Mar '07

Author: asterix Date: 2007-03-28 21:59:51 +0200 (Wed, 28 Mar 2007) New Revision: 8035 Modified: trunk/src/common/connection.py Log: use templte on resource only if a resource is set. fix a TB Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-28 14:28:03 UTC (rev 8034) +++ trunk/src/common/connection.py 2007-03-28 19:59:51 UTC (rev 8035) @@ -78,9 +78,10 @@ self.password = passwords.get_password(name) self.server_resource = gajim.config.get_per('accounts', name, 'resource') # All valid resource substitution strings should be added to this hash. - self.server_resource = Template(self.server_resource).safe_substitute({ - 'hostname': socket.gethostname() - }) + if self.server_resource: + self.server_resource = Template(self.server_resource).safe_substitute({ + 'hostname': socket.gethostname() + }) if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): self.keepalives = gajim.config.get_per('accounts', self.name,'keep_alive_every_foo_secs') else:

1 0

[commit-gajim] r8034 - trunk/src/common
by asterix＠gajim.org 28 Mar '07

28 Mar '07

Author: asterix Date: 2007-03-28 16:28:03 +0200 (Wed, 28 Mar 2007) New Revision: 8034 Modified: trunk/src/common/connection.py Log: re-add missing variable Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-28 14:25:47 UTC (rev 8033) +++ trunk/src/common/connection.py 2007-03-28 14:28:03 UTC (rev 8034) @@ -448,6 +448,7 @@ self._register_handlers(con, con_type) name = gajim.config.get_per('accounts', self.name, 'name') + hostname = gajim.config.get_per('accounts', self.name, 'hostname') self.connection = con fpr_good = self._check_fingerprint(con, con_type)

1 0

[commit-gajim] r8033 - trunk/src/common
by asterix＠gajim.org 28 Mar '07

28 Mar '07

Author: asterix Date: 2007-03-28 16:25:47 +0200 (Wed, 28 Mar 2007) New Revision: 8033 Modified: trunk/src/common/connection.py Log: substitute $hostname in resource by hostname of the machine. fixes #3060 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-28 14:20:50 UTC (rev 8032) +++ trunk/src/common/connection.py 2007-03-28 14:25:47 UTC (rev 8033) @@ -17,9 +17,9 @@ ## GNU General Public License for more details. ## - import os import random +import socket try: randomsource = random.SystemRandom() @@ -42,6 +42,7 @@ from common.rst_xhtml_generator import create_xhtml +from string import Template import logging log = logging.getLogger('gajim.c.connection') @@ -76,6 +77,10 @@ self.last_history_line = {} self.password = passwords.get_password(name) self.server_resource = gajim.config.get_per('accounts', name, 'resource') + # All valid resource substitution strings should be added to this hash. + self.server_resource = Template(self.server_resource).safe_substitute({ + 'hostname': socket.gethostname() + }) if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): self.keepalives = gajim.config.get_per('accounts', self.name,'keep_alive_every_foo_secs') else:

1 0

[commit-gajim] r8032 - in trunk/src: . common
by asterix＠gajim.org 28 Mar '07

28 Mar '07

Author: asterix Date: 2007-03-28 16:20:50 +0200 (Wed, 28 Mar 2007) New Revision: 8032 Modified: trunk/src/common/connection.py trunk/src/roster_window.py Log: cleanup connection.connect(). fixes #3061 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-03-26 20:31:24 UTC (rev 8031) +++ trunk/src/common/connection.py 2007-03-28 14:20:50 UTC (rev 8032) @@ -292,16 +292,13 @@ def connect(self, data = None): ''' Start a connection to the Jabber server. Returns connection, and connection type ('tls', 'ssl', 'tcp', '') - data MUST contain name, hostname, resource, usessl, proxy, - use_custom_host, custom_host (if use_custom_host), custom_port (if - use_custom_host), ''' + data MUST contain hostname, usessl, proxy, use_custom_host, + custom_host (if use_custom_host), custom_port (if use_custom_host)''' if self.connection: return self.connection, '' if data: - name = data['name'] hostname = data['hostname'] - resource = data['resource'] usessl = data['usessl'] self.try_connecting_for_foo_secs = 45 p = data['proxy'] @@ -311,9 +308,7 @@ custom_h = data['custom_host'] custom_p = data['custom_port'] else: - name = gajim.config.get_per('accounts', self.name, 'name') hostname = gajim.config.get_per('accounts', self.name, 'hostname') - resource = gajim.config.get_per('accounts', self.name, 'resource') usessl = gajim.config.get_per('accounts', self.name, 'usessl') self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') @@ -324,7 +319,7 @@ custom_h = gajim.config.get_per('accounts', self.name, 'custom_host') custom_p = gajim.config.get_per('accounts', self.name, 'custom_port') - #create connection if it doesn't already exist + # create connection if it doesn't already exist self.connected = 1 if p and p in gajim.config.get_per('proxies'): proxy = {'host': gajim.config.get_per('proxies', p, 'host')} @@ -448,8 +443,6 @@ self._register_handlers(con, con_type) name = gajim.config.get_per('accounts', self.name, 'name') - hostname = gajim.config.get_per('accounts', self.name, 'hostname') - resource = gajim.config.get_per('accounts', self.name, 'resource') self.connection = con fpr_good = self._check_fingerprint(con, con_type) @@ -470,7 +463,7 @@ if fpr_good == True: log.info("Fingerprint found and matched for %s.", hostname) - con.auth(name, self.password, resource, 1, self.__on_auth) + con.auth(name, self.password, self.server_resource, 1, self.__on_auth) return True @@ -971,6 +964,7 @@ if self.connection: return self._hostname = config['hostname'] + self.server_resource = config['resource'] self.new_account_info = config self.name = name self.on_connect_success = self._on_new_account Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-03-26 20:31:24 UTC (rev 8031) +++ trunk/src/roster_window.py 2007-03-28 14:20:50 UTC (rev 8032) @@ -1327,8 +1327,7 @@ contact = gajim.contacts.create_contact(jid = jid, name = account_name, show = connection.get_status(), sub = '', status = connection.status, - resource = gajim.config.get_per('accounts', connection.name, - 'resource'), + resource = connection.server_resource, priority = connection.priority, keyID = gajim.config.get_per('accounts', connection.name, 'keyid')) @@ -2663,7 +2662,7 @@ gajim.connections[account].unsubscribe(contact.jid, remove_auth) for c in gajim.contacts.get_contact(account, contact.jid): self.remove_contact(c, account) - gajim.contacts.remove_jid(account, c.jid) + gajim.contacts.remove_jid(account, contact.jid) # redraw group rows for contact numbers for group in c.groups: self.draw_group(group, account)

1 0

[commit-gajim] r8031 - trunk/po
by asterix＠gajim.org 26 Mar '07

26 Mar '07

Author: asterix Date: 2007-03-26 22:31:24 +0200 (Mon, 26 Mar 2007) New Revision: 8031 Modified: trunk/po/fr.po Log: [kerneis] typo in french translation. fixes #3055 and #3056 Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2007-03-25 22:47:46 UTC (rev 8030) +++ trunk/po/fr.po 2007-03-26 20:31:24 UTC (rev 8031) @@ -1150,7 +1150,7 @@ #: ../data/glade/join_groupchat_window.glade.h:2 msgid "Join this room automatically when I connect" -msgstr "Joindre ce groupe de discution quand je me connecte" +msgstr "Joindre ce groupe de discussion quand je me connecte" #: ../data/glade/join_groupchat_window.glade.h:3 #: ../data/glade/manage_bookmarks_window.glade.h:4 @@ -2445,11 +2445,11 @@ #: ../src/chat_control.py:1263 msgid "Encryption enabled" -msgstr "Chiffrement activée" +msgstr "Chiffrement activé" #: ../src/chat_control.py:1268 msgid "Encryption disabled" -msgstr "Chiffrement désactivée" +msgstr "Chiffrement désactivé" #. add_to_roster_menuitem #: ../src/chat_control.py:1412 @@ -4218,7 +4218,7 @@ #: ../src/gajim-remote.py:244 msgid "room" -msgstr "groupe de discution" +msgstr "groupe de discussion" #: ../src/gajim-remote.py:245 msgid "nick"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2007