diff options
author | Yann Leboulanger <asterix@lagaule.org> | 2013-03-19 13:25:10 +0400 |
---|---|---|
committer | Yann Leboulanger <asterix@lagaule.org> | 2013-03-19 13:25:10 +0400 |
commit | 74ac228f766b5d18063dbaad5d7909e162da3dae (patch) | |
tree | 4e077567f0a297a47bb3652d3cca214046e9fafa | |
parent | f7da7e427f7d4b58c3c15e7afaaf5203aaabc441 (diff) |
use GED to send messages via gajim-remote. Fixes #7321gajim-0.15.4
-rw-r--r-- | src/remote_control.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/remote_control.py b/src/remote_control.py index ed021e521..93be2bce9 100644 --- a/src/remote_control.py +++ b/src/remote_control.py @@ -37,6 +37,7 @@ from common import helpers 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: @@ -442,8 +443,10 @@ class SignalObject(dbus.service.Object): 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) @@ -463,7 +466,7 @@ class SignalObject(dbus.service.Object): 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): |