Commits June 2008

commits@gajim.org

7 participants
141 discussions

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

18 Jun '08

Author: bct Date: 2008-06-18 06:11:11 +0200 (Wed, 18 Jun 2008) New Revision: 9820 Modified: trunk/src/gajim.py Log: fix handle_event() for pms and new_chat_from_jid() for existing chat controls Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-17 19:27:32 UTC (rev 9819) +++ trunk/src/gajim.py 2008-06-18 04:11:11 UTC (rev 9820) @@ -2312,13 +2312,13 @@ event = gajim.events.get_first_event(account, jid, type_) if type_ == 'printed_pm': - session = event.parameters[0] + ctrl = event.parameters[0] elif type_ == 'pm': session = event.parameters[8] if session and session.control: ctrl = session.control - else: + elif not ctrl: room_jid = jid nick = resource gc_contact = gajim.contacts.get_gc_contact(account, room_jid, @@ -2723,19 +2723,19 @@ contact = self.roster.add_to_not_in_the_roster(account, jid, resource=resource) - session = gajim.connections[account].get_or_create_session(fjid, None) - - if not self.msg_win_mgr.has_window(fjid, account): - session.control = self.new_chat(contact, account, - resource=resource, session=session) + if self.msg_win_mgr.has_window(fjid, account): + ctrl = self.msg_win_mgr.get_chat_controls(fjid, account)[0] + else: + ctrl = self.new_chat(contact, account, + resource=resource) if len(gajim.events.get_events(account, fjid)): - session.control.read_queue() + ctrl.read_queue() - mw = session.control.parent_win - mw.set_active_tab(session.control) + mw = ctrl.parent_win + mw.set_active_tab(ctrl) # For JEP-0172 if added_to_roster: - session.control.user_nick = gajim.nicks[account] + ctrl.user_nick = gajim.nicks[account] def on_open_chat_window(self, widget, contact, account, resource=None, session=None):

1 0

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

17 Jun '08

Author: steve-e Date: 2008-06-17 21:27:32 +0200 (Tue, 17 Jun 2008) New Revision: 9819 Modified: trunk/src/gajim.py Log: Remove Non-ASCII character. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-17 19:25:17 UTC (rev 9818) +++ trunk/src/gajim.py 2008-06-17 19:27:32 UTC (rev 9819) @@ -1441,7 +1441,7 @@ contact.groups = groups or [] if re_add: self.roster.add_contact(jid, account) - # Refilter and update oĺd groups + # Refilter and update old groups for group in old_groups: self.roster.draw_group(group, account)

1 0

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

17 Jun '08

Author: steve-e Date: 2008-06-17 21:25:17 +0200 (Tue, 17 Jun 2008) New Revision: 9818 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Handle remote roster changes. * Don't traceback when another resource of us is moving contacts to new/different groups. * Always refilter all involved groups. * It is now possible to not update contacts severside when using add/remove_from_groups Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-17 18:17:30 UTC (rev 9817) +++ trunk/src/gajim.py 2008-06-17 19:25:17 UTC (rev 9818) @@ -1407,28 +1407,30 @@ ask = array[3] groups = array[4] contacts = gajim.contacts.get_contacts(account, jid) - # contact removes us. if (not sub or sub == 'none') and (not ask or ask == 'none') and \ not name and not groups: + # contact removes us. if contacts: - c = contacts[0] - self.roster.remove_contact(c.jid, account, backend = True) + self.roster.remove_contact(jid, account, backend = True) return elif not contacts: if sub == 'remove': return - # Add it to roster + # Add new contact to roster contact = gajim.contacts.create_contact(jid = jid, name = name, groups = groups, show = 'offline', sub = sub, ask = ask) gajim.contacts.add_contact(account, contact) self.roster.add_contact(jid, account) else: + # it is an existing contact that might has changed re_add = False - # if sub changed: remove and re-add, maybe observer status changed + # if sub or groups changed: remove and re-add + # Maybe observer status changed: # according to xep 0162, contact is not an observer anymore when # we asked him is auth, so also remove him if ask changed - if contacts[0].sub != sub or contacts[0].ask != ask: - self.roster.remove_contact(contacts[0].jid, account, force = True) + old_groups = contacts[0].get_shown_groups() + if contacts[0].sub != sub or contacts[0].ask != ask or old_groups != groups: + self.roster.remove_contact(jid, account) re_add = True for contact in contacts: if not name: @@ -1436,10 +1438,13 @@ contact.name = name contact.sub = sub contact.ask = ask - if groups: - contact.groups = groups + contact.groups = groups or [] if re_add: self.roster.add_contact(jid, account) + # Refilter and update oĺd groups + for group in old_groups: + self.roster.draw_group(group, account) + if self.remote_ctrl: self.remote_ctrl.raise_signal('RosterInfo', (account, array)) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-17 18:17:30 UTC (rev 9817) +++ trunk/src/roster_window.py 2008-06-17 19:25:17 UTC (rev 9818) @@ -765,7 +765,7 @@ self.remove_contact(jid, account, force = True, backend = True) return True - def add_contact_to_groups(self, jid, account, groups): + def add_contact_to_groups(self, jid, account, groups, update = True): '''Add contact to given groups and redraw them. Contact on server is updated too. When the contact has a family, @@ -775,6 +775,7 @@ jid -- the jid account -- the corresponding account groups -- list of Groups to add the contact to. + update -- update contact on the server ''' self.remove_contact(jid, account, force = True) @@ -783,15 +784,16 @@ if group not in contact.groups: # we might be dropped from meta to group contact.groups.append(group) - gajim.connections[account].update_contact(jid, contact.name, - contact.groups) + if update: + gajim.connections[account].update_contact(jid, contact.name, + contact.groups) self.add_contact(jid, account) for group in groups: self._adjust_group_expand_collapse_state(group, account) - def remove_contact_from_groups(self, jid, account, groups): + def remove_contact_from_groups(self, jid, account, groups, update = True): '''Remove contact from given groups and redraw them. Contact on server is updated too. When the contact has a family, @@ -801,6 +803,7 @@ jid -- the jid account -- the corresponding account groups -- list of Groups to remove the contact from + update -- update contact on the server ''' self.remove_contact(jid, account, force = True) @@ -809,11 +812,13 @@ if group in contact.groups: # Needed when we remove from "General" contact.groups.remove(group) - gajim.connections[account].update_contact(jid, contact.name, - contact.groups) + if update: + gajim.connections[account].update_contact(jid, contact.name, + contact.groups) self.add_contact(jid, account) - + + # Also redraw old groups for group in groups: self.draw_group(group, account)

1 0

[commit-gajim] r9817 - trunk/src/common
by js＠gajim.org 17 Jun '08

17 Jun '08

Author: js Date: 2008-06-17 20:17:30 +0200 (Tue, 17 Jun 2008) New Revision: 9817 Modified: trunk/src/common/connection_handlers.py Log: Use the namespace variable. Sorry, forgot to change that here. Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-06-17 18:13:23 UTC (rev 9816) +++ trunk/src/common/connection_handlers.py 2008-06-17 18:17:30 UTC (rev 9817) @@ -1695,9 +1695,10 @@ # TODO: We shouldn't answer if we're invisible! contact = gajim.contacts.get_contact(self.name, common.gajim.get_room_and_nick_from_fjid(frm)[0]) - if msg.getTag('request', namespace='urn:xmpp:receipts') and \ - gajim.config.get_per('accounts', self.name, 'answer_receipts') \ - and contact and contact.sub not in (u'to', u'none'): + if msg.getTag('request', namespace=common.xmpp.NS_RECEIPTS) \ + and gajim.config.get_per('accounts', self.name, + 'answer_receipts') and contact and contact.sub \ + not in (u'to', u'none'): receipt = common.xmpp.Message(to = jid, typ = 'chat') receipt.setID(msg.getID()) receipt.setTag('received',

1 0

[commit-gajim] r9816 - trunk/src/common/xmpp
by js＠gajim.org 17 Jun '08

17 Jun '08

Author: js Date: 2008-06-17 20:13:23 +0200 (Tue, 17 Jun 2008) New Revision: 9816 Modified: trunk/src/common/xmpp/protocol.py Log: Type in NS. Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-06-17 16:03:21 UTC (rev 9815) +++ trunk/src/common/xmpp/protocol.py 2008-06-17 18:13:23 UTC (rev 9816) @@ -111,7 +111,7 @@ NS_DATA_LAYOUT ='http://jabber.org/protocol/xdata-layout' # XEP-0141 NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate' # XEP-0122 NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams' -NS_RECEIPTS ='urn:xmpp:receipt' +NS_RECEIPTS ='urn:xmpp:receipts' xmpp_stream_error_conditions=""" bad-format -- -- -- The entity has sent XML that cannot be processed.

1 0

[commit-gajim] r9815 - in trunk/src/common: . xmpp
by js＠gajim.org 17 Jun '08

17 Jun '08

Author: js Date: 2008-06-17 18:03:21 +0200 (Tue, 17 Jun 2008) New Revision: 9815 Modified: trunk/src/common/config.py trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/contacts.py trunk/src/common/helpers.py trunk/src/common/xmpp/protocol.py Log: * Implemented XEP-0184 section 5. * Added NS_RECEIPTS to protocol namespace list. * Show our support of XEP-0184 in caps. * Added a big, fat warning to get_contact as this does not work as expected. * There was some strangeness in our XEP-0022, it added an id tag to the x tag, which isn't mentioned anywhere in the XEP. And for some strange reason, that id even was the same all the time. * Fixed a typo. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-06-17 05:39:20 UTC (rev 9814) +++ trunk/src/common/config.py 2008-06-17 16:03:21 UTC (rev 9815) @@ -311,7 +311,7 @@ 'zeroconf_jabber_id': [ opt_str, '', '', True ], 'zeroconf_email': [ opt_str, '', '', True ], 'use_env_http_proxy' : [opt_bool, False], - 'answer_receipt' : [opt_bool, True, _('Answer to receipt requests')], + 'answer_receipts' : [opt_bool, True, _('Answer to receipt requests')], 'request_receipt' : [opt_bool, True, _('Sent receipt requests')], 'publish_mood': [opt_bool, True], 'publish_activity': [opt_bool, True], Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-06-17 05:39:20 UTC (rev 9814) +++ trunk/src/common/connection.py 2008-06-17 16:03:21 UTC (rev 9815) @@ -1096,11 +1096,6 @@ # XEP-0022 chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT) - if not msgtxt: # when no <body>, add <id> - if not msg_id: # avoid putting 'None' in <id> tag - msg_id = '' - chatstate_node.setTagData('id', msg_id) - # when msgtxt, requests XEP-0022 composing notification if chatstate is 'composing' or msgtxt: chatstate_node.addChild(name = 'composing') @@ -1110,12 +1105,20 @@ addresses.addChild('address', attrs = {'type': 'ofrom', 'jid': forward_from}) - # TODO: We should also check if the other end supports it - # as XEP 0184 says checking is a SHOULD. Maybe we should - # implement section 6 of the XEP as well? + # XEP-0184 + if resource: + contact = gajim.contacts.get_contact(self.name, jid, + resource) + else: + contact = gajim.contacts. \ + get_contact_with_highest_priority(self.name, + jid) if msgtxt and gajim.config.get_per('accounts', self.name, - 'request_receipt'): - msg_iq.setTag('request', namespace='urn:xmpp:receipts') + 'request_receipt') and common.xmpp.NS_RECEIPTS in \ + gajim.capscache[(contact.caps_hash_method, + contact.caps_hash)].features: + msg_iq.setTag('request', + namespace=common.xmpp.NS_RECEIPTS) if session: # XEP-0201 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-06-17 05:39:20 UTC (rev 9814) +++ trunk/src/common/connection_handlers.py 2008-06-17 16:03:21 UTC (rev 9815) @@ -1693,11 +1693,11 @@ # Receipt requested # TODO: We shouldn't answer if we're invisible! - cont = gajim.contacts.get_contact(self.name, + contact = gajim.contacts.get_contact(self.name, common.gajim.get_room_and_nick_from_fjid(frm)[0]) if msg.getTag('request', namespace='urn:xmpp:receipts') and \ - gajim.config.get_per('accounts', self.name, 'answer_receipt') \ - and cont and cont.sub not in (u'to', u'none'): + gajim.config.get_per('accounts', self.name, 'answer_receipts') \ + and contact and contact.sub not in (u'to', u'none'): receipt = common.xmpp.Message(to = jid, typ = 'chat') receipt.setID(msg.getID()) receipt.setTag('received', Modified: trunk/src/common/contacts.py =================================================================== --- trunk/src/common/contacts.py 2008-06-17 05:39:20 UTC (rev 9814) +++ trunk/src/common/contacts.py 2008-06-17 16:03:21 UTC (rev 9815) @@ -248,6 +248,11 @@ return [] def get_contact(self, account, jid, resource = None): + ### WARNING ### + # This function returns a *RANDOM* resource if resource = None! + # Do *NOT* use if you need to get the contact to which you + # send a message for example, as a bare JID in Jabber means + # highest available resource, which this function ignores! '''Returns the contact instance for the given resource if it's given else the first contact is no resource is given or None if there is not''' if jid in self._contacts[account]: Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-06-17 05:39:20 UTC (rev 9814) +++ trunk/src/common/helpers.py 2008-06-17 16:03:21 UTC (rev 9815) @@ -1346,6 +1346,8 @@ gajim.gajim_optional_features[a].append(xmpp.NS_XHTML_IM) if gajim.HAVE_PYCRYPTO: gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION_INIT) + if gajim.config.get_per('accounts', a, 'answer_receipts'): + gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS) gajim.caps_hash[a] = compute_caps_hash([gajim.gajim_identity], gajim.gajim_common_features + gajim.gajim_optional_features[a]) # re-send presence with new hash Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-06-17 05:39:20 UTC (rev 9814) +++ trunk/src/common/xmpp/protocol.py 2008-06-17 16:03:21 UTC (rev 9815) @@ -111,6 +111,7 @@ NS_DATA_LAYOUT ='http://jabber.org/protocol/xdata-layout' # XEP-0141 NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate' # XEP-0122 NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams' +NS_RECEIPTS ='urn:xmpp:receipt' xmpp_stream_error_conditions=""" bad-format -- -- -- The entity has sent XML that cannot be processed.

1 0

[commit-gajim] r9814 - trunk/src
by asterix＠gajim.org 17 Jun '08

17 Jun '08

Author: asterix Date: 2008-06-17 07:39:20 +0200 (Tue, 17 Jun 2008) New Revision: 9814 Modified: trunk/src/gajim.py Log: fix traceback when no control is opened. fixes #4024, #4028 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-17 03:27:54 UTC (rev 9813) +++ trunk/src/gajim.py 2008-06-17 05:39:20 UTC (rev 9814) @@ -2749,7 +2749,9 @@ win = self.msg_win_mgr.get_window(fjid, account) if win: - ctrl = win.get_controls(fjid, account)[0] + ctrls = win.get_controls(fjid, account) + if ctrls: + ctrl = ctrls[0] if not ctrl: ctrl = self.new_chat(contact, account,

1 0

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

17 Jun '08

Author: bct Date: 2008-06-17 05:27:54 +0200 (Tue, 17 Jun 2008) New Revision: 9813 Modified: trunk/src/gajim.py Log: fix undefined variables in handle_event() Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-06-16 14:12:59 UTC (rev 9812) +++ trunk/src/gajim.py 2008-06-17 03:27:54 UTC (rev 9813) @@ -2240,11 +2240,14 @@ def handle_event(self, account, fjid, type_): w = None + ctrl = None + session = None + resource = gajim.get_resource_from_jid(fjid) jid = gajim.get_jid_without_resource(fjid) + if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): w = self.msg_win_mgr.get_window(jid, account) - ctrl = None if self.minimized_controls[account].has_key(jid): if not w: ctrl = self.minimized_controls[account][jid] @@ -2269,8 +2272,6 @@ ctrl = session.control if type_ == '' and self.msg_win_mgr.has_window(fjid, account): - # assume that the most recently updated control we have for this party - # is the one that this event was in ctrl = self.msg_win_mgr.get_chat_controls(fjid, account)[0] elif not ctrl: highest_contact = gajim.contacts.get_contact_with_highest_priority( @@ -2305,8 +2306,6 @@ if not event: event = gajim.events.get_first_event(account, jid, type_) - session = None - if type_ == 'printed_pm': session = event.parameters[0] elif type_ == 'pm':

1 0

[commit-gajim] r9812 - trunk/src/common/xmpp
by asterix＠gajim.org 16 Jun '08

16 Jun '08

Author: asterix Date: 2008-06-16 16:12:59 +0200 (Mon, 16 Jun 2008) New Revision: 9812 Modified: trunk/src/common/xmpp/transports_nb.py Log: use SSLv23 method (it support SSLv2, v3 and TLSv1) instead of only TLSv1 method as some server (gmail) don't support TLSv1 method. fixes #3786 Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2008-06-16 12:56:16 UTC (rev 9811) +++ trunk/src/common/xmpp/transports_nb.py 2008-06-16 14:12:59 UTC (rev 9812) @@ -758,8 +758,10 @@ log.debug("_startSSL_pyOpenSSL called") tcpsock = self._owner.Connection # FIXME: should method be configurable? - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) - #tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) + # Some gmail server don't support TLSv1, but only SSLv3, so use method + # that allow SSLv2, v3 and TLSv1 + #tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) + tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem')

1 0

[commit-gajim] r9811 - trunk/src
by asterix＠gajim.org 16 Jun '08

16 Jun '08

Author: asterix Date: 2008-06-16 14:56:16 +0200 (Mon, 16 Jun 2008) New Revision: 9811 Modified: trunk/src/chat_control.py Log: don't allow /ping command for zeroconf account. Fixes #3685 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-06-16 09:51:03 UTC (rev 9810) +++ trunk/src/chat_control.py 2008-06-16 12:56:16 UTC (rev 9811) @@ -1420,7 +1420,11 @@ return True elif command == 'ping': if not len(message_array): - gajim.connections[self.account].sendPing(self.contact) + if self.account == gajim.ZEROCONF_ACC_NAME: + self.print_conversation( + _('Command not supported for zeroconf account.'), 'info') + else: + gajim.connections[self.account].sendPing(self.contact) else: self.get_command_help(command) self.clear(self.msg_textview)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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