Commits

commits@gajim.org

17632 discussions

gajim: fix placing corrected message when it contains special te...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 776137a98556 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=776137a98556 description: fix placing corrected message when it contains special text. Fixes #7372 diffstat: src/conversation_textview.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 9455752df4b2 -r 776137a98556 src/conversation_textview.py --- a/src/conversation_textview.py Fri Jul 19 21:12:11 2013 +0200 +++ b/src/conversation_textview.py Sun Jul 21 20:37:05 2013 +0200 @@ -1095,7 +1095,6 @@ special_text = otext[start:end] if start > index: text_before_special_text = otext[index:start] - end_iter = buffer_.get_end_iter() # we insert normal text if other_tags: insert_tags_func(end_iter, text_before_special_text, *other_tags)

1 0

gajim: typo
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 5d471c770ec6 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5d471c770ec6 description: typo diffstat: src/common/connection.py | 2 +- src/remote_control.py | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 6a285fa16cda -r 5d471c770ec6 src/common/connection.py --- a/src/common/connection.py Fri Jul 19 13:52:37 2013 +0400 +++ b/src/common/connection.py Fri Jul 19 14:36:46 2013 +0400 @@ -771,7 +771,7 @@ self._nec_agent_info_received) gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) - gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, + gajim.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) def get_config_values_or_default(self): diff -r 6a285fa16cda -r 5d471c770ec6 src/remote_control.py --- a/src/remote_control.py Fri Jul 19 13:52:37 2013 +0400 +++ b/src/remote_control.py Fri Jul 19 14:36:46 2013 +0400 @@ -479,7 +479,6 @@ connected_account = self._get_account_for_groupchat(account, room_jid) if connected_account: connection = gajim.connections[connected_account] - connection.send_gc_message(room_jid, message) gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, account=connected_account, jid=room_jid, message=message)) return DBUS_BOOLEAN(True)

1 0

gajim: remove no more needed send_gc_message function
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset ca8a29aec876 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ca8a29aec876 description: remove no more needed send_gc_message function diffstat: src/common/connection.py | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diffs (43 lines): diff -r 5d471c770ec6 -r ca8a29aec876 src/common/connection.py --- a/src/common/connection.py Fri Jul 19 14:36:46 2013 +0400 +++ b/src/common/connection.py Fri Jul 19 12:46:09 2013 +0200 @@ -2571,39 +2571,6 @@ t.setTagData('password', password) self.connection.send(p) - def send_gc_message(self, jid, msg, xhtml=None, label=None, - correction_msg=None, callback=None): - if not gajim.account_is_connected(self.name): - return - if correction_msg: - id_ = correction_msg.getID() - if correction_msg.getTag('replace'): - correction_msg.delChild('replace') - correction_msg.setTag('replace', attrs={'id': id_}, - namespace=nbxmpp.NS_CORRECT) - id2 = self.connection.getAnID() - correction_msg.setID(id2) - correction_msg.setBody(msg) - if xhtml: - correction_msg.setXHTML(xhtml) - self.connection.send(correction_msg) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=None, chatstate=None)) - if callback: - callback(correction_msg, msg) - return - if not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): - from common.rst_xhtml_generator import create_xhtml - xhtml = create_xhtml(msg) - msg_iq = nbxmpp.Message(jid, msg, typ='groupchat', xhtml=xhtml) - if label is not None: - msg_iq.addChild(node=label) - self.connection.send(msg_iq) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=None, chatstate=None)) - if callback: - callback(msg_iq, msg) - def _nec_gc_message_outgoing(self, obj): if obj.account != self.name: return

1 0

gajim: remove unused print
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 69eb6c9d4986 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=69eb6c9d4986 description: remove unused print diffstat: src/vcard.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r ca8a29aec876 -r 69eb6c9d4986 src/vcard.py --- a/src/vcard.py Fri Jul 19 12:46:09 2013 +0200 +++ b/src/vcard.py Fri Jul 19 15:49:47 2013 +0400 @@ -252,7 +252,6 @@ 'ORG_ORGNAME', 'ORG_ORGUNIT', 'TITLE', 'ROLE', 'EMAIL_WORK_USERID', 'TEL_WORK_NUMBER'): widget = self.xml.get_object(l + '_label') - print l widget.set_text('') for pref in ('ADR_HOME', 'ADR_WORK'): for l in ('STREET', 'EXTADR', 'LOCALITY', 'PCODE', 'REGION',

1 0

gajim: make the Ok button of Insecure connection dialog insensit...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 82361155ce35 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=82361155ce35 description: make the Ok button of Insecure connection dialog insensitive when yes checkbox is not checked. Fixes #7373 diffstat: src/dialogs.py | 25 +++++++++++++++++++++++++ src/gui_interface.py | 14 +------------- 2 files changed, 26 insertions(+), 13 deletions(-) diffs (63 lines): diff -r d8baf3b488b7 -r 82361155ce35 src/dialogs.py --- a/src/dialogs.py Thu Jul 18 17:04:59 2013 +0200 +++ b/src/dialogs.py Thu Jul 18 20:32:45 2013 +0200 @@ -1848,6 +1848,31 @@ is_checked_2 = False return [is_checked_1, is_checked_2] +class PlainConnectionDialog(ConfirmationDialogDoubleCheck): + """ + Dialog that is shown when using an insecure connection + """ + def __init__(self, account, on_ok, on_cancel): + pritext = _('Insecure connection') + sectext = _('You are about to connect to the account %(account)s ' + '(%(server)s) with an insecure connection. This means all your ' + 'conversations will be exchanged unencrypted. This type of ' + 'connection is really discouraged.\nAre you sure you want to do ' + 'that?') % {'account': account, + 'server': gajim.get_hostname_from_account(account)} + checktext1 = _('Yes, I really want to connect insecurely') + tooltip1 = _('Gajim will NOT connect unless you check this box') + checktext2 = _('_Do not ask me again') + ConfirmationDialogDoubleCheck.__init__(self, pritext, sectext, + checktext1, checktext2, tooltip1=tooltip1, on_response_ok=on_ok, + on_response_cancel=on_cancel, is_modal=False) + self.ok_button = self.action_area.get_children()[0] # right to left + self.ok_button.set_sensitive(False) + self.checkbutton1.connect('clicked', self.on_checkbutton_clicked) + + def on_checkbutton_clicked(self, widget): + self.ok_button.set_sensitive(widget.get_active()) + class ConfirmationDialogDoubleRadio(ConfirmationDialog): """ HIG compliant confirmation dialog with 2 radios diff -r d8baf3b488b7 -r 82361155ce35 src/gui_interface.py --- a/src/gui_interface.py Thu Jul 18 17:04:59 2013 +0200 +++ b/src/gui_interface.py Thu Jul 18 20:32:45 2013 +0200 @@ -1409,23 +1409,11 @@ gajim.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, show='offline')) - pritext = _('Insecure connection') - sectext = _('You are about to connect to the account %(account)s ' - '(%(server)s) with an insecure connection. This means all your ' - 'conversations will be exchanged unencrypted. This type of ' - 'connection is really discouraged.\nAre you sure you want to do ' - 'that?') % {'account': obj.conn.name, - 'server': gajim.get_hostname_from_account(obj.conn.name)} - checktext1 = _('Yes, I really want to connect insecurely') - tooltip1 = _('Gajim will NOT connect unless you check this box') - checktext2 = _('_Do not ask me again') if 'plain_connection' in self.instances[obj.conn.name]['online_dialog']: self.instances[obj.conn.name]['online_dialog']['plain_connection'].\ destroy() self.instances[obj.conn.name]['online_dialog']['plain_connection'] = \ - dialogs.ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, - checktext2, tooltip1=tooltip1, on_response_ok=on_ok, - on_response_cancel=on_cancel, is_modal=False) + dialogs.PlainConnectionDialog(obj.conn.name, on_ok, on_cancel) def handle_event_insecure_ssl_connection(self, obj): # ('INSECURE_SSL_CONNECTION', account, (connection, connection_type))

1 0

gajim: clear vcard values before filling them in case we receive...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 4397917aa0d6 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4397917aa0d6 description: clear vcard values before filling them in case we receive vcard a second time when window is opened. Fixes #7366 diffstat: src/vcard.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diffs (34 lines): diff -r 82361155ce35 -r 4397917aa0d6 src/vcard.py --- a/src/vcard.py Thu Jul 18 20:32:45 2013 +0200 +++ b/src/vcard.py Thu Jul 18 21:14:39 2013 +0200 @@ -246,6 +246,22 @@ self.vcard_arrived = True self.test_remove_progressbar() + def clear_values(self): + for l in ('FN', 'NICKNAME', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', + 'N_PREFIX', 'N_SUFFIX', 'EMAIL_HOME_USERID', 'TEL_HOME_NUMBER', 'BDAY', + 'ORG_ORGNAME', 'ORG_ORGUNIT', 'TITLE', 'ROLE', 'EMAIL_WORK_USERID', + 'TEL_WORK_NUMBER'): + widget = self.xml.get_object(l + '_label') + print l + widget.set_text('') + for pref in ('ADR_HOME', 'ADR_WORK'): + for l in ('STREET', 'EXTADR', 'LOCALITY', 'PCODE', 'REGION', + 'CTRY'): + widget = self.xml.get_object(pref + '_' + l + '_label') + widget.set_text('') + self.xml.get_object('DESC_textview').get_buffer().set_text('') + + def _nec_vcard_received(self, obj): if obj.conn.name != self.account: return @@ -256,6 +272,7 @@ else: if obj.jid != self.contact.jid: return + self.clear_values() self.set_values(obj.vcard_dict) def test_remove_progressbar(self):

1 0

gajim: handle gc outgoing messages with events.
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 6a285fa16cda in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6a285fa16cda description: handle gc outgoing messages with events. diffstat: src/common/connection.py | 40 ++++++++++++++++++++++++++++++++ src/common/connection_handlers_events.py | 19 +++++++++++++++ src/groupchat_control.py | 8 ++++-- src/remote_control.py | 6 ++++- 4 files changed, 69 insertions(+), 4 deletions(-) diffs (141 lines): diff -r 4397917aa0d6 -r 6a285fa16cda src/common/connection.py --- a/src/common/connection.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/common/connection.py Fri Jul 19 13:52:37 2013 +0400 @@ -757,6 +757,8 @@ self._nec_agent_info_received) gajim.ged.register_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) + gajim.ged.register_event_handler('gc-message-outgoing', ged.OUT_CORE, + self._nec_gc_message_outgoing) # END __init__ def cleanup(self): @@ -769,6 +771,8 @@ self._nec_agent_info_received) gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) + gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, + self._nec_gc_message_outgoing) def get_config_values_or_default(self): if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): @@ -2600,6 +2604,42 @@ if callback: callback(msg_iq, msg) + def _nec_gc_message_outgoing(self, obj): + if obj.account != self.name: + return + if not gajim.account_is_connected(self.name): + return + + if obj.correction_msg: + id_ = obj.correction_msg.getID() + if obj.correction_msg.getTag('replace'): + obj.correction_msg.delChild('replace') + obj.correction_msg.setTag('replace', attrs={'id': id_}, + namespace=nbxmpp.NS_CORRECT) + id2 = self.connection.getAnID() + obj.correction_msg.setID(id2) + obj.correction_msg.setBody(obj.message) + if obj.xhtml: + obj.correction_msg.setXHTML(xhtml) + self.connection.send(obj.correction_msg) + gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, + jid=obj.jid, message=obj.message, keyID=None, chatstate=None)) + if obj.callback: + obj.callback(obj.correction_msg, obj.message) + return + if not obj.xhtml and gajim.config.get('rst_formatting_outgoing_messages'): + from common.rst_xhtml_generator import create_xhtml + obj.xhtml = create_xhtml(obj.message) + msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', + xhtml=obj.xhtml) + if obj.label is not None: + msg_iq.addChild(node=label) + self.connection.send(msg_iq) + gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, + jid=obj.jid, message=obj.message, keyID=None, chatstate=None)) + if obj.callback: + obj.callback(msg_iq, obj.message) + def send_gc_subject(self, jid, subject): if not gajim.account_is_connected(self.name): return diff -r 4397917aa0d6 -r 6a285fa16cda src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/common/connection_handlers_events.py Fri Jul 19 13:52:37 2013 +0400 @@ -2462,6 +2462,25 @@ def generate(self): return True + +class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): + name = 'gc-message-outgoing' + base_network_events = [] + + def init(self): + self.message = '' + self.xhtml = None + self.label = None + self.callback = None + self.callback_args = [] + self.is_loggable = True + self.control = None + self.correction_msg = None + + def generate(self): + return True + + class ClientCertPassphraseEvent(nec.NetworkIncomingEvent): name = 'client-cert-passphrase' base_network_events = [] diff -r 4397917aa0d6 -r 6a285fa16cda src/groupchat_control.py --- a/src/groupchat_control.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/groupchat_control.py Fri Jul 19 13:52:37 2013 +0400 @@ -56,6 +56,7 @@ from command_system.implementation.hosts import PrivateChatCommands from command_system.implementation.hosts import GroupChatCommands +from common.connection_handlers_events import GcMessageOutgoingEvent import logging log = logging.getLogger('gajim.groupchat_control') @@ -1933,9 +1934,10 @@ else: correction_msg = None # Send the message - gajim.connections[self.account].send_gc_message(self.room_jid, - message, xhtml=xhtml, label=label, - correction_msg=correction_msg, callback=_cb) + gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, + account=self.account, jid=self.room_jid, message=message, + xhtml=xhtml, label=label, callback=_cb, + callback_args=[_cb] + [message], correction_msg=correction_msg)) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() diff -r 4397917aa0d6 -r 6a285fa16cda src/remote_control.py --- a/src/remote_control.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/remote_control.py Fri Jul 19 13:52:37 2013 +0400 @@ -37,7 +37,9 @@ from time import time from dialogs import AddNewContactWindow, NewChatDialog, JoinGroupchatWindow from common import ged -from common.connection_handlers_events import MessageOutgoingEvent +from common.connection_handlers_events import MessageOutgoingEvent, + GcMessageOutgoingEvent + from common import dbus_support if dbus_support.supported: @@ -478,6 +480,8 @@ if connected_account: connection = gajim.connections[connected_account] connection.send_gc_message(room_jid, message) + gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, + account=connected_account, jid=room_jid, message=message)) return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False)

1 0

gajim: support version 2 of message carbons
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 850b44bec8a0 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=850b44bec8a0 description: support version 2 of message carbons diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5dcd85c99d97 -r 850b44bec8a0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jul 18 13:39:14 2013 +0200 +++ b/src/common/connection_handlers_events.py Thu Jul 18 14:03:13 2013 +0200 @@ -1047,7 +1047,7 @@ namespace=nbxmpp.NS_CARBONS) # Be sure it comes from one of our resource, else ignore forward element if carbon_marker and self.jid == gajim.get_jid_from_account(account): - forward_tag = self.stanza.getTag('forwarded', + forward_tag = carbon_marker.getTag('forwarded', namespace=nbxmpp.NS_FORWARD) if forward_tag: msg = forward_tag.getTag('message')

1 0

gajim: fix receiving a carbon of a sent message without a from.
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 148e289810ff in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=148e289810ff description: fix receiving a carbon of a sent message without a from. diffstat: src/common/connection_handlers_events.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 850b44bec8a0 -r 148e289810ff src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jul 18 14:03:13 2013 +0200 +++ b/src/common/connection_handlers_events.py Thu Jul 18 14:32:45 2013 +0200 @@ -1054,7 +1054,10 @@ self.stanza = nbxmpp.Message(node=msg) if carbon_marker.getName() == 'sent': to = self.stanza.getTo() - self.stanza.setTo(self.stanza.getFrom()) + frm = self.stanza.getFrom() + if not frm: + frm = gajim.get_jid_from_account(account) + self.stanza.setTo(frm) self.stanza.setFrom(to) self.sent = True try:

1 0

gajim: ability to write several JIDs in sender field of send sin...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset d8baf3b488b7 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=d8baf3b488b7 description: ability to write several JIDs in sender field of send single message dialog. fixes #7206 diffstat: src/dialogs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 148e289810ff -r d8baf3b488b7 src/dialogs.py --- a/src/dialogs.py Thu Jul 18 14:32:45 2013 +0200 +++ b/src/dialogs.py Thu Jul 18 17:04:59 2013 +0200 @@ -3165,7 +3165,8 @@ else: sender_list.append(i[0].jid) else: - sender_list = [self.to_entry.get_text()] + sender_list = [j.strip() for j in self.to_entry.get_text().split( + ',')] for to_whom_jid in sender_list: if to_whom_jid in self.completion_dict:

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