Commits

commits@gajim.org

17632 discussions

gajim: correctly close the file when we cancel a transfer. Fixes...
by Yann Leboulanger 24 Jan '13

24 Jan '13

changeset 1cf7d602453e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1cf7d602453e description: correctly close the file when we cancel a transfer. Fixes #7281 diffstat: src/common/jingle_session.py | 1 + src/common/protocol/bytestream.py | 19 ++++++++++++++----- src/common/socks5.py | 9 +++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diffs (88 lines): diff -r 2771bf0bedd8 -r 1cf7d602453e src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Jan 11 23:00:14 2013 +0400 +++ b/src/common/jingle_session.py Thu Jan 24 20:26:18 2013 +0100 @@ -311,6 +311,7 @@ Default callback for action stanzas -- simple ack and stop processing """ response = stanza.buildReply('result') + response.delChild(response.getQuery()) self.connection.connection.send(response) def __on_error(self, stanza, jingle, error, action): diff -r 2771bf0bedd8 -r 1cf7d602453e src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Fri Jan 11 23:00:14 2013 +0400 +++ b/src/common/protocol/bytestream.py Thu Jan 24 20:26:18 2013 +0100 @@ -314,9 +314,16 @@ if 'direction' in file_props: # it's a IBB - sid = file_props['sid'] - if sid in self.files_props: - del self.files_props[sid] + # Close file we're receiving into + if 'fp' in file_props: + fd = file_props['fp'] + try: + fd.close() + except Exception: + pass + if gajim.socks5queue.get_file_props(self.name, file_props['sid']): + gajim.socks5queue.remove_file_props(self.name, + file_props['sid']) def _send_socks5_info(self, file_props): """ @@ -741,9 +748,9 @@ elif typ == 'set' and stanza.getTag('close', namespace=xmpp.NS_IBB): self.StreamCloseHandler(conn, stanza) elif typ == 'result': - self.StreamCommitHandler(conn, stanza) + self.SendHandler() elif typ == 'error': - self.StreamOpenReplyHandler(conn, stanza) + gajim.socks5queue.error_cb(_('File transfer canceled'), _('An error occured while transfering file.')) else: conn.send(xmpp.Error(stanza, xmpp.ERR_BAD_REQUEST)) raise xmpp.NodeProcessed @@ -773,6 +780,7 @@ rep = xmpp.Protocol('iq', stanza.getFrom(), 'result', stanza.getTo(), {'id': stanza.getID()}) file_props['block-size'] = blocksize + file_props['direction'] = '<' file_props['seq'] = 0 file_props['received-len'] = 0 file_props['last-time'] = time.time() @@ -964,6 +972,7 @@ if stanza.getTag('data'): if self.IBBMessageHandler(conn, stanza): reply = stanza.buildReply('result') + reply.delChild(reply.getQuery()) conn.send(reply) raise xmpp.NodeProcessed elif syn_id == self.last_sent_ibb_id: diff -r 2771bf0bedd8 -r 1cf7d602453e src/common/socks5.py --- a/src/common/socks5.py Fri Jan 11 23:00:14 2013 +0400 +++ b/src/common/socks5.py Thu Jan 24 20:26:18 2013 +0100 @@ -397,6 +397,7 @@ raise IOError, e def close_file(self): + # Close file we're sending from if self.file: if not self.file.closed: try: @@ -404,6 +405,14 @@ except Exception: pass self.file = None + # Close file we're receiving into + if 'fd' in self.file_props: + fd = self.file_props['fd'] + del self.file_props['fd'] + try: + fd.close() + except Exception: + pass def get_fd(self): """

1 0

gajim-website: another way to get parenthesis correctly placed i...
by Yann Leboulanger 23 Jan '13

23 Jan '13

changeset 4552a24787cb in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=4552a24787cb description: another way to get parenthesis correctly placed in hebrew translation. Fixes #7291 diffstat: locale/he_IL/LC_MESSAGES/msg.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d74ed2c8d11b -r 4552a24787cb locale/he_IL/LC_MESSAGES/msg.po --- a/locale/he_IL/LC_MESSAGES/msg.po Sat Jan 19 23:46:07 2013 +0100 +++ b/locale/he_IL/LC_MESSAGES/msg.po Wed Jan 23 19:36:46 2013 +0100 @@ -278,7 +278,7 @@ #: dev.php:96 dev.php:99 #, c-format msgid "%s (%s)" -msgstr "%s (‏%s)" +msgstr "%s (%s‪)" #: dev.php:103 msgid " We also want to thank"

1 0

gajim: don't try to escape JID when we get a subscription reques...
by Yann Leboulanger 22 Jan '13

22 Jan '13

changeset 4a3d180f6d68 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a3d180f6d68 description: don't try to escape JID when we get a subscription request from it, it's already escaped. Fixes #7277 diffstat: src/dialogs.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 00dd2310e886 -r 4a3d180f6d68 src/dialogs.py --- a/src/dialogs.py Sun Jan 20 19:56:18 2013 +0100 +++ b/src/dialogs.py Tue Jan 22 17:38:43 2013 +0100 @@ -947,6 +947,7 @@ liststore = gtk.ListStore(str) self.protocol_jid_combobox.set_model(liststore) if jid: + self.jid_escaped = True type_ = gajim.get_transport_name_from_jid(jid) if not type_: type_ = 'jabber' @@ -981,6 +982,7 @@ self.nickname_entry.set_text(user_nick) self.nickname_entry.grab_focus() else: + self.jid_escaped = False self.uid_entry.grab_focus() group_names = [] for acct in accounts: @@ -1055,7 +1057,7 @@ model = self.protocol_combobox.get_model() iter_ = self.protocol_combobox.get_active_iter() type_ = model[iter_][2] - if type_ != 'jabber': + if type_ != 'jabber' and not self.jid_escaped: transport = self.protocol_jid_combobox.get_active_text().decode( 'utf-8') if self.account:

1 0

gajim: fix last commit
by Denis Fomin 21 Jan '13

21 Jan '13

changeset 44e33b821a74 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=44e33b821a74 description: fix last commit diffstat: src/disco.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8ce849e99b47 -r 44e33b821a74 src/disco.py --- a/src/disco.py Mon Jan 21 23:50:52 2013 +0400 +++ b/src/disco.py Tue Jan 22 00:32:09 2013 +0400 @@ -869,7 +869,7 @@ """ Set the initial window title based on agent address """ - self.window.get_window().set_title(_('Browsing %(address)s using account ' + self.window.window.set_title(_('Browsing %(address)s using account ' '%(account)s') % {'address': self._get_agent_address(), 'account': self.account}) self.window._set_window_banner_text(self._get_agent_address())

1 0

gajim: use get_window()
by Denis Fomin 21 Jan '13

21 Jan '13

changeset 8ce849e99b47 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ce849e99b47 description: use get_window() diffstat: src/dialogs.py | 2 +- src/disco.py | 2 +- src/message_window.py | 2 +- src/roster_window.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diffs (57 lines): diff -r 71d22ddb7168 -r 8ce849e99b47 src/dialogs.py --- a/src/dialogs.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/dialogs.py Mon Jan 21 23:50:52 2013 +0400 @@ -2325,7 +2325,7 @@ menu = self.prepare_popup_menu() menu.show_all() gtkgui_helpers.popup_emoticons_under_button(menu, widget, - self.window.window) + self.window.get_window()) class JoinGroupchatWindow: diff -r 71d22ddb7168 -r 8ce849e99b47 src/disco.py --- a/src/disco.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/disco.py Mon Jan 21 23:50:52 2013 +0400 @@ -869,7 +869,7 @@ """ Set the initial window title based on agent address """ - self.window.window.set_title(_('Browsing %(address)s using account ' + self.window.get_window().set_title(_('Browsing %(address)s using account ' '%(account)s') % {'address': self._get_agent_address(), 'account': self.account}) self.window._set_window_banner_text(self._get_agent_address()) diff -r 71d22ddb7168 -r 8ce849e99b47 src/message_window.py --- a/src/message_window.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/message_window.py Mon Jan 21 23:50:52 2013 +0400 @@ -396,7 +396,7 @@ # CTRL + PageUp | PageDown # Create event and send it to notebook event = Gdk.Event(Gdk.EventType.KEY_PRESS) - event.window = self.window.window + event.window = self.window.get_window() event.time = int(time.time()) event.state = Gdk.ModifierType.CONTROL_MASK event.keyval = int(keyval) diff -r 71d22ddb7168 -r 8ce849e99b47 src/roster_window.py --- a/src/roster_window.py Sun Jan 20 23:04:26 2013 +0100 +++ b/src/roster_window.py Mon Jan 21 23:50:52 2013 +0400 @@ -3420,7 +3420,7 @@ if gc_control: mw = gajim.interface.msg_win_mgr.get_window(jid, account) mw.set_active_tab(gc_control) - mw.window.window.focus(Gtk.get_current_event_time()) + mw.window.get_window().focus(Gtk.get_current_event_time()) return ctrl = gajim.interface.minimized_controls[account][jid] mw = gajim.interface.msg_win_mgr.get_window(jid, account) @@ -3430,7 +3430,7 @@ ctrl.parent_win = mw mw.new_tab(ctrl) mw.set_active_tab(ctrl) - mw.window.window.focus(Gtk.get_current_event_time()) + mw.window.get_window().focus(Gtk.get_current_event_time()) self.remove_groupchat(jid, account) def on_edit_account(self, widget, account):

1 0

gajim: launch.sh calls py3
by Yann Leboulanger 20 Jan '13

20 Jan '13

changeset 71d22ddb7168 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=71d22ddb7168 description: launch.sh calls py3 diffstat: launch.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 6650f3cbd846 -r 71d22ddb7168 launch.sh --- a/launch.sh Sun Jan 20 22:50:04 2013 +0100 +++ b/launch.sh Sun Jan 20 23:04:26 2013 +0100 @@ -1,6 +1,6 @@ #!/bin/sh if [ ! $PYTHON ]; then - PYTHON="python"; + PYTHON="python3"; fi cd "$(dirname $0)/src" exec $PYTHON -OOt gajim.py "$@"

1 0

python-nbxmpp: add jabber:x:oob namespace
by Yann Leboulanger 20 Jan '13

20 Jan '13

changeset 36031c4c739e in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=36031c4c739e description: add jabber:x:oob namespace diffstat: nbxmpp/protocol.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r b339386c6111 -r 36031c4c739e nbxmpp/protocol.py --- a/nbxmpp/protocol.py Thu Dec 27 19:17:02 2012 -0400 +++ b/nbxmpp/protocol.py Sun Jan 20 19:52:22 2013 +0100 @@ -154,6 +154,7 @@ NS_WAITINGLIST = 'http://jabber.org/protocol/waitinglist' # XEP-0130 NS_XHTML_IM = 'http://jabber.org/protocol/xhtml-im' # XEP-0071 NS_XHTML = 'http://www.w3.org/1999/xhtml' # " +NS_X_OOB = 'jabber:x:oob' # XEP-0066 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'

1 0

gajim: fix Expander creation
by Yann Leboulanger 20 Jan '13

20 Jan '13

changeset fb1f4cb4e01b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fb1f4cb4e01b description: fix Expander creation diffstat: src/gtkexcepthook.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b8212b699ea2 -r fb1f4cb4e01b src/gtkexcepthook.py --- a/src/gtkexcepthook.py Sun Jan 20 22:37:15 2013 +0100 +++ b/src/gtkexcepthook.py Sun Jan 20 22:38:23 2013 +0100 @@ -74,7 +74,7 @@ textview.set_size_request( Gdk.Screen.width() / 3, Gdk.Screen.height() / 4) - expander = Gtk.Expander(_('Details')) + expander = Gtk.Expander(label=_('Details')) expander.add(frame) dialog.vbox.add(expander)

1 0

gajim: fix error when opening history window
by Yann Leboulanger 20 Jan '13

20 Jan '13

changeset 6650f3cbd846 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6650f3cbd846 description: fix error when opening history window diffstat: src/history_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r fb1f4cb4e01b -r 6650f3cbd846 src/history_window.py --- a/src/history_window.py Sun Jan 20 22:38:23 2013 +0100 +++ b/src/history_window.py Sun Jan 20 22:50:04 2013 +0100 @@ -172,6 +172,8 @@ keys.insert(0, actual_jid) if '' in keys: keys.remove('') + if None in keys: + keys.remove(None) # Map jid to info tuple # Warning : This for is time critical with big DB for key in keys:

1 0

gajim: use get_allocation()
by Yann Leboulanger 20 Jan '13

20 Jan '13

changeset b8212b699ea2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b8212b699ea2 description: use get_allocation() diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d417c9efd828 -r b8212b699ea2 src/roster_window.py --- a/src/roster_window.py Sat Jan 12 23:05:29 2013 +0400 +++ b/src/roster_window.py Sun Jan 20 22:37:15 2013 +0100 @@ -4490,7 +4490,7 @@ (when a Gtk.Paned widget handle is dragged) """ if gparamspec and gparamspec.name == 'position': - roster_width = pane.get_child1().allocation.width + roster_width = pane.get_child1().get_allocation().width gajim.config.set('roster_width', roster_width) ################################################################################

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