Commits

commits@gajim.org

17632 discussions

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

gajim: fix calling gnupg.list_keys. Fixes #8122
by Gajim 05 Oct '15

05 Oct '15

changeset f5d025f0120f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f5d025f0120f description: fix calling gnupg.list_keys. Fixes #8122 diffstat: src/common/gpg.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 67e24b1dd696 -r f5d025f0120f src/common/gpg.py --- a/src/common/gpg.py Sun Aug 09 13:48:02 2015 +0200 +++ b/src/common/gpg.py Wed Aug 12 22:13:29 2015 +0200 @@ -56,8 +56,7 @@ trust = False if not trust: # check that we'll be able to encrypt - result = super(GnuPG, self).list_keys(recipients, - keys=recipients) + result = super(GnuPG, self).list_keys(keys=recipients) for key in result: if key['trust'] not in ('f', 'u'): return '', 'NOT_TRUSTED'

1 0

gajim: fix single message textview size
by Gajim 04 Oct '15

04 Oct '15

changeset 41a47f56fef0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=41a47f56fef0 description: fix single message textview size diffstat: data/gui/single_message_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1595f3be50f5 -r 41a47f56fef0 data/gui/single_message_window.ui --- a/data/gui/single_message_window.ui Sun Oct 04 20:51:07 2015 +0200 +++ b/data/gui/single_message_window.ui Sun Oct 04 21:21:38 2015 +0200 @@ -140,7 +140,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing>

1 0

gajim: remove gconf usage. It's not used anymore
by Gajim 04 Oct '15

04 Oct '15

changeset d4cf01eed6f1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d4cf01eed6f1 description: remove gconf usage. It's not used anymore diffstat: src/command_system/implementation/middleware.py | 4 +--- src/command_system/tools.py | 8 -------- 2 files changed, 1 insertions(+), 11 deletions(-) diffs (36 lines): diff -r 41a47f56fef0 -r d4cf01eed6f1 src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Sun Oct 04 21:21:38 2015 +0200 +++ b/src/command_system/implementation/middleware.py Sun Oct 04 21:22:17 2015 +0200 @@ -38,7 +38,6 @@ from ..framework import CommandProcessor from ..errors import CommandError, NoCommandError -from ..tools import gconf class ChatCommandProcessor(CommandProcessor): """ @@ -114,8 +113,7 @@ def install_tags(self): buffer = self.conv_textview.tv.get_buffer() - name = gconf("/desktop/gnome/interface/monospace_font_name") - name = name if name else "Monospace" + name = "Monospace" font = Pango.FontDescription(name) command_ok_tag = buffer.create_tag("command_ok") diff -r 41a47f56fef0 -r d4cf01eed6f1 src/command_system/tools.py --- a/src/command_system/tools.py Sun Oct 04 21:21:38 2015 +0200 +++ b/src/command_system/tools.py Sun Oct 04 21:22:17 2015 +0200 @@ -33,11 +33,3 @@ elif isinstance(sequence, dict): if target in sequence: del sequence[target] - -def gconf(path): - try: - from gi.repository import GConf - client = GConf.Client.get_default() - return client.get_string(path) - except ImportError: - pass

1 0

gajim: minor glade fix
by Gajim 04 Oct '15

04 Oct '15

changeset eb8a969c7685 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=eb8a969c7685 description: minor glade fix diffstat: data/gui/chat_control.ui | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (19 lines): diff -r d4cf01eed6f1 -r eb8a969c7685 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sun Oct 04 21:22:17 2015 +0200 +++ b/data/gui/chat_control.ui Sun Oct 04 21:22:32 2015 +0200 @@ -1023,7 +1023,6 @@ <object class="GtkDrawingArea" id="outgoing_drawingarea"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="double_buffered">False</property> </object> </child> </object> @@ -1050,7 +1049,6 @@ <property name="height_request">240</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="double_buffered">False</property> </object> </child> </object>

1 0

gajim: fix hiding tooltips
by Gajim 04 Oct '15

04 Oct '15

changeset 373552f26adc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=373552f26adc description: fix hiding tooltips diffstat: src/tooltips.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d7afa524cc30 -r 373552f26adc src/tooltips.py --- a/src/tooltips.py Sun Sep 20 18:18:35 2015 +0200 +++ b/src/tooltips.py Sun Oct 04 20:50:41 2015 +0200 @@ -113,7 +113,7 @@ return 'not in roster' def motion_notify_event(self, widget, event): - self.hide_tooltip() + GLib.idle_add(self.hide_tooltip) def on_size_allocate(self, widget, rect): if not self.position_computed:

1 0

gajim: remove useless code
by Gajim 04 Oct '15

04 Oct '15

changeset 1595f3be50f5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1595f3be50f5 description: remove useless code diffstat: src/conversation_textview.py | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diffs (27 lines): diff -r 373552f26adc -r 1595f3be50f5 src/conversation_textview.py --- a/src/conversation_textview.py Sun Oct 04 20:50:41 2015 +0200 +++ b/src/conversation_textview.py Sun Oct 04 20:51:07 2015 +0200 @@ -77,7 +77,6 @@ self._selected = False self._disconnect_funcs = [] self.connect('parent-set', self.on_parent_set) - self.connect('draw', self.on_expose) self.set_tooltip_markup(text) self.anchor.plaintext = text @@ -151,15 +150,6 @@ if is_selection_modified(mark): self._update_selected() - def on_expose(self, widget, event): - state = self.get_state() - if state != Gtk.StateType.NORMAL: - gc = widget.get_style().base_gc[state] - area = widget.allocation - widget.get_window(Gtk.TextWindowType.TEXT).draw_rectangle(gc, True, - area.x, area.y, area.width, area.height) - return False - class ConversationTextview(GObject.GObject): """

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