Commits October 2015

commits@gajim.org

1 participants
37 discussions

gajim: [tmolitor] ability to download bigger files with higher t...
by Gajim 05 Oct '15

05 Oct '15

changeset 1db402099910 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1db402099910 description: [tmolitor] ability to download bigger files with higher timeouts. Fixes #8130 diffstat: src/common/helpers.py | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diffs (68 lines): diff -r 4d99acdadf05 -r 1db402099910 src/common/helpers.py --- a/src/common/helpers.py Thu Aug 20 15:08:53 2015 +0200 +++ b/src/common/helpers.py Thu Aug 20 21:53:59 2015 +0200 @@ -1433,8 +1433,11 @@ """ mem = b'' alt = '' - # Wait maximum 5s for connection - socket.setdefaulttimeout(5) + max_size = 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] + # Wait maximum 10s for connection + socket.setdefaulttimeout(10) try: req = urllib.request.Request(attrs['src']) req.add_header('User-Agent', 'Gajim ' + gajim.version) @@ -1444,13 +1447,13 @@ pixbuf = None alt = attrs.get('alt', 'Broken image') else: - # Wait 0.5s between each byte + # Wait 2s between each byte try: - f.fp._sock.fp._sock.settimeout(0.5) + f.fp._sock.fp._sock.settimeout(2) except Exception: pass - # Max image size = 2 MB (to try to prevent DoS) - deadline = time.time() + 3 + # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + deadline = time.time() + (10 * (max_size / 1048576)) while True: if time.time() > deadline: log.debug('Timeout loading image %s ' % attrs['src']) @@ -1473,7 +1476,7 @@ mem += temp else: break - if len(mem) > 2*1024*1024: + if len(mem) > max_size: alt = attrs.get('alt', '') if alt: alt += '\n' @@ -1489,15 +1492,19 @@ """ if not gajim.HAVE_PYCURL: return '', _('PyCURL is not installed') - mem, alt = '', '' + mem, alt, max_size = '', '', 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] try: b = StringIO() c = pycurl.Curl() c.setopt(pycurl.URL, attrs['src'].encode('utf-8')) c.setopt(pycurl.FOLLOWLOCATION, 1) - c.setopt(pycurl.CONNECTTIMEOUT, 5) - c.setopt(pycurl.TIMEOUT, 10) - c.setopt(pycurl.MAXFILESIZE, 2000000) + # Wait maximum 10s for connection + c.setopt(pycurl.CONNECTTIMEOUT, 10) + # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + c.setopt(pycurl.TIMEOUT, 10 * (max_size / 1048576)) + c.setopt(pycurl.MAXFILESIZE, max_size) c.setopt(pycurl.WRITEFUNCTION, b.write) c.setopt(pycurl.USERAGENT, 'Gajim ' + gajim.version) # set proxy

1 0

gajim: update links and copyright in manpages. Fixes #8136, #7719
by Gajim 05 Oct '15

05 Oct '15

changeset 140a7df1068b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=140a7df1068b description: update links and copyright in manpages. Fixes #8136, #7719 diffstat: data/gajim-history-manager.1 | 16 ++++++++-------- data/gajim-remote.1 | 14 +++++++------- data/gajim.1 | 32 ++++++++++++++++---------------- 3 files changed, 31 insertions(+), 31 deletions(-) diffs (206 lines): diff -r 1db402099910 -r 140a7df1068b data/gajim-history-manager.1 --- a/data/gajim-history-manager.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim-history-manager.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM-HISTORY-MANAGER 1 URM .Os UNIX .Sh NAME @@ -27,7 +27,7 @@ .El .Sh FILES .Bl -tag -width Ds -.It ~/.local/share/gajim/logs.db +.It $XDG_DATA_DIR/gajim/logs.db The history database log file used when .Op Fl c is not specified. @@ -46,7 +46,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -56,7 +56,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -65,19 +65,19 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at https://trac.gajim.org/ diff -r 1db402099910 -r 140a7df1068b data/gajim-remote.1 --- a/data/gajim-remote.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim-remote.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM-REMOTE 1 URM .Os UNIX .Sh NAME @@ -99,7 +99,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -109,7 +109,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -118,19 +118,19 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at https://trac.gajim.org/ diff -r 1db402099910 -r 140a7df1068b data/gajim.1 --- a/data/gajim.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM 1 URM .Os UNIX .Sh NAME @@ -26,7 +26,7 @@ technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data. For more information -on the XMPP protocol see <http://xmpp.org/about-xmpp/>. +on the XMPP protocol see <https://xmpp.org/about-xmpp/>. .Sh OPTIONS .Bl -tag -width Ds .It Fl h Fl Fl help @@ -60,19 +60,19 @@ .El .Sh FILES .Bl -tag -width Ds -.It ~/.cache/gajim/cache.db +.It $XDG_CACHE_DIR/gajim/cache.db Cache database file of transports, caps, roster entry, and roster group. -.It ~/.cache/gajim/avatars/ +.It $XDG_CACHE_DIR/gajim/avatars/ Cache directory of avatars. -.It ~/.cache/gajim/vcards/ +.It $XDG_CACHE_DIR/gajim/vcards/ Cache directory of vCards (virtual cards). -.It ~/.config/gajim/ +.It $XDG_CONFIG_DIR/gajim/ The config-path used when .Op Fl c is not specified. -.It ~/.local/share/gajim/certs/ +.It $XDG_DATA_DIR/gajim/certs/ Directory where certificates are stored. -.It ~/.local/share/gajim/logs.db +.It $XDG_DATA_DIR/gajim/logs.db The history database log file. For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. .El @@ -90,7 +90,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -100,7 +100,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -109,26 +109,26 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at .Bd -literal -offset indent https://trac.gajim.org/ -http://trac-plugins.gajim.org/ -http://python-nbxmpp.gajim.org/ +https://trac-plugins.gajim.org/ +https://python-nbxmpp.gajim.org/ .Ed .Sh SEE ALSO .Xr gajim-remote 1

1 0

gajim: delete cache db when logs db doesn't exist. Anyway data w...
by Gajim 05 Oct '15

05 Oct '15

changeset e24804289058 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e24804289058 description: delete cache db when logs db doesn't exist. Anyway data will be wrong inside. Fixes #8133 diffstat: src/common/check_paths.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 140a7df1068b -r e24804289058 src/common/check_paths.py --- a/src/common/check_paths.py Wed Aug 26 22:01:35 2015 +0200 +++ b/src/common/check_paths.py Thu Aug 27 14:53:18 2015 +0200 @@ -330,6 +330,8 @@ check_and_possibly_move_config() if not os.path.exists(LOG_DB_PATH): + if os.path.exists(CACHE_DB_PATH): + os.remove(CACHE_DB_PATH) create_log_db() gajim.logger.init_vars() elif os.path.isdir(LOG_DB_PATH):

1 0

gajim: show error message when we try to connect anonymously to ...
by Gajim 05 Oct '15

05 Oct '15

changeset 055dfd32975c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=055dfd32975c description: show error message when we try to connect anonymously to a server that doesn't support anonymous connection. Fixes #8138 diffstat: src/common/connection.py | 6 ++++++ src/common/connection_handlers_events.py | 4 ++++ src/gui_interface.py | 8 ++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diffs (55 lines): diff -r e24804289058 -r 055dfd32975c src/common/connection.py --- a/src/common/connection.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/common/connection.py Mon Aug 31 13:47:18 2015 +0200 @@ -2860,6 +2860,12 @@ self.connection.send(iq) def get_password(self, callback, type_): + if gajim.config.get_per('accounts', self.name, 'anonymous_auth') and \ + type_ != 'ANONYMOUS': + gajim.nec.push_incoming_event(NonAnonymousServerErrorEvent(None, + conn=self)) + self._on_disconnected() + return self.pasword_callback = (callback, type_) if type_ == 'X-MESSENGER-OAUTH2': client_id = gajim.config.get_per('accounts', self.name, diff -r e24804289058 -r 055dfd32975c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/common/connection_handlers_events.py Mon Aug 31 13:47:18 2015 +0200 @@ -1924,6 +1924,10 @@ name = 'privacy-list-active-default' base_network_events = [] +class NonAnonymousServerErrorEvent(nec.NetworkIncomingEvent): + name = 'non-anonymous-server-error' + base_network_events = [] + class VcardReceivedEvent(nec.NetworkIncomingEvent): name = 'vcard-received' base_network_events = [] diff -r e24804289058 -r 055dfd32975c src/gui_interface.py --- a/src/gui_interface.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/gui_interface.py Mon Aug 31 13:47:18 2015 +0200 @@ -1376,6 +1376,13 @@ self.instances[account]['online_dialog']['ssl_error'].set_title( _('SSL Certificate Verification for %s') % account) + def handle_event_non_anonymous_server(self, obj): + account = obj.conn.name + server = gajim.config.get_per('accounts', account, 'hostname') + dialogs.ErrorDialog(_('Non Anonymous Server'), sectext='Server "%s"' + 'does not support anonymous connection' % server, + transient_for=self.roster.window) + def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint_sha1,new_fingerprint_sha256,)) account = obj.conn.name @@ -1579,6 +1586,7 @@ [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], 'ssl-error': [self.handle_event_ssl_error], + 'non-anonymous-server-error': [self.handle_event_non_anonymous_server], 'stream-conflict-received': [self.handle_event_resource_conflict], 'subscribe-presence-received': [ self.handle_event_subscribe_presence],

1 0

gajim: don't fail when we receive a MAM message without a body. ...
by Gajim 05 Oct '15

05 Oct '15

changeset 42f23776b9af in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=42f23776b9af description: don't fail when we receive a MAM message without a body. Fixes #8140 diffstat: src/common/logger.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diffs (40 lines): diff -r 055dfd32975c -r 42f23776b9af src/common/logger.py --- a/src/common/logger.py Mon Aug 31 13:47:18 2015 +0200 +++ b/src/common/logger.py Thu Sep 03 22:06:04 2015 +0200 @@ -1104,21 +1104,22 @@ time_col = int(float(time.mktime(tim))) else: time_col = int(float(time.time())) - if msg: - if self.jid_is_from_pm(with_) or nick: - # It's a groupchat message - if nick: - # It's a message from a groupchat occupent - type_ = 'gc_msg' - with_ = with_ + '/' + nick - else: - # It's a server message message, we don't log them - return + if not msg: + return + if self.jid_is_from_pm(with_) or nick: + # It's a groupchat message + if nick: + # It's a message from a groupchat occupent + type_ = 'gc_msg' + with_ = with_ + '/' + nick else: - if direction == 'from': - type_ = 'chat_msg_recv' - elif direction == 'to': - type_ = 'chat_msg_sent' + # It's a server message message, we don't log them + return + else: + if direction == 'from': + type_ = 'chat_msg_recv' + elif direction == 'to': + type_ = 'chat_msg_sent' jid_id = self.get_jid_id(with_) where_sql = 'jid_id = %s AND message=?' % jid_id if type_ == 'gc_msg':

1 0

gajim: update XEP-0334 (Message Processing Hints) to V0.2
by Gajim 05 Oct '15

05 Oct '15

changeset c1f05409a916 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c1f05409a916 description: update XEP-0334 (Message Processing Hints) to V0.2 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 42f23776b9af -r c1f05409a916 src/common/connection.py --- a/src/common/connection.py Thu Sep 03 22:06:04 2015 +0200 +++ b/src/common/connection.py Sun Sep 13 13:57:04 2015 +0200 @@ -426,7 +426,7 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) - msg_iq.addChild(name='no-permanent-storage', + msg_iq.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) if form_node: @@ -506,7 +506,7 @@ if self.carbons_enabled: msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) - msg_iq.addChild(name='no-permanent-storage', + msg_iq.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) msg_iq.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS)

1 0

gajim: add type='submit' to MAM request data form. Fixes #8149
by Gajim 05 Oct '15

05 Oct '15

changeset 7bf94fc874c2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7bf94fc874c2 description: add type='submit' to MAM request data form. Fixes #8149 diffstat: src/common/message_archiving.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c1f05409a916 -r 7bf94fc874c2 src/common/message_archiving.py --- a/src/common/message_archiving.py Sun Sep 13 13:57:04 2015 +0200 +++ b/src/common/message_archiving.py Wed Sep 16 20:43:57 2015 +0200 @@ -103,7 +103,7 @@ max=30): iq_ = nbxmpp.Iq('set') query = iq_.addChild('query', namespace=nbxmpp.NS_MAM) - x = query.addChild('x', namespace=nbxmpp.NS_DATA) + x = query.addChild(node=nbxmpp.DataForm(typ='submit')) x.addChild(node=nbxmpp.DataField(typ='hidden', name='FORM_TYPE', value=nbxmpp.NS_MAM)) if start: x.addChild(node=nbxmpp.DataField(typ='text-single', name='start', value=start))

1 0

gajim: decode PGP messages in MAM response. Fixes #8103
by Gajim 05 Oct '15

05 Oct '15

changeset f0b6ca5fd110 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f0b6ca5fd110 description: decode PGP messages in MAM response. Fixes #8103 diffstat: src/common/connection_handlers.py | 38 +++++++++- src/common/connection_handlers_events.py | 122 ++++++++++++++++++------------ src/common/message_archiving.py | 18 ++++- 3 files changed, 127 insertions(+), 51 deletions(-) diffs (254 lines): diff -r 7bf94fc874c2 -r f0b6ca5fd110 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 16 20:43:57 2015 +0200 +++ b/src/common/connection_handlers.py Sat Sep 19 13:58:28 2015 +0200 @@ -893,6 +893,8 @@ self._nec_gc_presence_received) gajim.ged.register_event_handler('message-received', ged.CORE, self._nec_message_received) + gajim.ged.register_event_handler('mam-message-received', ged.CORE, + self._nec_mam_message_received) gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) @@ -905,6 +907,8 @@ self._nec_gc_presence_received) gajim.ged.remove_event_handler('message-received', ged.CORE, self._nec_message_received) + gajim.ged.remove_event_handler('mam-message-received', ged.CORE, + self._nec_mam_message_received) gajim.ged.remove_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) @@ -1116,14 +1120,46 @@ gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj)) + def _nec_mam_message_received(self, obj): + if obj.conn.name != self.name: + return + if obj.enc_tag and self.USE_GPG: + encmsg = obj.enc_tag.getData() + + keyID = gajim.config.get_per('accounts', self.name, 'keyid') + if keyID: + self.gpg_messages_to_decrypt.append([encmsg, keyID, obj]) + if len(self.gpg_messages_to_decrypt) == 1: + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, + obj], self._on_mam_message_decrypted, [obj]) + return + gajim.nec.push_incoming_event(MamDecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) + def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt): encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + if type(obj2) == MessageReceivedEvent: + cb = self._on_message_decrypted + else: + cb = self._on_mam_message_decrypted gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], - self._on_message_decrypted, [obj2]) + cb, [obj2]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj)) + def _on_mam_message_decrypted(self, output, obj): + if len(self.gpg_messages_to_decrypt): + encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + if type(obj2) == MessageReceivedEvent: + cb = self._on_message_decrypted + else: + cb = self._on_mam_message_decrypted + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], + cb, [obj2]) + gajim.nec.push_incoming_event(MamDecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) + def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.name: return diff -r 7bf94fc874c2 -r f0b6ca5fd110 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Sep 16 20:43:57 2015 +0200 +++ b/src/common/connection_handlers_events.py Sat Sep 19 13:58:28 2015 +0200 @@ -1011,6 +1011,77 @@ name = 'before-change-show' base_network_events = [] +class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'mam-message-received' + base_network_events = [] + + def generate(self): + if not self.stanza: + return + account = self.conn.name + delay = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) + if not delay: + return + tim = delay.getAttr('stamp') + tim = helpers.datetime_tuple(tim) + self.tim = localtime(timegm(tim)) + self.msg_ = self.stanza.getTag('message') + to_ = self.msg_.getAttr('to') + if to_: + to_ = gajim.get_jid_without_resource(to_) + else: + to_ = gajim.get_jid_from_account(account) + frm_ = gajim.get_jid_without_resource(self.msg_.getAttr('from')) + self.msgtxt = self.msg_.getTagData('body') + if to_ == gajim.get_jid_from_account(account): + self.with_ = frm_ + self.direction = 'from' + self.resource = gajim.get_resource_from_jid( + self.msg_.getAttr('from')) + else: + self.with_ = to_ + self.direction = 'to' + self.resource = gajim.get_resource_from_jid(self.msg_.getAttr('to')) + self.enc_tag = self.msg_.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) + return True + +class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'mam-decrypted-message-received' + base_network_events = [] + + def generate(self): + self.nick = None + msg_ = self.msg_obj.msg_ + self.with_ = self.msg_obj.with_ + self.direction = self.msg_obj.direction + self.tim = self.msg_obj.tim + res = self.msg_obj.resource + self.msgtxt = self.msg_obj.msgtxt + is_pm = gajim.logger.jid_is_room_jid(self.with_) + if msg_.getAttr('type') == 'groupchat': + if is_pm == False: + log.warn('JID %s is marked as normal contact in database ' + 'but we got a groupchat message from it.') + return + if is_pm == None: + gajim.logger.get_jid_id(self.with_, 'ROOM') + self.nick = res + else: + if is_pm == None: + # we don't know this JID, we need to disco it. + server = gajim.get_server_from_jid(self.with_) + if server not in self.conn.mam_awaiting_disco_result: + self.conn.mam_awaiting_disco_result[server] = [ + [self.with_, self.direction, self.tim, self.msgtxt, + res]] + self.conn.discoverInfo(server) + else: + self.conn.mam_awaiting_disco_result[server].append( + [self.with_, self.direction, self.tim, self.msgtxt, + res]) + return + return True + class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'message-received' base_network_events = ['raw-message-received'] @@ -1092,55 +1163,8 @@ result = self.stanza.getTag('result', namespace=nbxmpp.NS_MAM) if result: forwarded = result.getTag('forwarded', namespace=nbxmpp.NS_FORWARD) - if not forwarded: - return - delay = forwarded.getTag('delay', namespace=nbxmpp.NS_DELAY2) - if not delay: - return - tim = delay.getAttr('stamp') - tim = helpers.datetime_tuple(tim) - tim = localtime(timegm(tim)) - msg_ = forwarded.getTag('message') - to_ = msg_.getAttr('to') - if to_: - to_ = gajim.get_jid_without_resource(to_) - else: - to_ = gajim.get_jid_from_account(account) - frm_ = gajim.get_jid_without_resource(msg_.getAttr('from')) - nick = None - msg_txt = msg_.getTagData('body') - if to_ == gajim.get_jid_from_account(account): - with_ = frm_ - direction = 'from' - res = gajim.get_resource_from_jid(msg_.getAttr('from')) - else: - with_ = to_ - direction = 'to' - res = gajim.get_resource_from_jid(msg_.getAttr('to')) - is_pm = gajim.logger.jid_is_room_jid(with_) - if msg_.getAttr('type') == 'groupchat': - if is_pm == False: - log.warn('JID %s is marked as normal contact in database ' - 'but we got a groupchat message from it.') - return - if is_pm == None: - gajim.logger.get_jid_id(with_, 'ROOM') - nick = res - else: - if is_pm == None: - # we don't know this JID, we need to disco it. - server = gajim.get_server_from_jid(with_) - if server not in self.conn.mam_awaiting_disco_result: - self.conn.mam_awaiting_disco_result[server] = [ - [with_, direction, tim, msg_txt, res]] - self.conn.discoverInfo(server) - else: - self.conn.mam_awaiting_disco_result[server].append( - [with_, direction, tim, msg_txt, res]) - return - - gajim.logger.save_if_not_exists(with_, direction, tim, - msg=msg_txt, nick=nick) + gajim.nec.push_incoming_event(MamMessageReceivedEvent(None, + conn=self.conn, stanza=forwarded)) return self.enc_tag = self.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) diff -r 7bf94fc874c2 -r f0b6ca5fd110 src/common/message_archiving.py --- a/src/common/message_archiving.py Wed Sep 16 20:43:57 2015 +0200 +++ b/src/common/message_archiving.py Sat Sep 19 13:58:28 2015 +0200 @@ -47,10 +47,18 @@ self._nec_agent_info_error) gajim.ged.register_event_handler('agent-info-received', ged.CORE, self._nec_agent_info) + gajim.ged.register_event_handler('mam-decrypted-message-received', + ged.CORE, self._nec_mam_decrypted_message_received) def cleanup(self): gajim.ged.remove_event_handler('raw-message-received', ged.CORE, self._nec_raw_message_313_received) + gajim.ged.remove_event_handler('agent-info-error-received', ged.CORE, + self._nec_agent_info_error) + gajim.ged.remove_event_handler('agent-info-received', ged.CORE, + self._nec_agent_info) + gajim.ged.remove_event_handler('mam-decrypted-message-received', + ged.CORE, self._nec_mam_decrypted_message_received) def _nec_agent_info_error(self, obj): if obj.jid in self.mam_awaiting_disco_result: @@ -81,7 +89,7 @@ if obj.conn.name != self.name: return - fin_ = obj.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) + fin_ = obj.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) if fin_: queryid_ = fin_.getAttr('queryid') if queryid_ not in self.awaiting_answers: @@ -99,6 +107,14 @@ del self.awaiting_answers[queryid_] + def _nec_mam_decrypted_message_received(self, obj): + if obj.conn.name != self.name: + return + print 'ici' + print obj.msgtxt + gajim.logger.save_if_not_exists(obj.with_, obj.direction, obj.tim, + msg=obj.msgtxt, nick=obj.nick) + def request_archive(self, start=None, end=None, with_=None, after=None, max=30): iq_ = nbxmpp.Iq('set')

1 0

gajim: fix reading secrets file under windows. Fixes #8118
by Gajim 05 Oct '15

05 Oct '15

changeset 981a3a9c7565 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=981a3a9c7565 description: fix reading secrets file under windows. Fixes #8118 diffstat: src/secrets.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r eb8a969c7685 -r 981a3a9c7565 src/secrets.py --- a/src/secrets.py Sun Oct 04 21:22:32 2015 +0200 +++ b/src/secrets.py Fri Aug 07 13:56:28 2015 +0200 @@ -95,7 +95,7 @@ return pk def load_secrets(filename): - f = open(filename, 'rb') + f = open(filename, 'r') try: secrets = pickle.load(f, encoding='latin1')

1 0

gajim: allow to add EventBox to conversation textview for plugin...
by Gajim 05 Oct '15

05 Oct '15

changeset 67e24b1dd696 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=67e24b1dd696 description: allow to add EventBox to conversation textview for plugins for example. diffstat: src/conversation_textview.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 981a3a9c7565 -r 67e24b1dd696 src/conversation_textview.py --- a/src/conversation_textview.py Fri Aug 07 13:56:28 2015 +0200 +++ b/src/conversation_textview.py Sun Aug 09 13:48:02 2015 +0200 @@ -125,6 +125,11 @@ if not parent: self._disconnect_signals() return + if isinstance(parent, gtk.EventBox): + parent = parent.get_parent() + if not parent: + self._disconnect_signals() + return self._do_connect(parent, 'style-set', self.do_queue_draw) self._do_connect(parent, 'focus-in-event', self.do_queue_draw)

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 2015