Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8655 - branches/gajim_0.11.1/src/common/zeroconf
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:09:52 +0200 (Fri, 31 Aug 2007) New Revision: 8655 Modified: branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py Log: don't send SASL feature in zeroconf, we don't support it Modified: branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py 2007-08-31 08:08:31 UTC (rev 8654) +++ branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py 2007-08-31 08:09:52 UTC (rev 8655) @@ -195,8 +195,6 @@ if attrs.has_key('version') and attrs['version'] == '1.0': # other part supports stream features features = Node('stream:features') - features.T.mechanisms.setNamespace(NS_SASL) - features.T.mechanisms.NT.mechanism = 'PLAIN' self.Dispatcher.send(features) while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0)

1 0

[commit-gajim] r8654 - branches/gajim_0.11.1/src
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:08:31 +0200 (Fri, 31 Aug 2007) New Revision: 8654 Modified: branches/gajim_0.11.1/src/roster_window.py Log: always open chat window when we do middle click on a contact Modified: branches/gajim_0.11.1/src/roster_window.py =================================================================== --- branches/gajim_0.11.1/src/roster_window.py 2007-08-31 08:03:36 UTC (rev 8653) +++ branches/gajim_0.11.1/src/roster_window.py 2007-08-31 08:08:31 UTC (rev 8654) @@ -2599,7 +2599,7 @@ self.tree.get_selection().select_path(path) type_ = model[path][C_TYPE] if type_ in ('agent', 'contact', 'self_contact'): - self.on_roster_treeview_row_activated(widget, path) + self.on_row_activated(widget, path) elif type_ == 'account': account = model[path][C_ACCOUNT].decode('utf-8') if account != 'all':

1 0

[commit-gajim] r8653 - branches/gajim_0.11.1/src/common/zeroconf
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:03:36 +0200 (Fri, 31 Aug 2007) New Revision: 8653 Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py Log: try to fix zeroconf reconection. see #3076 Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 08:00:26 UTC (rev 8652) +++ branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 08:03:36 UTC (rev 8653) @@ -131,8 +131,8 @@ self.time_to_reconnect = None gajim.log.debug('reconnect') - signed = self.get_signed_msg(self.status) - self.reconnect() +# signed = self.get_signed_msg(self.status) + self.connect(self.old_show, self.status) def quit(self, kill_core): if kill_core and self.connected > 1:

1 0

[commit-gajim] r8652 - branches/gajim_0.11.1/src/common/zeroconf
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 10:00:26 +0200 (Fri, 31 Aug 2007) New Revision: 8652 Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py Log: fix TB. fixes #3076 Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 07:57:39 UTC (rev 8651) +++ branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 08:00:26 UTC (rev 8652) @@ -204,7 +204,6 @@ def _disconnectedReconnCB(self): '''Called when we are disconnected. Comes from network manager for example we don't try to reconnect, network manager will tell us when we can''' - log.debug('disconnectedReconnCB') if gajim.account_is_connected(self.name): # we cannot change our status to offline or connecting # after we auth to server

1 0

[commit-gajim] r8651 - branches/gajim_0.11.1/src/common/zeroconf
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 09:57:39 +0200 (Fri, 31 Aug 2007) New Revision: 8651 Modified: branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py Log: send stream:features in zeroconf network, and send stanza only when other part reply to stream initialization. fixes #3057 Modified: branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py 2007-08-31 07:56:38 UTC (rev 8650) +++ branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py 2007-08-31 07:57:39 UTC (rev 8651) @@ -158,10 +158,6 @@ self.Connection.PlugIn(self) dispatcher_nb.Dispatcher().PlugIn(self) self._register_handlers() - if self.sock_type == TYPE_CLIENT: - while self.stanzaqueue: - stanza, is_message = self.stanzaqueue.pop(0) - self.send(stanza, is_message) def StreamInit(self): ''' Send an initial stream header. ''' @@ -178,7 +174,6 @@ def send_stream_header(self): self.Dispatcher._metastream = Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) - # XXX TLS support self.Dispatcher._metastream.setAttr('version', '1.0') self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) @@ -197,9 +192,19 @@ if attrs.has_key('from'): self.to = attrs['from'] self.send_stream_header() + if attrs.has_key('version') and attrs['version'] == '1.0': + # other part supports stream features + features = Node('stream:features') + features.T.mechanisms.setNamespace(NS_SASL) + features.T.mechanisms.NT.mechanism = 'PLAIN' + self.Dispatcher.send(features) while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0) self.send(stanza, is_message) + elif self.sock_type == TYPE_CLIENT: + while self.stanzaqueue: + stanza, is_message = self.stanzaqueue.pop(0) + self.send(stanza, is_message) def on_disconnect(self):

1 0

[commit-gajim] r8650 - branches/gajim_0.11.1/src/common/zeroconf
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 09:56:38 +0200 (Fri, 31 Aug 2007) New Revision: 8650 Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py Log: fix reconnect feature with zeroconf. fixes #3068 and #3076 Modified: branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 07:53:01 UTC (rev 8649) +++ branches/gajim_0.11.1/src/common/zeroconf/connection_zeroconf.py 2007-08-31 07:56:38 UTC (rev 8650) @@ -64,7 +64,7 @@ self.call_resolve_timeout = False - #self.time_to_reconnect = None + self.time_to_reconnect = None #self.new_account_info = None self.bookmarks = [] @@ -127,6 +127,8 @@ gajim.handlers[event](self.name, data) def _reconnect(self): + # Do not try to reco while we are already trying + self.time_to_reconnect = None gajim.log.debug('reconnect') signed = self.get_signed_msg(self.status) @@ -199,6 +201,20 @@ self.status = 'offline' self.disconnect() + def _disconnectedReconnCB(self): + '''Called when we are disconnected. Comes from network manager for example + we don't try to reconnect, network manager will tell us when we can''' + log.debug('disconnectedReconnCB') + if gajim.account_is_connected(self.name): + # we cannot change our status to offline or connecting + # after we auth to server + self.old_show = STATUS_LIST[self.connected] + self.connected = 0 + self.dispatch('STATUS', 'offline') + # random number to show we wait network manager to send us a reconenct + self.time_to_reconnect = 5 + self.on_purpose = False + def _on_name_conflictCB(self, alt_name): self.disconnect() self.dispatch('STATUS', 'offline') @@ -300,6 +316,7 @@ # 'disconnect' elif show == 'offline' and self.connected: self.disconnect() + self.time_to_reconnect = None # update status elif show != 'offline' and self.connected:

1 0

[commit-gajim] r8649 - branches/gajim_0.11.1/src/common/zeroconf
by asterix＠gajim.org 31 Aug '07

31 Aug '07

Author: asterix Date: 2007-08-31 09:53:01 +0200 (Fri, 31 Aug 2007) New Revision: 8649 Modified: branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py Log: fix the to attribute of stream initiation in zeroconf network. see #3057 Modified: branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py =================================================================== --- branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py 2007-08-30 21:43:49 UTC (rev 8648) +++ branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py 2007-08-31 07:53:01 UTC (rev 8649) @@ -179,10 +179,11 @@ self.Dispatcher._metastream = Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) # XXX TLS support - #~ self._metastream.setAttr('version', '1.0') + self.Dispatcher._metastream.setAttr('version', '1.0') self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) - self.Dispatcher._metastream.setAttr('to', self.to) + if self.to: + self.Dispatcher._metastream.setAttr('to', self.to) self.Dispatcher.send("<?xml version='1.0'?>%s>" % str(self.Dispatcher._metastream)[:-2]) def _check_stream_start(self, ns, tag, attrs): @@ -193,6 +194,8 @@ self.Connection.disconnect() return if self.sock_type == TYPE_SERVER: + if attrs.has_key('from'): + self.to = attrs['from'] self.send_stream_header() while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0)

1 0

[commit-gajim] r8648 - trunk/src
by asterix＠gajim.org 30 Aug '07

30 Aug '07

Author: asterix Date: 2007-08-30 23:43:49 +0200 (Thu, 30 Aug 2007) New Revision: 8648 Modified: trunk/src/roster_window.py Log: get session from event only for chat and normal event. in other events there is no session Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-30 21:14:03 UTC (rev 8647) +++ trunk/src/roster_window.py 2007-08-30 21:43:49 UTC (rev 8648) @@ -4265,7 +4265,8 @@ child_iter = model.iter_next(child_iter) session = None if first_ev: - session = first_ev.parameters[8] + if first_ev.type_ in ('chat', 'normal'): + session = first_ev.parameters[8] fjid = jid if resource: fjid += '/' + resource

1 0

[commit-gajim] r8647 - branches/gajim_0.11.1/src
by roidelapluie＠gajim.org 30 Aug '07

30 Aug '07

Author: roidelapluie Date: 2007-08-30 23:14:03 +0200 (Thu, 30 Aug 2007) New Revision: 8647 Modified: branches/gajim_0.11.1/src/gajim.py Log: 0.11.2: really take nick from FN field Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-30 21:13:12 UTC (rev 8646) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-30 21:14:03 UTC (rev 8647) @@ -904,14 +904,10 @@ def handle_event_myvcard(self, account, array): nick = '' - if array.has_key('NICKNAME'): - nick = array['NICKNAME'] - if nick: - gajim.nicks[account] = nick - if not gajim.nicks[account] and array.has_key('FN'): - nick = array['FN'] - if nick: - gajim.nicks[account] = nick + if array.has_key('NICKNAME') and array['NICKNAME']: + gajim.nicks[account] = array['NICKNAME'] + elif array.has_key('FN') and array['FN']: + gajim.nicks[account] = array['FN'] if self.instances[account].has_key('profile'): win = self.instances[account]['profile'] win.set_values(array)

1 0

[commit-gajim] r8646 - branches/gajim_0.11.1/src
by roidelapluie＠gajim.org 30 Aug '07

30 Aug '07

Author: roidelapluie Date: 2007-08-30 23:13:12 +0200 (Thu, 30 Aug 2007) New Revision: 8646 Modified: branches/gajim_0.11.1/src/gajim.py Log: 0.11.2: if no NICKNAME is present in our vcard, use FN fiield as our default nickname. Modified: branches/gajim_0.11.1/src/gajim.py =================================================================== --- branches/gajim_0.11.1/src/gajim.py 2007-08-30 21:11:52 UTC (rev 8645) +++ branches/gajim_0.11.1/src/gajim.py 2007-08-30 21:13:12 UTC (rev 8646) @@ -908,6 +908,10 @@ nick = array['NICKNAME'] if nick: gajim.nicks[account] = nick + if not gajim.nicks[account] and array.has_key('FN'): + nick = array['FN'] + if nick: + gajim.nicks[account] = nick if self.instances[account].has_key('profile'): win = self.instances[account]['profile'] win.set_values(array)

1 0

← Newer
1
2
3
4
5
6
7
...
24
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 August 2007