Commit 74ac228f authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

use GED to send messages via gajim-remote. Fixes #7321

parent f7da7e42
......@@ -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:
......@@ -442,8 +443,10 @@ def _send_message(self, jid, message, keyID, account, type_ = 'chat',
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 @@ def send_single_message(self, jid, subject, message, keyID, account):
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):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment