Commit 9caa3aad authored by Philipp Hörist's avatar Philipp Hörist

Use nbxmpp's dataforms module

parent 8ce0c62c
...@@ -21,6 +21,7 @@ import logging ...@@ -21,6 +21,7 @@ import logging
import OpenSSL.crypto import OpenSSL.crypto
import nbxmpp import nbxmpp
from nbxmpp.modules import dataforms
from gajim.common import nec from gajim.common import nec
from gajim.common import helpers from gajim.common import helpers
...@@ -28,7 +29,6 @@ from gajim.common import app ...@@ -28,7 +29,6 @@ from gajim.common import app
from gajim.common import i18n from gajim.common import i18n
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import AdditionalDataDict
from gajim.common.modules import dataforms
from gajim.common.const import KindConstant, SSLError from gajim.common.const import KindConstant, SSLError
from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.jingle_transport import JingleTransportSocks5
from gajim.common.file_props import FilesProp from gajim.common.file_props import FilesProp
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
import nbxmpp import nbxmpp
from nbxmpp.structs import StanzaHandler from nbxmpp.structs import StanzaHandler
from nbxmpp.modules import dataforms
from gajim.common import app from gajim.common import app
from gajim.common import helpers from gajim.common import helpers
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkIncomingEvent
from gajim.common.modules import dataforms
from gajim.common.modules.base import BaseModule from gajim.common.modules.base import BaseModule
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
# XEP-0060: Publish-Subscribe # XEP-0060: Publish-Subscribe
import nbxmpp import nbxmpp
from nbxmpp.modules import dataforms
from gajim.common import app from gajim.common import app
from gajim.common.modules import dataforms
from gajim.common.nec import NetworkIncomingEvent from gajim.common.nec import NetworkIncomingEvent
from gajim.common.modules.base import BaseModule from gajim.common.modules.base import BaseModule
......
...@@ -30,8 +30,9 @@ from gi.repository import GdkPixbuf ...@@ -30,8 +30,9 @@ from gi.repository import GdkPixbuf
from gi.repository import GObject from gi.repository import GObject
from gi.repository import GLib from gi.repository import GLib
from nbxmpp.modules import dataforms
from gajim import gtkgui_helpers from gajim import gtkgui_helpers
from gajim.common.modules import dataforms
from gajim.common import helpers from gajim.common import helpers
from gajim.common import app from gajim.common import app
from gajim.common.i18n import _ from gajim.common.i18n import _
......
...@@ -18,13 +18,14 @@ from gi.repository import Gtk ...@@ -18,13 +18,14 @@ from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
from gi.repository import GLib from gi.repository import GLib
from nbxmpp.modules import dataforms
from gajim.common import app from gajim.common import app
from gajim.common import ged from gajim.common import ged
from gajim.common import configpaths from gajim.common import configpaths
from gajim.common import helpers from gajim.common import helpers
from gajim.common import connection from gajim.common import connection
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.common.modules import dataforms
from gajim import dataforms_widget from gajim import dataforms_widget
from gajim import gui_menu_builder from gajim import gui_menu_builder
......
...@@ -16,14 +16,14 @@ import logging ...@@ -16,14 +16,14 @@ import logging
from enum import IntEnum from enum import IntEnum
from gi.repository import Gtk from gi.repository import Gtk
from nbxmpp.util import is_error_result from nbxmpp.util import is_error_result
from nbxmpp.const import AdHocAction from nbxmpp.const import AdHocAction
from nbxmpp.modules import dataforms
from gajim.common import app from gajim.common import app
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.common.modules import dataforms
from gajim.gtk.dataform import DataFormWidget from gajim.gtk.dataform import DataFormWidget
from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import ensure_not_destroyed
from gajim.gtk.util import find_widget from gajim.gtk.util import find_widget
......
...@@ -17,12 +17,13 @@ from gi.repository import GLib ...@@ -17,12 +17,13 @@ from gi.repository import GLib
from gi.repository import GObject from gi.repository import GObject
from gi.repository import Pango from gi.repository import Pango
from nbxmpp.modules.dataforms import extend_form
from gajim.gtkgui_helpers import scale_pixbuf_from_data from gajim.gtkgui_helpers import scale_pixbuf_from_data
from gajim.common import app from gajim.common import app
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.common.helpers import open_uri from gajim.common.helpers import open_uri
from gajim.common.modules.dataforms import extend_form
from gajim.gtk.util import MultiLineLabel from gajim.gtk.util import MultiLineLabel
from gajim.gtk.util import MaxWidthComboBoxText from gajim.gtk.util import MaxWidthComboBoxText
......
...@@ -20,12 +20,12 @@ from enum import IntEnum ...@@ -20,12 +20,12 @@ from enum import IntEnum
from gi.repository import Gtk from gi.repository import Gtk
from nbxmpp.modules import dataforms
from gajim.common import app from gajim.common import app
from gajim.common import ged from gajim.common import ged
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.common.modules import dataforms
from gajim.gui_menu_builder import SearchMenu from gajim.gui_menu_builder import SearchMenu
from gajim.gtk.dataform import DataFormWidget from gajim.gtk.dataform import DataFormWidget
......
...@@ -17,8 +17,9 @@ from enum import IntEnum ...@@ -17,8 +17,9 @@ from enum import IntEnum
from gi.repository import Gtk from gi.repository import Gtk
from nbxmpp.modules import dataforms
from gajim.common import app from gajim.common import app
from gajim.common.modules import dataforms
from gajim.common.i18n import _ from gajim.common.i18n import _
from gajim.gtk.dataform import DataFormWidget from gajim.gtk.dataform import DataFormWidget
......
...@@ -2,9 +2,9 @@ from base64 import b64decode ...@@ -2,9 +2,9 @@ from base64 import b64decode
from gi.repository import Gtk from gi.repository import Gtk
import nbxmpp import nbxmpp
from nbxmpp.modules.dataforms import extend_form
from gajim.gtk.dataform import DataFormWidget from gajim.gtk.dataform import DataFormWidget
from gajim.common.modules.dataforms import extend_form
from gajim.common.const import CSSPriority from gajim.common.const import CSSPriority
from gajim.common import app from gajim.common import app
......
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