Commits

commits@gajim.org

17632 discussions

gajim: Select root iter in the AccountsWindow treeview.
by Fomin Denis 25 Jun '12

25 Jun '12

changeset dcfcc68ab956 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dcfcc68ab956 description: Select root iter in the AccountsWindow treeview. diffstat: src/config.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (30 lines): diff -r 4b5b53d48a6c -r dcfcc68ab956 src/config.py --- a/src/config.py Mon Jun 25 23:49:20 2012 +0400 +++ b/src/config.py Tue Jun 26 00:25:19 2012 +0400 @@ -1558,7 +1558,6 @@ self.update_proxy_list() self.xml.connect_signals(self) self.init_accounts() - self.xml.get_object('close_button').grab_focus() self.window.show_all() # Merge accounts @@ -1575,6 +1574,8 @@ except ImportError: self.avahi_available = False + self.xml.get_object('close_button').grab_focus() + def on_accounts_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: self.check_resend_relog() @@ -1603,6 +1604,9 @@ iter_ = model.append() model.set(iter_, 0, account) + self.selection = self.accounts_treeview.get_selection() + self.selection.select_iter(model.get_iter_root()) + def resend(self, account): if not account in gajim.connections: return

1 0

gajim: Set focus on close button in the AccountsWindow.
by Fomin Denis 25 Jun '12

25 Jun '12

changeset 4b5b53d48a6c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4b5b53d48a6c description: Set focus on close button in the AccountsWindow. diffstat: src/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r aaca933b6584 -r 4b5b53d48a6c src/config.py --- a/src/config.py Mon Jun 25 23:27:23 2012 +0400 +++ b/src/config.py Mon Jun 25 23:49:20 2012 +0400 @@ -1558,6 +1558,7 @@ self.update_proxy_list() self.xml.connect_signals(self) self.init_accounts() + self.xml.get_object('close_button').grab_focus() self.window.show_all() # Merge accounts

1 0

gajim: Do not highlight(mark) contact name in VcardWindow.
by Fomin Denis 25 Jun '12

25 Jun '12

changeset aaca933b6584 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aaca933b6584 description: Do not highlight(mark) contact name in VcardWindow. diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (13 lines): diff -r e5d66fcb024f -r aaca933b6584 src/vcard.py --- a/src/vcard.py Thu Jun 21 14:10:01 2012 +0200 +++ b/src/vcard.py Mon Jun 25 23:27:23 2012 +0400 @@ -142,8 +142,8 @@ buffer_.set_text(annotations[self.contact.jid]) self.xml.connect_signals(self) + self.xml.get_object('close_button').grab_focus() self.window.show_all() - self.xml.get_object('close_button').grab_focus() def update_progressbar(self): self.progressbar.pulse()

1 0

gajim: fix connect error
by Jefry Lagrange 21 Jun '12

21 Jun '12

changeset f4f9fd08efff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f4f9fd08efff description: fix connect error diffstat: src/common/protocol/bytestream.py | 26 ++++++++++++++++---------- src/filetransfers_window.py | 2 ++ 2 files changed, 18 insertions(+), 10 deletions(-) diffs (66 lines): diff -r 2657d405cfe0 -r f4f9fd08efff src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Jun 20 23:58:23 2012 +0200 +++ b/src/common/protocol/bytestream.py Thu Jun 21 13:56:15 2012 -0400 @@ -549,34 +549,40 @@ file_props.hash_ = hash_id return - def _connect_error(self, to, _id, sid, code=404): + def _connect_error(self,sid, code=404): """ Called when there is an error establishing BS connection, or when connection is rejected """ if not self.connection or self.connected < 2: return + file_props = FilesProp.getFileProp(self.name, sid) + if file_props is None: + log.error('can not send iq error on failed transfer') + return msg_dict = { 404: 'Could not connect to given hosts', 405: 'Cancel', 406: 'Not acceptable', } msg = msg_dict[code] + if file_props.type_ == 's': + to = file_props.receiver + else: + to = file_props.sender iq = xmpp.Iq(to=to, typ='error') - iq.setAttr('id', _id) + iq.setAttr('id', file_props.session_sid) err = iq.setTag('error') err.setAttr('code', unicode(code)) err.setData(msg) self.connection.send(iq) if code == 404: - file_props = FilesProp.getFileProp(self.name, sid) - if file_props is not None: - self.disconnect_transfer(file_props) - file_props.error = -3 - from common.connection_handlers_events import \ - FileRequestErrorEvent - gajim.nec.push_incoming_event(FileRequestErrorEvent(None, - conn=self, jid=to, file_props=file_props, error_msg=msg)) + self.disconnect_transfer(file_props) + file_props.error = -3 + from common.connection_handlers_events import \ + FileRequestErrorEvent + gajim.nec.push_incoming_event(FileRequestErrorEvent(None, + conn=self, jid=to, file_props=file_props, error_msg=msg)) def _proxy_auth_ok(self, proxy): """ diff -r 2657d405cfe0 -r f4f9fd08efff src/filetransfers_window.py --- a/src/filetransfers_window.py Wed Jun 20 23:58:23 2012 +0200 +++ b/src/filetransfers_window.py Thu Jun 21 13:56:15 2012 -0400 @@ -553,6 +553,8 @@ def _remove_transfer(self, iter_, sid, file_props): self.model.remove(iter_) + if not file_props: + return if file_props.tt_account: # file transfer is set account = file_props.tt_account

1 0

gajim: don't try to connect twice when we get see-other-host. se...
by Yann Leboulanger 21 Jun '12

21 Jun '12

changeset e5d66fcb024f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e5d66fcb024f description: don't try to connect twice when we get see-other-host. see #7179 diffstat: src/common/xmpp/client_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 31c666671ead -r e5d66fcb024f src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Jun 19 22:45:19 2012 +0400 +++ b/src/common/xmpp/client_nb.py Thu Jun 21 14:10:01 2012 +0200 @@ -354,6 +354,7 @@ self.Dispatcher.ProcessNonBlocking(data) if self.got_see_other_host: log.info('got see-other-host') + self.onreceive(None) self.on_stream_error_cb(self, self.got_see_other_host) elif not self.got_features: self._xmpp_connect_machine(

1 0

gajim: fix sockes5 transfer
by Yann Leboulanger 20 Jun '12

20 Jun '12

changeset 2657d405cfe0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2657d405cfe0 description: fix sockes5 transfer diffstat: src/common/file_props.py | 1 + src/common/protocol/bytestream.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 08cab8eb40d4 -r 2657d405cfe0 src/common/file_props.py --- a/src/common/file_props.py Wed Jun 20 23:58:08 2012 +0200 +++ b/src/common/file_props.py Wed Jun 20 23:58:23 2012 +0200 @@ -135,6 +135,7 @@ self.startexmpp = None self.session_type = None self.request_id = None + self.proxyhosts = None def getsid(self): # Getter of the property sid diff -r 08cab8eb40d4 -r 2657d405cfe0 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Jun 20 23:58:08 2012 +0200 +++ b/src/common/protocol/bytestream.py Wed Jun 20 23:58:23 2012 +0200 @@ -735,7 +735,7 @@ if file_props.stopped: self.remove_transfer(file_props) else: - gajim.socks5queue.send_file(file_props, self.name, 'client') + gajim.socks5queue.send_file(file_props, self.name, 'server') raise xmpp.NodeProcessed

1 0

gajim: fix indentation
by Yann Leboulanger 20 Jun '12

20 Jun '12

changeset 08cab8eb40d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=08cab8eb40d4 description: fix indentation diffstat: src/common/socks5.py | 58 ++++++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diffs (210 lines): diff -r 01b7185e8e8a -r 08cab8eb40d4 src/common/socks5.py --- a/src/common/socks5.py Wed Jun 20 23:16:18 2012 +0200 +++ b/src/common/socks5.py Wed Jun 20 23:58:08 2012 +0200 @@ -100,7 +100,7 @@ # There is already a listener, we update the file's information # on the new connection. self.listener.file_props = file_props - + self.connected += 1 return self.listener @@ -116,13 +116,13 @@ return 0 streamhost['state'] = 1 self.on_success[file_props.sid](streamhost) - return 1 + return 1 def connect_to_hosts(self, account, sid, on_success=None, on_failure=None, fingerprint=None, receiving=True): self.on_success[sid] = on_success self.on_failure[sid] = on_failure - file_props = FilesProp.getFileProp(account, sid) + file_props = FilesProp.getFileProp(account, sid) file_props.failure_cb = on_failure if not file_props.streamhosts: @@ -151,8 +151,8 @@ file_props.proxy_sender = streamhost['target'] file_props.proxy_receiver = streamhost['initiator'] socks5obj = Socks5SenderClient(self.idlequeue, idx, - self, _sock=None,host=str(streamhost['host']), - port=int(streamhost['port']),fingerprint=fp, + self, _sock=None,host=str(streamhost['host']), + port=int(streamhost['port']),fingerprint=fp, connected=False, file_props=file_props) socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj, type='sender') @@ -302,20 +302,20 @@ def send_file(self, file_props, account, mode): for key in self.senders.keys(): - if self.senders == {}: - # Python acts very weird with this. When there is no keys - # in the dictionary It says that it has a key. - # Maybe it is my machine. Without this there is a KeyError - # traceback. - return - if file_props.name in key and file_props.sid in key \ + if self.senders == {}: + # Python acts very weird with this. When there is no keys + # in the dictionary It says that it has a key. + # Maybe it is my machine. Without this there is a KeyError + # traceback. + return + if file_props.name in key and file_props.sid in key \ and self.senders[key].mode == mode: log.info("socks5: sending file") sender = self.senders[key] file_props.streamhost_used = True sender.account = account - + sender.file_props = file_props result = sender.send_file() self.process_result(result, sender) @@ -323,7 +323,7 @@ def remove_file_props(self, account, sid): fp = FilesProp.getFileProp(account, sid) if not fp: - log.warning('trying to remove a file props that doesnt exist ' + + log.warning('trying to remove a file props that doesnt exist ' + 'from account ' + str(account) + ' and sid ' + str(sid)) return if sid in self.on_success: @@ -415,7 +415,7 @@ del(self.readers[key]) if not remove_all: break - + def remove_sender(self, idx, do_disconnect=True, remove_all=False): """ Remove sender from the list of senders and decrease the number of active @@ -484,7 +484,7 @@ for ai in self.ais: try: self._sock = socket.socket(*ai[:3]) - + if not self.fingerprint is None: self._sock = OpenSSL.SSL.Connection( jingle_xtls.get_context('client'), self._sock) @@ -696,7 +696,7 @@ """ Read file contents from socket and write them to file """ - + if self.file_props is None or not self.file_props.file_name: self.file_props.error = -2 return None @@ -894,7 +894,7 @@ """ Get sha of sid + Initiator jid + Target jid """ - + if self.file_props.is_a_proxy: self.file_props.is_a_proxy = None # Is this necesary? return hashlib.sha1('%s%s%s' % (self.sid, @@ -902,7 +902,7 @@ self.file_props.proxy_receiver)).hexdigest() return hashlib.sha1('%s%s%s' % (self.sid, self.initiator, self.target)).\ hexdigest() - + class Socks5Sender(IdleObject): """ @@ -928,7 +928,7 @@ jingle_xtls.get_context('server'), _sock) else: self._sock.setblocking(False) - + self.fd = _sock.fileno() self._recv = _sock.recv self._send = _sock.send @@ -1022,7 +1022,7 @@ self.file_props.continue_cb = self.continue_paused_transfer self.file_props.stalled = False self.file_props.received_len = 0 - + def receive_file(self): """ @@ -1079,7 +1079,7 @@ def __init__(self, idlequeue, host, port, initiator, target, sid): Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) - + self.mode = 'server' def main(self): @@ -1183,7 +1183,7 @@ def __init__(self, idlequeue, host, port, initiator, target, sid): Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) - + self.mode = 'client' def main(self, timeout=0): @@ -1334,7 +1334,7 @@ Socks5Client.__init__(self, idlequeue, host, port, None, None, file_props.sid) - Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, + Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props) @@ -1342,14 +1342,14 @@ class Socks5SenderServer(Socks5Server, Socks5Sender): - + def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, port=None, fingerprint = None, connected=True, file_props={}): Socks5Server.__init__(self, idlequeue, host, port, None, None, file_props.sid) - Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, + Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, host, port, fingerprint , connected, file_props) @@ -1359,14 +1359,14 @@ def __init__(self, idlequeue, streamhost, sid, file_props = None, fingerprint=None): Socks5Client.__init__(self, idlequeue, streamhost['host'], - int(streamhost['port']), streamhost['initiator'], + int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid) Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint) - + class Socks5ReceiverServer(Socks5Server, Socks5Receiver): @@ -1374,7 +1374,7 @@ fingerprint=None): Socks5Server.__init__(self, idlequeue, streamhost['host'], - int(streamhost['port']), streamhost['initiator'], + int(streamhost['port']), streamhost['initiator'], streamhost['target'], sid) Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props,

1 0

gajim: fix typo
by Yann Leboulanger 20 Jun '12

20 Jun '12

changeset 01b7185e8e8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=01b7185e8e8a description: fix typo remove "fast" support try to connect to streamhosts when we get them diffstat: src/common/protocol/bytestream.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diffs (41 lines): diff -r 9d43ef511f51 -r 01b7185e8e8a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jun 14 19:46:17 2012 +0200 +++ b/src/common/protocol/bytestream.py Wed Jun 20 23:16:18 2012 +0200 @@ -639,7 +639,6 @@ streamhosts.append(host_dict) file_props = FilesProp.getFilePropBySid(sid) if file_props is not None: - file_props.fast = streamhosts if file_props.type_ == 's': # FIXME: remove fast xmlns # only psi do this if file_props.streamhosts: @@ -648,7 +647,7 @@ file_props.streamhosts = streamhosts gajim.socks5queue.connect_to_hosts(self.name, sid, self.send_success_connect_reply, None) - raise xmpp.NodeProcessed + raise xmpp.NodeProcessed else: log.warn('Gajim got streamhosts for unknown transfer. Ignoring it.') raise xmpp.NodeProcessed @@ -685,7 +684,7 @@ except Exception: # this bytestream result is not what we need pass id_ = real_id[3:] - file_props = FilesProp.getFileProp(con.name, id_) + file_props = FilesProp.getFileProp(self.name, id_) if file_props is None: raise xmpp.NodeProcessed if streamhost is None: @@ -737,11 +736,6 @@ self.remove_transfer(file_props) else: gajim.socks5queue.send_file(file_props, self.name, 'client') - if file_props.fast: - fasts = file_props.fast - if len(fasts) > 0: - self._connect_error(frm, fasts[0]['id'], file_props.sid, - code=406) raise xmpp.NodeProcessed

1 0

gajim: fix typo
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 41acee25913c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=41acee25913c description: fix typo diffstat: src/tooltips.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (21 lines): diff -r 0def65e3600a -r 41acee25913c src/tooltips.py --- a/src/tooltips.py Tue Jun 19 20:50:34 2012 +0200 +++ b/src/tooltips.py Tue Jun 19 22:45:19 2012 +0400 @@ -207,13 +207,13 @@ formatted = "<span foreground='%s'>%s</span>" color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - color = gajim.conig.get('tooltip_affiliation_none_color') + color = gajim.config.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - color = gajim.conig.get('tooltip_affiliation_member_color') + color = gajim.config.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - color = gajim.conig.get('tooltip_affiliation_administrator_color') + color = gajim.config.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - color = gajim.conig.get('tooltip_affiliation_owner_color') + color = gajim.config.get('tooltip_affiliation_owner_color') if color: affiliation = formatted % (color, affiliation) return affiliation

1 0

gajim: 0.15.1 changelog
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 0def65e3600a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0def65e3600a description: 0.15.1 changelog diffstat: ChangeLog | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 73d9c50e6736 -r 0def65e3600a ChangeLog --- a/ChangeLog Tue Jun 19 19:19:24 2012 +0200 +++ b/ChangeLog Tue Jun 19 20:50:34 2012 +0200 @@ -1,3 +1,11 @@ +Gajim 0.15.1 () + + * improve performences + * Fix roster filter with unicode chars + * Fix connection to msn jabber server + * Fix some GPG issues + * Fix other small issues + Gajim 0.15 (18 March 2012) * Plugin system

1 0

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