Commits October 2011

commits@gajim.org

3 participants
64 discussions

gajim: catch the error in the plugins manifest file
by Fomin Denis 16 Oct '11

16 Oct '11

changeset a59be967aa02 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a59be967aa02 description: catch the error in the plugins manifest file diffstat: src/plugins/pluginmanager.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 1667779e44fb -r a59be967aa02 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Oct 16 11:14:40 2011 +0200 +++ b/src/plugins/pluginmanager.py Sun Oct 16 22:40:42 2011 +0300 @@ -480,6 +480,14 @@ # all fields are required log.debug('%s : %s' % (module_attr_name, 'wrong manifest file. all fields are required!')) + except ConfigParser.NoSectionError, type_error: + # info section are required + log.debug('%s : %s' % (module_attr_name, + 'wrong manifest file. info section are required!')) + except ConfigParser.MissingSectionHeaderError, type_error: + # info section are required + log.debug('%s : %s' % (module_attr_name, + 'wrong manifest file. section are required!')) return plugins_found

1 0

gajim: prevent traceback when obj.msg_id is not set
by Yann Leboulanger 16 Oct '11

16 Oct '11

changeset 1667779e44fb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1667779e44fb description: prevent traceback when obj.msg_id is not set diffstat: src/session.py | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diffs (52 lines): diff -r 77435d3a9d12 -r 1667779e44fb src/session.py --- a/src/session.py Sat Oct 15 10:47:22 2011 +0200 +++ b/src/session.py Sun Oct 16 11:14:40 2011 +0200 @@ -73,7 +73,7 @@ if self.control and self.control.resource: self.control.change_resource(self.resource) - msg_id = None + obj.msg_id = None if obj.mtype == 'chat': if not obj.stanza.getTag('body') and obj.chatstate is None: @@ -89,7 +89,7 @@ msg_to_log = obj.xhtml else: msg_to_log = obj.msgtxt - msg_id = gajim.logger.write(log_type, obj.fjid, + obj.msg_id = gajim.logger.write(log_type, obj.fjid, msg_to_log, tim=obj.timestamp, subject=obj.subject) except exceptions.PysqliteOperationalError, e: self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e))) @@ -101,8 +101,6 @@ common.logger.LOG_DB_PATH self.conn.dispatch('ERROR', (pritext, sectext)) - obj.msg_id = msg_id - treat_as = gajim.config.get('treat_incoming_messages') if treat_as: obj.mtype = treat_as @@ -132,8 +130,8 @@ # Brand new message, incoming. contact.our_chatstate = obj.chatstate contact.chatstate = obj.chatstate - if msg_id: # Do not overwrite an existing msg_id with None - contact.msg_id = msg_id + if obj.msg_id: # Do not overwrite an existing msg_id with None + contact.msg_id = obj.msg_id # THIS MUST BE AFTER chatstates handling # AND BEFORE playsound (else we ear sounding on chatstates!) @@ -166,8 +164,8 @@ if gajim.interface.remote_ctrl: gajim.interface.remote_ctrl.raise_signal('NewMessage', ( self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, - obj.encrypted, obj.mtype, obj.subject, obj.chatstate, msg_id, - obj.user_nick, obj.xhtml, obj.form_node])) + obj.encrypted, obj.mtype, obj.subject, obj.chatstate, + obj.msg_id, obj.user_nick, obj.xhtml, obj.form_node])) def roster_message2(self, obj): """

1 0

gajim: request room config when we convert a chat to groupchat s...
by Yann Leboulanger 15 Oct '11

15 Oct '11

changeset 77435d3a9d12 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=77435d3a9d12 description: request room config when we convert a chat to groupchat so that we can configure it. Fixes #7014 diffstat: src/groupchat_control.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (18 lines): diff -r bb36d5003554 -r 77435d3a9d12 src/groupchat_control.py --- a/src/groupchat_control.py Thu Oct 13 22:23:40 2011 +0200 +++ b/src/groupchat_control.py Sat Oct 15 10:47:22 2011 +0200 @@ -1495,6 +1495,14 @@ # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-\ # init if obj.status_code: + if '110' in obj.status_code: + # We just join the room + if self.room_jid in gajim.automatic_rooms[self.account] and \ + gajim.automatic_rooms[self.account][self.room_jid]['invities']: + if self.room_jid not in gajim.interface.instances[ + self.account]['gc_config']: + gajim.connections[self.account].request_gc_config( + self.room_jid) if '100' in obj.status_code: # Can be a message (see handle_event_gc_config_change in # gajim.py)

1 0

gajim: tryin to unpickle a GNU dbm file doesn't produce the same...
by Yann Leboulanger 13 Oct '11

13 Oct '11

changeset bb36d5003554 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bb36d5003554 description: tryin to unpickle a GNU dbm file doesn't produce the same exception as bsddb. Handle both. Fixes #7013 diffstat: src/plugins/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0e920f32c0b8 -r bb36d5003554 src/plugins/plugin.py --- a/src/plugins/plugin.py Thu Oct 13 21:44:29 2011 +0200 +++ b/src/plugins/plugin.py Thu Oct 13 22:23:40 2011 +0200 @@ -250,7 +250,7 @@ try: self.data = cPickle.load(fd) fd.close() - except EOFError: + except: fd.close() try: import shelve

1 0

gajim: don't generate wrong jid when sending a single message to...
by Yann Leboulanger 13 Oct '11

13 Oct '11

changeset 0e920f32c0b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0e920f32c0b8 description: don't generate wrong jid when sending a single message to several contacts diffstat: src/dialogs.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 569a26c5f75a -r 0e920f32c0b8 src/dialogs.py --- a/src/dialogs.py Thu Oct 13 18:04:43 2011 +0200 +++ b/src/dialogs.py Thu Oct 13 21:44:29 2011 +0200 @@ -3067,7 +3067,12 @@ _('Please make sure you are connected with "%s".') % self.account) return if isinstance(self.to, list): - sender_list = [i[0].jid + '/' + i[0].resource for i in self.to] + sender_list = [] + for i in self.to: + if i[0].resource: + sender_list.append(i[0].jid + '/' + i[0].resource) + else: + sender_list.append(i[0].jid) else: sender_list = [self.to_entry.get_text().decode('utf-8')]

1 0

gajim: handle default value in seclabel combobox. see #7010
by Yann Leboulanger 13 Oct '11

13 Oct '11

changeset 569a26c5f75a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=569a26c5f75a description: handle default value in seclabel combobox. see #7010 diffstat: src/chat_control.py | 11 +++++++++-- src/common/connection_handlers.py | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diffs (45 lines): diff -r f8f0545eeaa3 -r 569a26c5f75a src/chat_control.py --- a/src/chat_control.py Wed Oct 12 21:07:02 2011 +0200 +++ b/src/chat_control.py Thu Oct 13 18:04:43 2011 +0200 @@ -311,9 +311,16 @@ def on_seclabels_ready(self): lb = self.seclabel_combo.get_model() lb.clear() - for label in gajim.connections[self.account].seclabel_catalogues[self.contact.jid][2]: + i = 0 + sel = 0 + catalogue = gajim.connections[self.account].seclabel_catalogues[ + self.contact.jid] + for label in catalogue[2]: lb.append([label]) - self.seclabel_combo.set_active(0) + if label == catalogue[3]: + sel = i + i += 1 + self.seclabel_combo.set_active(sel) self.seclabel_combo.set_no_show_all(False) self.seclabel_combo.show_all() diff -r f8f0545eeaa3 -r 569a26c5f75a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Oct 12 21:07:02 2011 +0200 +++ b/src/common/connection_handlers.py Thu Oct 13 18:04:43 2011 +0200 @@ -1416,14 +1416,18 @@ items = query.getTags('item') labels = {} ll = [] + default = None for item in items: label = item.getAttr('selector') labels[label] = item.getTag('securitylabel') ll.append(label) + if item.getAttr('default') == 'true': + default = label if to not in self.seclabel_catalogues: - self.seclabel_catalogues[to] = [[], None, None] + self.seclabel_catalogues[to] = [[], None, None, None] self.seclabel_catalogues[to][1] = labels self.seclabel_catalogues[to][2] = ll + self.seclabel_catalogues[to][3] = default for callback in self.seclabel_catalogues[to][0]: callback() self.seclabel_catalogues[to][0] = []

1 0

gajim: prevent traceback when going offline while a jingle sessi...
by Yann Leboulanger 12 Oct '11

12 Oct '11

changeset f8f0545eeaa3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f8f0545eeaa3 description: prevent traceback when going offline while a jingle session is active diffstat: src/common/jingle_session.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 04206d24c1dd -r f8f0545eeaa3 src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Oct 11 21:44:02 2011 +0200 +++ b/src/common/jingle_session.py Wed Oct 12 21:07:02 2011 +0200 @@ -672,9 +672,10 @@ def __content_remove(self, content, reason=None): assert self.state != JingleStates.ended - stanza, jingle = self.__make_jingle('content-remove', reason=reason) - self.__append_content(jingle, content) - self.connection.connection.send(stanza) + if self.connection.connection and self.connection.connected > 1: + stanza, jingle = self.__make_jingle('content-remove', reason=reason) + self.__append_content(jingle, content) + self.connection.connection.send(stanza) # TODO: this will fail if content is not an RTP content gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, conn=self.connection, jingle_session=self, media=content.media,

1 0

gajim: fix upgrading from old plugin config files
by Yann Leboulanger 11 Oct '11

11 Oct '11

changeset 04206d24c1dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=04206d24c1dd description: fix upgrading from old plugin config files diffstat: src/plugins/plugin.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 0ffd01eba616 -r 04206d24c1dd src/plugins/plugin.py --- a/src/plugins/plugin.py Tue Oct 11 22:27:41 2011 +0300 +++ b/src/plugins/plugin.py Tue Oct 11 21:44:02 2011 +0200 @@ -264,9 +264,10 @@ '%s and creating a new one' % (self.plugin.short_name, self.FILE_PATH + '.bak')) if os.path.exists(self.FILE_PATH + '.bak'): - os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') - self.data = {} - self.save() + os.remove(self.FILE_PATH + '.bak') + os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') + self.data = {} + self.save() else: self.data = {} self.save()

1 0

gajim: prevent traceback
by Fomin Denis 11 Oct '11

11 Oct '11

changeset 0ffd01eba616 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ffd01eba616 description: prevent traceback diffstat: src/plugins/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a1f2afcbebef -r 0ffd01eba616 src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Oct 10 22:06:30 2011 +0300 +++ b/src/plugins/plugin.py Tue Oct 11 22:27:41 2011 +0300 @@ -203,7 +203,7 @@ self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR, self.plugin.short_name).decode('utf-8').encode( locale.getpreferredencoding()) - self.data = None + self.data = {} @log_calls('GajimPluginConfig') def __getitem__(self, key):

1 0

gajim: fix previos commit
by Fomin Denis 10 Oct '11

10 Oct '11

changeset a1f2afcbebef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1f2afcbebef description: fix previos commit diffstat: src/plugins/plugin.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 5fd419ea860d -r a1f2afcbebef src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Oct 10 16:43:22 2011 +0200 +++ b/src/plugins/plugin.py Mon Oct 10 22:06:30 2011 +0300 @@ -234,6 +234,9 @@ def keys(self): return self.data.keys() + def items(self): + return self.data.items() + @log_calls('GajimPluginConfig') def save(self): fd = open(self.FILE_PATH, 'wb') @@ -242,7 +245,7 @@ @log_calls('GajimPluginConfig') def load(self): - if os.path.isfile('qwe'): + if os.path.isfile(self.FILE_PATH): fd = open(self.FILE_PATH, 'rb') try: self.data = cPickle.load(fd)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2011