Commits

commits@gajim.org

17632 discussions

gajim: prevent traceback
by Yann Leboulanger 23 Aug '12

23 Aug '12

changeset c28c95ded697 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c28c95ded697 description: prevent traceback diffstat: src/gui_interface.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (19 lines): diff -r dca85f817d2b -r c28c95ded697 src/gui_interface.py --- a/src/gui_interface.py Thu Aug 23 13:10:30 2012 +0200 +++ b/src/gui_interface.py Thu Aug 23 14:21:26 2012 +0200 @@ -185,10 +185,11 @@ if len(obj.id_) > 3 and obj.id_[2] == '_': sid = obj.id_[3:] file_props = FilesProp.getFileProp(obj.conn.name, sid) - self.handle_event_file_send_error(obj.conn.name, (obj.fjid, - file_props)) - obj.conn.disconnect_transfer(file_props) - return + if file_props: + self.handle_event_file_send_error(obj.conn.name, (obj.fjid, + file_props)) + obj.conn.disconnect_transfer(file_props) + return ctrl = self.msg_win_mgr.get_control(obj.fjid, obj.conn.name) if ctrl and ctrl.type_id == message_control.TYPE_GC:

1 0

gajim: Jingle FT is now functionnal!! Thanks Jefry for the long ...
by Yann Leboulanger 23 Aug '12

23 Aug '12

changeset dca85f817d2b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dca85f817d2b description: Jingle FT is now functionnal!! Thanks Jefry for the long time debugging with me diffstat: src/adhoc_commands.py | 2 +- src/chat_control.py | 22 +- src/common/connection_handlers_events.py | 111 +++-- src/common/dataforms.py | 8 +- src/common/file_props.py | 156 ++++++++ src/common/jingle.py | 2 +- src/common/jingle_content.py | 16 +- src/common/jingle_ft.py | 97 ++-- src/common/jingle_ftstates.py | 76 +-- src/common/jingle_transport.py | 35 +- src/common/jingle_xtls.py | 28 +- src/common/pep.py | 26 +- src/common/protocol/bytestream.py | 469 +++++++++++------------- src/common/proxy65_manager.py | 17 +- src/common/resolver.py | 10 +- src/common/socks5.py | 581 +++++++++++++----------------- src/common/stanza_session.py | 2 +- src/common/xmpp/protocol.py | 28 +- src/config.py | 2 +- src/dataforms_widget.py | 26 +- src/filetransfers_window.py | 277 +++++++------- src/groupchat_control.py | 2 +- src/gui_interface.py | 109 ++--- src/roster_window.py | 4 +- src/search_window.py | 2 +- src/statusicon.py | 2 +- src/tooltips.py | 49 +- test/lib/gajim_mocks.py | 2 +- 28 files changed, 1096 insertions(+), 1065 deletions(-) diffs (truncated from 4574 to 300 lines): diff -r 0c6bb3ae90e1 -r dca85f817d2b src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Aug 22 22:42:00 2012 +0400 +++ b/src/adhoc_commands.py Thu Aug 23 13:10:30 2012 +0200 @@ -371,7 +371,7 @@ _('The form is not filled correctly.')) self.data_form_widget.set_sensitive(True) return - self.data_form_widget.data_form.type = 'submit' + self.data_form_widget.data_form.type_ = 'submit' else: self.data_form_widget.hide() diff -r 0c6bb3ae90e1 -r dca85f817d2b src/chat_control.py --- a/src/chat_control.py Wed Aug 22 22:42:00 2012 +0400 +++ b/src/chat_control.py Thu Aug 23 13:10:30 2012 +0200 @@ -1737,8 +1737,8 @@ # Send file if (self.contact.supports(NS_FILE) or \ - self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ - self.type_id == 'chat' or self.gc_contact.resource: + self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ + self.type_id == 'chat' or self.gc_contact.resource: self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text('') else: @@ -3223,11 +3223,11 @@ """ Show an InfoBar on top of control """ - markup = '%s: %s' % (_('File transfer'), file_props['name']) - if 'desc' in file_props and file_props['desc']: - markup += ' (%s)' % file_props['desc'] + markup = '%s: %s' % (_('File transfer'), file_props.name) + if file_props.desc: + markup += ' (%s)' % file_props.desc markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( - file_props['size'])) + file_props.size)) b1 = gtk.Button(_('_Accept')) b1.connect('clicked', self._on_accept_file_request, file_props) b2 = gtk.Button(stock=gtk.STOCK_CANCEL) @@ -3236,9 +3236,7 @@ gtk.MESSAGE_QUESTION) def _on_open_ft_folder(self, widget, file_props): - if 'file-name' not in file_props: - return - path = os.path.split(file_props['file-name'])[0] + path = os.path.split(file_props.file_name)[0] if os.path.exists(path) and os.path.isdir(path): helpers.launch_file_manager(path) ev = self._get_file_props_event(file_props, 'file-completed') @@ -3252,9 +3250,9 @@ def _got_file_completed(self, file_props): markup = '%s: %s' % (_('File transfer completed'), - file_props['name']) - if 'desc' in file_props and file_props['desc']: - markup += ' (%s)' % file_props['desc'] + file_props.name) + if file_props.desc: + markup += ' (%s)' % file_props.desc b1 = gtk.Button(_('_Open Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) b2 = gtk.Button(stock=gtk.STOCK_OK) diff -r 0c6bb3ae90e1 -r dca85f817d2b src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Aug 22 22:42:00 2012 +0400 +++ b/src/common/connection_handlers_events.py Thu Aug 23 13:10:30 2012 +0200 @@ -37,6 +37,7 @@ from common.pep import SUPPORTED_PERSONAL_USER_EVENTS from common.xmpp.protocol import NS_CHATSTATES from common.jingle_transport import JingleTransportSocks5 +from common.file_props import FilesProp import gtkgui_helpers @@ -1684,7 +1685,7 @@ pep = pep_class.get_tag_as_PEP(self.fjid, self.conn.name, self.event_tag) if pep: - self.pep_type = pep.type + self.pep_type = pep.type_ return True items = self.event_tag.getTag('items') @@ -1942,16 +1943,59 @@ self.get_id() self.fjid = self.conn._ft_get_from(self.stanza) self.jid = gajim.get_jid_without_resource(self.fjid) - self.file_props = {'type': 'r'} - self.file_props['sender'] = self.fjid - self.file_props['request-id'] = self.id_ if self.jingle_content: - self.file_props['session-type'] = 'jingle' - self.file_props['stream-methods'] = xmpp.NS_BYTESTREAM + self.FT_content.use_security = bool(self.jingle_content.getTag( + 'security')) + if not self.FT_content.transport: + self.FT_content.transport = JingleTransportSocks5() + self.FT_content.transport.set_our_jid( + self.FT_content.session.ourjid) + self.FT_content.transport.set_connection( + self.FT_content.session.connection) + sid = self.FT_content.transport.sid + self.file_props = FilesProp.getNewFileProp(self.conn.name, sid) + self.file_props.session_sid = unicode( + self.stanza.getTag('jingle').getAttr('sid') + ) + self.FT_content.file_props = self.file_props + self.FT_content.transport.set_file_props(self.file_props) + if self.file_props.streamhosts: + self.file_props.streamhosts.extend( + self.FT_content.transport.remote_candidates) + else: + self.file_props.streamhosts = \ + self.FT_content.transport.remote_candidates + for host in self.file_props.streamhosts: + host['initiator'] = self.FT_content.session.initiator + host['target'] = self.FT_content.session.responder + else: + si = self.stanza.getTag('si') + self.file_props = FilesProp.getNewFileProp(self.conn.name, + unicode(si.getAttr('id')) + ) + self.file_props.sender = self.fjid + self.file_props.request_id = self.id_ + if self.jingle_content: + self.file_props.session_type = 'jingle' + self.file_props.stream_methods = xmpp.NS_BYTESTREAM file_tag = self.jingle_content.getTag('description').getTag( 'offer').getTag('file') + for child in file_tag.getChildren(): + name = child.getName() + val = child.getData() + if val is None: + continue + if name == 'name': + self.file_props.name = val + if name == 'size': + self.file_props.size = val + if name == 'hash': + self.file_props.algo = child.getAttr('algo') + self.file_props.hash_ = val + if name == 'date': + self.file_props.date = val + else: - si = self.stanza.getTag('si') profile = si.getAttr('profile') if profile != xmpp.NS_FILE: self.conn.send_file_rejection(self.file_props, code='400', @@ -1965,9 +2009,9 @@ return self.dataform = dataforms.ExtendForm(node=form_tag) for f in self.dataform.iter_fields(): - if f.var == 'stream-method' and f.type == 'list-single': + if f.var == 'stream-method' and f.type_ == 'list-single': values = [o[1] for o in f.options] - self.file_props['stream-methods'] = ' '.join(values) + self.file_props.stream_methods = ' '.join(values) if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: break else: @@ -1975,56 +2019,25 @@ typ='stream') raise xmpp.NodeProcessed file_tag = si.getTag('file') - for child in file_tag.getChildren(): - name = child.getName() - if name in ('name', 'size', 'hash', 'date'): - val = child.getData() + for name, val in file_tag.getAttrs().items(): if val is None: continue - self.file_props[name] = val - # Delete this, it shouldn't be necesary after file_props gets - # refactored. - if name == 'hash': - self.file_props['algo'] = child.getAttr('algo') + if name == 'name': + self.file_props.name = val + if name == 'size': + self.file_props.size = val file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: - self.file_props['desc'] = file_desc_tag.getData() + self.file_props.desc = file_desc_tag.getData() if not self.jingle_content: mime_type = si.getAttr('mime-type') if mime_type is not None: - self.file_props['mime-type'] = mime_type + self.file_props.mime_type = mime_type - self.file_props['receiver'] = self.conn._ft_get_our_jid() - self.file_props['transfered_size'] = [] - if self.jingle_content: - self.FT_content.use_security = bool(self.jingle_content.getTag( - 'security')) - self.file_props['session-sid'] = unicode(self.stanza.getTag( - 'jingle').getAttr('sid')) + self.file_props.receiver = self.conn._ft_get_our_jid() + self.file_props.transfered_size = [] - self.FT_content.file_props = self.file_props - if not self.FT_content.transport: - self.FT_content.transport = JingleTransportSocks5() - self.FT_content.transport.set_our_jid( - self.FT_content.session.ourjid) - self.FT_content.transport.set_connection( - self.FT_content.session.connection) - self.file_props['sid'] = self.FT_content.transport.sid - self.FT_content.session.connection.files_props[ - self.file_props['sid']] = self.file_props - self.FT_content.transport.set_file_props(self.file_props) - if self.file_props.has_key('streamhosts'): - self.file_props['streamhosts'].extend( - self.FT_content.transport.remote_candidates) - else: - self.file_props['streamhosts'] = \ - self.FT_content.transport.remote_candidates - for host in self.file_props['streamhosts']: - host['initiator'] = self.FT_content.session.initiator - host['target'] = self.FT_content.session.responder - else: - self.file_props['sid'] = unicode(si.getAttr('id')) return True class FileRequestErrorEvent(nec.NetworkIncomingEvent): diff -r 0c6bb3ae90e1 -r dca85f817d2b src/common/dataforms.py --- a/src/common/dataforms.py Wed Aug 22 22:42:00 2012 +0400 +++ b/src/common/dataforms.py Thu Aug 23 13:10:30 2012 +0200 @@ -120,7 +120,7 @@ if extend is None: ExtendedNode.__init__(self, 'field') - self.type = typ + self.type_ = typ self.var = var if value is not None: self.value = value @@ -248,7 +248,7 @@ self.delChild(t) return locals() - + def is_valid(self): return True @@ -463,7 +463,7 @@ def iter_values(self): for element in self.getTags('value'): yield element.getData() - + def is_valid(self): if not self.required: return True @@ -577,7 +577,7 @@ def __getitem__(self, item): return self.vars[item] - + def is_valid(self): for f in self.iter_fields(): if not f.is_valid(): diff -r 0c6bb3ae90e1 -r dca85f817d2b src/common/file_props.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/file_props.py Thu Aug 23 13:10:30 2012 +0200 @@ -0,0 +1,156 @@ +""" +This module is in charge of taking care of all the infomation related to +individual files. Files are identified by the account name and its sid. + + +>>> print FilesProp.getFileProp('jabberid', '10') +None +>>> fp = FilesProp() +Traceback (most recent call last): + ... +Exception: this class should not be instatiated +>>> print FilesProp.getAllFileProp() +[] +>>> fp = FilesProp.getNewFileProp('jabberid', '10') +>>> fp2 = FilesProp.getFileProp('jabberid', '10') +>>> fp == fp2 +True +""" + +class FilesProp: + _files_props = {} + + def __init__(self): + raise Exception('this class should not be instatiated') + + @classmethod + def getNewFileProp(cls, account, sid):

1 0

gajim: clean file props after we have tested proxies
by Yann Leboulanger 23 Aug '12

23 Aug '12

changeset 018a8f925517 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=018a8f925517 description: clean file props after we have tested proxies diffstat: src/common/proxy65_manager.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 545e5d948985 -r 018a8f925517 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Thu Aug 23 12:12:19 2012 +0200 +++ b/src/common/proxy65_manager.py Thu Aug 23 12:13:20 2012 +0200 @@ -174,9 +174,11 @@ def disconnect(self, connection): if self.host_tester: self.host_tester.disconnect() + FilesProp.deleteFileProp(self.host_tester.file_props) self.host_tester = None if self.receiver_tester: self.receiver_tester.disconnect() + FilesProp.deleteFileProp(self.receiver_tester.file_props) self.receiver_tester = None try: self.connections.remove(connection)

1 0

gajim: fix is_transfer_stopped() function. Fixes #7170
by Yann Leboulanger 23 Aug '12

23 Aug '12

changeset 545e5d948985 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=545e5d948985 description: fix is_transfer_stopped() function. Fixes #7170 diffstat: src/common/protocol/bytestream.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 8c9601e7acb6 -r 545e5d948985 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Aug 23 11:36:51 2012 +0200 +++ b/src/common/protocol/bytestream.py Thu Aug 23 12:12:19 2012 +0200 @@ -69,12 +69,10 @@ def is_transfer_stopped(file_props): if not file_props: return True - if file_props.error != 0: + if file_props.error: return True if file_props.completed: return True - if not file_props.connected: - return True if not file_props.stopped: return False return True

1 0

gajim: don't do SSL over SSL and correctly shutdown SSL sockets.
by Yann Leboulanger 23 Aug '12

23 Aug '12

changeset 8c9601e7acb6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8c9601e7acb6 description: don't do SSL over SSL and correctly shutdown SSL sockets. diffstat: src/common/socks5.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (34 lines): diff -r 7e48199339b4 -r 8c9601e7acb6 src/common/socks5.py --- a/src/common/socks5.py Wed Aug 22 15:30:12 2012 -0400 +++ b/src/common/socks5.py Thu Aug 23 11:36:51 2012 +0200 @@ -770,7 +770,10 @@ if self.queue.listener.connections == []: self.queue.listener.disconnect() try: - self._sock.shutdown(socket.SHUT_RDWR) + if isinstance(self._sock, OpenSSL.SSL.Connection): + self._sock.shutdown() + else: + self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except Exception: # socket is already closed @@ -901,7 +904,8 @@ self._sock = _sock if _sock is not None: - if self.fingerprint is not None: + if self.fingerprint is not None and not isinstance(self._sock, + OpenSSL.SSL.Connection): self._sock = OpenSSL.SSL.Connection( jingle_xtls.get_context('server'), _sock) else: @@ -938,7 +942,7 @@ if self.fingerprint is not None: self._sock = OpenSSL.SSL.Connection( - jingle_xtls.get_context('client'), self._sock) + jingle_xtls.get_context('client'), _sock) else: self._sock.setblocking(False)

1 0

gajim: only delete file_props in the ft_window
by Jefry Lagrange 22 Aug '12

22 Aug '12

changeset 7e48199339b4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7e48199339b4 description: only delete file_props in the ft_window diffstat: src/common/jingle_ft.py | 3 --- src/common/protocol/bytestream.py | 12 ------------ src/common/socks5.py | 16 ---------------- src/roster_window.py | 4 ++-- 4 files changed, 2 insertions(+), 33 deletions(-) diffs (104 lines): diff -r 83d5005aedaa -r 7e48199339b4 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 22 18:09:40 2012 +0200 +++ b/src/common/jingle_ft.py Wed Aug 22 15:30:12 2012 -0400 @@ -92,9 +92,6 @@ self.transport.set_our_jid(session.ourjid) log.info('ourjid: %s' % session.ourjid) - if self.file_props is not None: - self.file_props.sid = self.transport.sid - self.session = session self.media = 'file' self.nominated_cand = {} diff -r 83d5005aedaa -r 7e48199339b4 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Aug 22 18:09:40 2012 +0200 +++ b/src/common/protocol/bytestream.py Wed Aug 22 15:30:12 2012 -0400 @@ -325,8 +325,6 @@ return self.disconnect_transfer(file_props) sid = file_props.sid - gajim.socks5queue.remove_file_props(self.name, sid) - def disconnect_transfer(self, file_props): if file_props is None: @@ -340,11 +338,6 @@ gajim.socks5queue.remove_receiver(host['idx']) gajim.socks5queue.remove_sender(host['idx']) - if file_props.direction: - # it's a IBB - FilesProp.deleteFileProp(file_props) - del(file_props) - def _send_socks5_info(self, file_props): """ Send iq for the present streamhosts and proxies @@ -880,8 +873,6 @@ payload=[xmpp.Node(xmpp.NS_IBB + ' close', {'sid':sid})])) file_props.completed = True - FilesProp.deleteFileProp(file_props) - del(file_props) def IBBMessageHandler(self, conn, stanza): """ @@ -947,7 +938,6 @@ conn.send(reply) file_props.fp.close() gajim.socks5queue.complete_transfer_cb(self.name, file_props) - gajim.socks5queue.remove_file_props(self.name, sid) else: conn.send(xmpp.Error(stanza, xmpp.ERR_ITEM_NOT_FOUND)) @@ -970,8 +960,6 @@ conn.Event('IBB', 'ERROR ON RECEIVE', file_props) else: conn.Event('IBB', 'ERROR ON SEND', file_props) - FilesProp.deleteFileProp(file_props) - del(file_props) elif stanza.getType() == 'result': if file_props.direction[0] == '|': file_props.direction = file_props.direction[1:] diff -r 83d5005aedaa -r 7e48199339b4 src/common/socks5.py --- a/src/common/socks5.py Wed Aug 22 18:09:40 2012 +0200 +++ b/src/common/socks5.py Wed Aug 22 15:30:12 2012 -0400 @@ -320,22 +320,6 @@ result = sender.send_file() self.process_result(result, sender) - 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 ' + - 'from account ' + str(account) + ' and sid ' + str(sid)) - return - if sid in self.on_success: - del self.on_success[fp.sid] - if sid in self.on_failure: - del self.on_failure[fp.sid] - - FilesProp.deleteFileProp(fp) - - if len(FilesProp.getFilePropByAccount(account)) == 0: - self.connected = 0 - def isHashInSockObjs(self, sockobjs, hash): ''' It tells wether there is a particular hash in sockobjs or not diff -r 83d5005aedaa -r 7e48199339b4 src/roster_window.py --- a/src/roster_window.py Wed Aug 22 18:09:40 2012 +0200 +++ b/src/roster_window.py Wed Aug 22 15:30:12 2012 -0400 @@ -1970,9 +1970,9 @@ return True elif event.type_ in ('file-error', 'file-stopped'): msg_err = '' - if data['error'] == -1: + if data.error == -1: msg_err = _('Remote contact stopped transfer') - elif data['error'] == -6: + elif data.error == -6: msg_err = _('Error opening file') ft.show_stopped(jid, data, error_msg=msg_err) gajim.events.remove_events(account, jid, event)

1 0

gajim: fix unexpected indent
by Fomin Denis 22 Aug '12

22 Aug '12

changeset 0c6bb3ae90e1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0c6bb3ae90e1 description: fix unexpected indent diffstat: src/roster_window.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r a669ca598089 -r 0c6bb3ae90e1 src/roster_window.py --- a/src/roster_window.py Wed Aug 22 22:28:41 2012 +0400 +++ b/src/roster_window.py Wed Aug 22 22:42:00 2012 +0400 @@ -1194,9 +1194,9 @@ # the treeview if contact.status and gajim.config.get('show_status_msgs_in_roster'): status = contact.status.strip() - if status != '': - status = helpers.reduce_chars_newlines(status, - max_lines = 1) + if status != '': + status = helpers.reduce_chars_newlines(status, + max_lines = 1) # escape markup entities and make them small # italic and fg color color is calcuted to be # always readable

1 0

gajim: revert test patch. fix previous commit
by Fomin Denis 22 Aug '12

22 Aug '12

changeset a669ca598089 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a669ca598089 description: revert test patch. fix previous commit diffstat: src/roster_window.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 89ca4c2f1dd0 -r a669ca598089 src/roster_window.py --- a/src/roster_window.py Wed Aug 22 22:21:26 2012 +0400 +++ b/src/roster_window.py Wed Aug 22 22:28:41 2012 +0400 @@ -1192,10 +1192,10 @@ # add status msg, if not empty, under contact name in # the treeview - if not contact.status: - contact.status = ' ' if contact.status and gajim.config.get('show_status_msgs_in_roster'): - status = helpers.reduce_chars_newlines(contact.status, + status = contact.status.strip() + if status != '': + status = helpers.reduce_chars_newlines(status, max_lines = 1) # escape markup entities and make them small # italic and fg color color is calcuted to be

1 0

gajim: plugin system. checking the type of stored data. Fix #7220
by Fomin Denis 22 Aug '12

22 Aug '12

changeset 89ca4c2f1dd0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89ca4c2f1dd0 description: plugin system. checking the type of stored data. Fix #7220 diffstat: src/plugins/plugin.py | 2 ++ src/roster_window.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diffs (29 lines): diff -r 2359e1b05621 -r 89ca4c2f1dd0 src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Aug 20 15:46:20 2012 +0200 +++ b/src/plugins/plugin.py Wed Aug 22 22:21:26 2012 +0400 @@ -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: diff -r 2359e1b05621 -r 89ca4c2f1dd0 src/roster_window.py --- a/src/roster_window.py Mon Aug 20 15:46:20 2012 +0200 +++ b/src/roster_window.py Wed Aug 22 22:21:26 2012 +0400 @@ -1192,10 +1192,10 @@ # add status msg, if not empty, under contact name in # the treeview + if not contact.status: + contact.status = ' ' if contact.status and gajim.config.get('show_status_msgs_in_roster'): - status = contact.status.strip() - if status != '': - status = helpers.reduce_chars_newlines(status, + status = helpers.reduce_chars_newlines(contact.status, max_lines = 1) # escape markup entities and make them small # italic and fg color color is calcuted to be

1 0

gajim: make using receiver proxy work
by Yann Leboulanger 22 Aug '12

22 Aug '12

changeset 83d5005aedaa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=83d5005aedaa description: make using receiver proxy work diffstat: src/common/jingle_ft.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (17 lines): diff -r d6901d0eed53 -r 83d5005aedaa src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Aug 22 14:49:44 2012 +0200 +++ b/src/common/jingle_ft.py Wed Aug 22 18:09:40 2012 +0200 @@ -110,9 +110,12 @@ def __state_changed(self, nextstate, args=None): # Executes the next state action and sets the next state + current_state = self.state st = self.states[nextstate] st.action(args) - self.state = nextstate + # state can have been changed during the action. Don't go back. + if self.state == current_state: + self.state = nextstate def __on_session_initiate(self, stanza, content, error, action): gajim.nec.push_incoming_event(FileRequestReceivedEvent(None,

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