changeset 66658bd3f739 in /home/hg/repos/gajim

branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=66658bd3f739 description: use GED to send messages via gajim-remote. Fixes #7321

diffstat:

src/remote_control.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 2f30fb341de4 -r 66658bd3f739 src/remote_control.py --- a/src/remote_control.py Thu Mar 14 12:47:49 2013 +0100 +++ b/src/remote_control.py Tue Mar 19 10:25:10 2013 +0100 @@ -37,6 +37,7 @@ from time import time from dialogs import AddNewContactWindow, NewChatDialog, JoinGroupchatWindow from common import ged +from common.connection_handlers_events import MessageOutgoingEvent

from common import dbus_support if dbus_support.supported: @@ -441,8 +442,10 @@ if ctrl: ctrl.print_conversation(message, frm='outgoing')

- connection.send_message(jid, message, keyID, type_, subject, - session=session) + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, + account=connected_account, jid=jid, message=message, + keyID=keyID, type_=type_, control=ctrl)) + return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False)

@@ -462,7 +465,7 @@ keyID is specified, encrypt the message with the pgp key """ jid = self._get_real_jid(jid, account) - return self._send_message(jid, message, keyID, account, type, subject) + return self._send_message(jid, message, keyID, account, 'normal', subject)

@dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') def send_groupchat_message(self, room_jid, message, account):