hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[form_handler] Adapt to Gajim changes

Browse Source
This commit is contained in:
wurstsalat
2021-10-25 22:01:28 +02:00
parent 92e27970f7
commit 48aca845a5
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
form_handler/gtk/form.py
View File

@@ -26,17 +26,15 @@ from gajim.gui.dataform import DataFormWidget
from gajim.plugins.plugins_i18n import _ from gajim.plugins.plugins_i18n import _
from form_handler.gtk.util import find_control
class FormDialog(Gtk.ApplicationWindow): class FormDialog(Gtk.ApplicationWindow):
def __init__(self, data): def __init__(self, data):
transient = app.app.get_active_window()
Gtk.ApplicationWindow.__init__(self, title=_('Data Form')) 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.set_default_size(600, 400)
self._account = data['account'] self._account = data['account']
self._client = app.get_client(self._account)
self._jid = data['jid'] self._jid = data['jid']
self._form_widget = DataFormWidget( self._form_widget = DataFormWidget(
@@ -55,9 +53,7 @@ class FormDialog(Gtk.ApplicationWindow):
def _on_send_clicked(self, _button): def _on_send_clicked(self, _button):
form = self._form_widget.get_submit_form() form = self._form_widget.get_submit_form()
contact = app.contacts.get_contact(self._account, self._jid) contact = self._client.get_module('Contacts').get_contact(self._jid)
if contact is None:
return
message = OutgoingMessage(account=self._account, message = OutgoingMessage(account=self._account,
contact=contact, contact=contact,
@@ -69,8 +65,8 @@ class FormDialog(Gtk.ApplicationWindow):
app.connections[self._account].send_message(message) 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: if control is None:
return return
control.add_status_message(_('Form has successfully been sent')) control.add_info_message(_('Form has successfully been sent'))
self.destroy() self.destroy()

6
form_handler/gtk/util.py
View File

@@ -16,14 +16,8 @@
from gi.repository import Gtk from gi.repository import Gtk
from gajim.common import app
def get_button(label, data, callback): def get_button(label, data, callback):
button = Gtk.Button(label=label) button = Gtk.Button(label=label)
button.connect('clicked', callback, data) button.connect('clicked', callback, data)
return button return button
def find_control(account, jid):
return app.interface.msg_win_mgr.get_control(jid, account)

3
form_handler/plugin.py
View File

@@ -37,8 +37,7 @@ class FormHandlerPlugin(GajimPlugin):
self.config_dialog = None self.config_dialog = None
self.events_handlers = { self.events_handlers = {
'decrypted-message-received': (ged.CORE, 'message-received': (ged.CORE, self._on_message_received),
self._on_message_received),
} }
self.gui_extension_points = { self.gui_extension_points = {