Commits August 2012

commits@gajim.org

3 participants
152 discussions

gajim: don't close send single message if there was an error sen...
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset cbfa665eca8b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cbfa665eca8b description: don't close send single message if there was an error sending the message. Fixes #7187 diffstat: src/dialogs.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 2d7dbe41958b -r cbfa665eca8b src/dialogs.py --- a/src/dialogs.py Fri Aug 24 13:33:27 2012 +0200 +++ b/src/dialogs.py Sun Aug 26 22:34:29 2012 +0200 @@ -3078,7 +3078,7 @@ # if offline or connecting ErrorDialog(_('Connection not available'), _('Please make sure you are connected with "%s".') % self.account) - return + return True if isinstance(self.to, list): sender_list = [] for i in self.to: @@ -3098,7 +3098,7 @@ ErrorDialog(_('Invalid Jabber ID'), _('It is not possible to send a message to %s, this JID is not ' 'valid.') % to_whom_jid) - return + return True subject = self.subject_entry.get_text().decode('utf-8') begin, end = self.message_tv_buffer.get_bounds() @@ -3142,7 +3142,8 @@ session=self.session) def on_send_and_close_button_clicked(self, widget): - self.send_single_message() + if self.send_single_message(): + return self.save_pos() self.window.destroy()

1 0

gajim: add ctrl+s shortcut to change status message.
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 2d7dbe41958b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2d7dbe41958b description: add ctrl+s shortcut to change status message. diffstat: src/roster_window.py | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diffs (56 lines): diff -r a248652c6491 -r 2d7dbe41958b src/roster_window.py --- a/src/roster_window.py Tue Aug 28 10:55:36 2012 +0200 +++ b/src/roster_window.py Fri Aug 24 13:33:27 2012 +0200 @@ -3511,6 +3511,27 @@ self.on_row_activated(widget, path) self.clicked_path = None + def accel_group_func(self, accel_group, acceleratable, keyval, modifier): + # CTRL mask + if modifier & gtk.gdk.CONTROL_MASK: + if keyval == gtk.keysyms.s: # CTRL + s + model = self.status_combobox.get_model() + accounts = gajim.connections.keys() + status = model[self.previous_status_combobox_active][2].decode( + 'utf-8') + def on_response(message, pep_dict): + if message is not None: # None if user pressed Cancel + for account in accounts: + if not gajim.config.get_per('accounts', account, + 'sync_with_global_status'): + continue + current_show = gajim.SHOW_LIST[ + gajim.connections[account].connected] + self.send_status(account, current_show, message) + self.send_pep(account, pep_dict) + dialogs.ChangeStatusMessageDialog(on_response, status) + return + def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed self.tooltip.hide_tooltip() @@ -6328,8 +6349,8 @@ # activity_pixbuf, tune_pixbuf, location_pixbuf, avatar_pixbuf, # padlock_pixbuf] self.columns = [gtk.Image, str, str, str, str, - gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, - gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf] + gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, + gtk.gdk.Pixbuf, gtk.gdk.Pixbuf] self.xml = gtkgui_helpers.get_gtk_builder('roster_window.ui') self.window = self.xml.get_object('roster_window') self.hpaned = self.xml.get_object('roster_hpaned') @@ -6599,6 +6620,13 @@ new_chat_menuitem.add_accelerator('activate', accel_group, gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) + # Setting CTRL+S to be the shortcut to change status message + accel_group = gtk.AccelGroup() + keyval, mod = gtk.accelerator_parse('<Control>s') + accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, + self.accel_group_func) + self.window.add_accel_group(accel_group) + # Setting the search stuff self.rfilter_entry = self.xml.get_object('rfilter_entry') self.rfilter_string = ''

1 0

gajim: plugin system. checking the type of stored data. Fix #7220
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset a248652c6491 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a248652c6491 description: plugin system. checking the type of stored data. Fix #7220 diffstat: src/plugins/plugin.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 90053ad6a8b2 -r a248652c6491 src/plugins/plugin.py --- a/src/plugins/plugin.py Tue Aug 28 10:54:50 2012 +0200 +++ b/src/plugins/plugin.py Tue Aug 28 10:55:36 2012 +0200 @@ -259,6 +259,8 @@ s = shelve.open(self.FILE_PATH) for (k, v) in s.iteritems(): self.data[k] = v + if not isinstance(self.data, dict): + raise GajimPluginException s.close() self.save() except:

1 0

gajim: update 0.15.1 changelog
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 90053ad6a8b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=90053ad6a8b2 description: update 0.15.1 changelog diffstat: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (10 lines): diff -r 25d3e44badb1 -r 90053ad6a8b2 ChangeLog --- a/ChangeLog Tue Aug 21 20:55:05 2012 +0200 +++ b/ChangeLog Tue Aug 28 10:54:50 2012 +0200 @@ -1,5 +1,6 @@ Gajim 0.15.1 () + * Switch from python-farsight to python-farstream * improve performences * Fix roster filter with unicode chars * Fix connection to msn jabber server

1 0

gajim: when we come ack from invisible, restore the block list i...
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 71194a2f217f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=71194a2f217f description: when we come ack from invisible, restore the block list if we block some contacts. Fixes #7215 diffstat: src/common/connection.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (19 lines): diff -r cf7c4fbed6bf -r 71194a2f217f src/common/connection.py --- a/src/common/connection.py Mon Aug 27 22:07:29 2012 +0200 +++ b/src/common/connection.py Tue Aug 28 10:39:08 2012 +0200 @@ -1792,9 +1792,12 @@ def _change_from_invisible(self): if self.privacy_rules_supported: - iq = self.build_privacy_rule('visible', 'allow') - self.connection.send(iq) - self.activate_privacy_rule('visible') + if self.blocked_list: + self.activate_privacy_rule('block') + else: + iq = self.build_privacy_rule('visible', 'allow') + self.connection.send(iq) + self.activate_privacy_rule('visible') def _update_status(self, show, msg): xmpp_show = helpers.get_xmpp_show(show)

1 0

gajim: show only rooms where user can be invited to in invite to...
by Yann Leboulanger 27 Aug '12

27 Aug '12

changeset cf7c4fbed6bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cf7c4fbed6bf description: show only rooms where user can be invited to in invite to submenu. Fixes #7212 diffstat: src/gui_menu_builder.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r f1e83cb3e0b9 -r cf7c4fbed6bf src/gui_menu_builder.py --- a/src/gui_menu_builder.py Mon Aug 27 13:28:47 2012 +0200 +++ b/src/gui_menu_builder.py Mon Aug 27 22:07:29 2012 +0200 @@ -125,6 +125,8 @@ for gc_control in gajim.interface.msg_win_mgr.get_controls( message_control.TYPE_GC) + minimized_controls: acct = gc_control.account + if acct not in connected_accounts: + continue room_jid = gc_control.room_jid if room_jid in ignore_rooms: continue

1 0

gajim: fix displaying pubsub nodes
by Yann Leboulanger 27 Aug '12

27 Aug '12

changeset f1e83cb3e0b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f1e83cb3e0b9 description: fix displaying pubsub nodes diffstat: src/disco.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (17 lines): diff -r ae4abdb4a507 -r f1e83cb3e0b9 src/disco.py --- a/src/disco.py Sun Aug 26 22:34:29 2012 +0200 +++ b/src/disco.py Mon Aug 27 13:28:47 2012 +0200 @@ -2098,8 +2098,11 @@ name = gobject.markup_escape_text(name) name = '<b>%s</b>' % name - parent_iter = self._get_iter(parent_node) - if not self._in_list(node): + if parent_node: + parent_iter = self._get_iter(parent_node) + else: + parent_iter = None + if not node or not self._in_list(node): self.model.append(parent_iter, (jid, node, name, dunno, subscribed)) self.cache.get_items(jid, node, self._add_items, force = force, args = (force,))

1 0

gajim: don't close send single message if there was an error sen...
by Yann Leboulanger 26 Aug '12

26 Aug '12

changeset ae4abdb4a507 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ae4abdb4a507 description: don't close send single message if there was an error sending the message. Fixes #7187 diffstat: src/dialogs.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 627cbbe46bd0 -r ae4abdb4a507 src/dialogs.py --- a/src/dialogs.py Sat Aug 25 23:54:39 2012 -0400 +++ b/src/dialogs.py Sun Aug 26 22:34:29 2012 +0200 @@ -3112,7 +3112,7 @@ # if offline or connecting ErrorDialog(_('Connection not available'), _('Please make sure you are connected with "%s".') % self.account) - return + return True if isinstance(self.to, list): sender_list = [] for i in self.to: @@ -3132,7 +3132,7 @@ ErrorDialog(_('Invalid Jabber ID'), _('It is not possible to send a message to %s, this JID is not ' 'valid.') % to_whom_jid) - return + return True subject = self.subject_entry.get_text().decode('utf-8') begin, end = self.message_tv_buffer.get_bounds() @@ -3176,7 +3176,8 @@ session=self.session) def on_send_and_close_button_clicked(self, widget): - self.send_single_message() + if self.send_single_message(): + return self.save_pos() self.window.destroy()

1 0

gajim: only send hash if contact supports it
by Jefry Lagrange 26 Aug '12

26 Aug '12

changeset 627cbbe46bd0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=627cbbe46bd0 description: only send hash if contact supports it diffstat: src/common/jingle.py | 5 ----- src/common/jingle_ft.py | 2 +- 2 files changed, 1 insertions(+), 6 deletions(-) diffs (51 lines): diff -r b0c4c51e1870 -r 627cbbe46bd0 src/common/jingle.py --- a/src/common/jingle.py Sat Aug 25 12:09:50 2012 -0400 +++ b/src/common/jingle.py Sat Aug 25 23:54:39 2012 -0400 @@ -80,12 +80,10 @@ # get data jid = helpers.get_full_jid_from_iq(stanza) id_ = stanza.getID() - if (jid, id_) in self.__iq_responses.keys(): self.__iq_responses[(jid, id_)].on_stanza(stanza) del self.__iq_responses[(jid, id_)] raise xmpp.NodeProcessed - jingle = stanza.getTag('jingle') # a jingle element is not necessary in iq-result stanza # don't check for that @@ -97,14 +95,12 @@ if id_ in sesn.iq_ids: sesn.on_stanza(stanza) return - # do we need to create a new jingle object if sid not in self._sessions: #TODO: tie-breaking and other things... newjingle = JingleSession(con=self, weinitiate=False, jid=jid, iq_id=id_, sid=sid) self._sessions[sid] = newjingle - # we already have such session in dispatcher... self._sessions[sid].collect_iq_id(id_) self._sessions[sid].on_stanza(stanza) @@ -112,7 +108,6 @@ if sid in self._sessions and \ self._sessions[sid].state == JingleStates.ended: self.delete_jingle_session(sid) - raise xmpp.NodeProcessed def start_audio(self, jid): diff -r b0c4c51e1870 -r 627cbbe46bd0 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Aug 25 12:09:50 2012 -0400 +++ b/src/common/jingle_ft.py Sat Aug 25 23:54:39 2012 -0400 @@ -166,7 +166,7 @@ self.file_props.streamhosts = self.transport.remote_candidates # Calculate file hash in a new thread # if we haven't sent the hash already. - if self.file_props.hash_ is None: + if self.file_props.hash_ is None and self.file_props.algo: self.hashThread = threading.Thread(target=self.__send_hash) self.hashThread.start() for host in self.file_props.streamhosts:

1 0

gajim: make file_props use session sid as the default sid
by Jefry Lagrange 25 Aug '12

25 Aug '12

changeset b0c4c51e1870 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b0c4c51e1870 description: make file_props use session sid as the default sid diffstat: src/common/connection_handlers_events.py | 6 ++---- src/common/file_props.py | 2 +- src/common/jingle_ft.py | 3 ++- src/common/jingle_transport.py | 4 ++-- src/common/protocol/bytestream.py | 8 ++++---- src/filetransfers_window.py | 5 +++-- src/gui_interface.py | 5 ++--- 7 files changed, 16 insertions(+), 17 deletions(-) diffs (152 lines): diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/connection_handlers_events.py Sat Aug 25 12:09:50 2012 -0400 @@ -1981,11 +1981,9 @@ self.FT_content.session.ourjid) self.FT_content.transport.set_connection( self.FT_content.session.connection) - sid = self.FT_content.transport.sid + sid = unicode(self.stanza.getTag('jingle').getAttr('sid')) self.file_props = FilesProp.getNewFileProp(self.conn.name, sid) - self.file_props.session_sid = unicode( - self.stanza.getTag('jingle').getAttr('sid') - ) + self.file_props.transport_sid = self.FT_content.transport.sid self.FT_content.file_props = self.file_props self.FT_content.transport.set_file_props(self.file_props) if self.file_props.streamhosts: diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/file_props.py --- a/src/common/file_props.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/file_props.py Sat Aug 25 12:09:50 2012 -0400 @@ -123,6 +123,7 @@ self.tt_account = None self.size = None self._sid = sid + self.transport_sid = None self.account = account self.mime_type = None self.algo = None @@ -130,7 +131,6 @@ self.syn_id = None self.seq = None self.hash_ = None - self.session_sid = None self.fd = None self.startexmpp = None self.session_type = None diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/jingle_ft.py Sat Aug 25 12:09:50 2012 -0400 @@ -76,8 +76,9 @@ self.file_props.sender = session.ourjid self.file_props.receiver = session.peerjid self.file_props.session_type = 'jingle' - self.file_props.session_sid = session.sid + self.file_props.sid = session.sid self.file_props.transfered_size = [] + self.file_props.transport_sid = self.transport.sid log.info("FT request: %s" % file_props) if transport is None: self.transport = JingleTransportSocks5() diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/jingle_transport.py Sat Aug 25 12:09:50 2012 -0400 @@ -250,7 +250,7 @@ def get_content(self): sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.session_sid) + self.file_props.sid) for content in sesn.contents.values(): if content.transport == self: return content @@ -261,7 +261,7 @@ if not self.connection: return sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.session_sid) + self.file_props.sid) if sesn is None: return diff -r 2bf24a2cc140 -r b0c4c51e1870 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/common/protocol/bytestream.py Sat Aug 25 12:09:50 2012 -0400 @@ -143,12 +143,12 @@ log.info("send_file_approval: jingle session accept") if file_props.session_type == 'jingle': session = self.get_jingle_session(file_props.sender, - file_props.session_sid) + file_props.sid) if not session: return content = None for c in session.contents.values(): - if c.transport.sid == file_props.sid: + if c.transport.sid == file_props.transport_sid: content = c break if not content: @@ -193,7 +193,7 @@ if not self.connection or self.connected < 2: return if file_props.session_type == 'jingle': - jingle = self._sessions[file_props.session_sid] + jingle = self._sessions[file_props.sid] jingle.cancel_session() return iq = xmpp.Iq(to=unicode(file_props.sender), typ='error') @@ -562,7 +562,7 @@ else: to = file_props.sender iq = xmpp.Iq(to=to, typ='error') - iq.setAttr('id', file_props.session_sid) + iq.setAttr('id', file_props.sid) err = iq.setTag('error') err.setAttr('code', unicode(code)) err.setData(msg) diff -r 2bf24a2cc140 -r b0c4c51e1870 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/filetransfers_window.py Sat Aug 25 12:09:50 2012 -0400 @@ -257,7 +257,7 @@ sid = gajim.connections[account].start_file_transfer(fjid, file_props, True) - file_props.sid = sid + file_props.transport_sid = sid if file_props.type_ == 'r': file_name = os.path.basename(file_props.file_name) @@ -643,7 +643,8 @@ self.model.set(iter_, 0, self.get_icon(status)) if transfered_size == full_size: # If we are receiver and this is a jingle session - if file_props.type_ == 'r' and file_props.session_sid: + if file_props.type_ == 'r' and \ + file_props.session_type == 'jingle': # Show that we are computing the hash self.set_status(file_props, 'computing') else: diff -r 2bf24a2cc140 -r b0c4c51e1870 src/gui_interface.py --- a/src/gui_interface.py Sat Aug 25 11:14:38 2012 -0400 +++ b/src/gui_interface.py Sat Aug 25 12:09:50 2012 -0400 @@ -941,7 +941,7 @@ def __compare_hashes(self, account, file_props): session = gajim.connections[account].get_jingle_session(jid=None, - sid=file_props.session_sid) + sid=file_props.sid) ft_win = self.instances['file_transfers'] if not file_props.hash_: # We disn't get the hash, sender probably don't support that @@ -981,9 +981,8 @@ return if file_props.type_ == 'r': # we receive a file - # If we have a jingle session id, it is a jingle transfer # we compare hashes - if file_props.session_sid: + if file_props.session_type == 'jingle': # Compare hashes in a new thread self.hashThread = Thread(target=self.__compare_hashes, args=(account, file_props))

1 0

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