From 48aca845a546fcccdd5dd666bfab74a996abb70c Mon Sep 17 00:00:00 2001
From: wurstsalat <mailtrash@posteo.de>
Date: Mon, 25 Oct 2021 22:01:28 +0200
Subject: [PATCH] [form_handler] Adapt to Gajim changes

---
 form_handler/gtk/form.py | 14 +++++---------
 form_handler/gtk/util.py |  6 ------
 form_handler/plugin.py   |  3 +--
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/form_handler/gtk/form.py b/form_handler/gtk/form.py
index e78f18b..bc5e1a3 100644
--- a/form_handler/gtk/form.py
+++ b/form_handler/gtk/form.py
@@ -26,17 +26,15 @@ from gajim.gui.dataform import DataFormWidget
 
 from gajim.plugins.plugins_i18n import _
 
-from form_handler.gtk.util import find_control
-
 
 class FormDialog(Gtk.ApplicationWindow):
     def __init__(self, data):
-        transient = app.app.get_active_window()
         Gtk.ApplicationWindow.__init__(self, title=_('Data Form'))
-        self.set_transient_for(transient)
+        self.set_transient_for(app.window)
         self.set_default_size(600, 400)
 
         self._account = data['account']
+        self._client = app.get_client(self._account)
         self._jid = data['jid']
 
         self._form_widget = DataFormWidget(
@@ -55,9 +53,7 @@ class FormDialog(Gtk.ApplicationWindow):
     def _on_send_clicked(self, _button):
         form = self._form_widget.get_submit_form()
 
-        contact = app.contacts.get_contact(self._account, self._jid)
-        if contact is None:
-            return
+        contact = self._client.get_module('Contacts').get_contact(self._jid)
 
         message = OutgoingMessage(account=self._account,
                                   contact=contact,
@@ -69,8 +65,8 @@ class FormDialog(Gtk.ApplicationWindow):
 
         app.connections[self._account].send_message(message)
 
-        control = find_control(self._account, self._jid)
+        control = app.window.get_control(self._account, self._jid)
         if control is None:
             return
-        control.add_status_message(_('Form has successfully been sent'))
+        control.add_info_message(_('Form has successfully been sent'))
         self.destroy()
diff --git a/form_handler/gtk/util.py b/form_handler/gtk/util.py
index d4e77c2..51420c5 100644
--- a/form_handler/gtk/util.py
+++ b/form_handler/gtk/util.py
@@ -16,14 +16,8 @@
 
 from gi.repository import Gtk
 
-from gajim.common import app
-
 
 def get_button(label, data, callback):
     button = Gtk.Button(label=label)
     button.connect('clicked', callback, data)
     return button
-
-
-def find_control(account, jid):
-    return app.interface.msg_win_mgr.get_control(jid, account)
diff --git a/form_handler/plugin.py b/form_handler/plugin.py
index 41a1978..53b39ab 100644
--- a/form_handler/plugin.py
+++ b/form_handler/plugin.py
@@ -37,8 +37,7 @@ class FormHandlerPlugin(GajimPlugin):
         self.config_dialog = None
 
         self.events_handlers = {
-            'decrypted-message-received': (ged.CORE,
-                                           self._on_message_received),
+            'message-received': (ged.CORE, self._on_message_received),
         }
 
         self.gui_extension_points = {