copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move ServiceDiscoveryWindow to gtk folder

This commit is contained in:
Philipp Hörist 2018-10-28 19:41:19 +01:00
parent cb58fc86f0
commit 59ccac4831
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gajim/app_actions.py
View File

@ -22,7 +22,6 @@ from gajim.common import helpers
from gajim.common.app import interface from gajim.common.app import interface
from gajim.common.exceptions import GajimGeneralException from gajim.common.exceptions import GajimGeneralException
from gajim import dialogs from gajim import dialogs
from gajim import disco
import gajim.plugins.gui import gajim.plugins.gui
@ -44,6 +43,7 @@ from gajim.gtk.account_wizard import AccountCreationWizard
from gajim.gtk.history import HistoryWindow from gajim.gtk.history import HistoryWindow
from gajim.gtk.accounts import AccountsWindow from gajim.gtk.accounts import AccountsWindow
from gajim.gtk.proxies import ManageProxies from gajim.gtk.proxies import ManageProxies
from gajim.gtk.discovery import ServiceDiscoveryWindow
# General Actions # General Actions
@ -130,7 +130,7 @@ def on_service_disco(action, param):
else: else:
try: try:
# Object will add itself to the window dict # Object will add itself to the window dict
disco.ServiceDiscoveryWindow(account, address_entry=True) ServiceDiscoveryWindow(account, address_entry=True)
except GajimGeneralException: except GajimGeneralException:
pass pass

0
gajim/disco.py → gajim/gtk/discovery.py
View File

4
gajim/roster_window.py
View File

@ -46,7 +46,6 @@ from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE
from gajim import dialogs from gajim import dialogs
from gajim import vcard from gajim import vcard
from gajim import disco
from gajim import gtkgui_helpers from gajim import gtkgui_helpers
from gajim import gui_menu_builder from gajim import gui_menu_builder
from gajim import cell_renderer_image from gajim import cell_renderer_image
@ -79,6 +78,7 @@ from gajim.gtk.pep_config import ManagePEPServicesWindow
from gajim.gtk.bookmarks import ManageBookmarksWindow from gajim.gtk.bookmarks import ManageBookmarksWindow
from gajim.gtk.account_wizard import AccountCreationWizard from gajim.gtk.account_wizard import AccountCreationWizard
from gajim.gtk.service_registration import ServiceRegistration from gajim.gtk.service_registration import ServiceRegistration
from gajim.gtk.discovery import ServiceDiscoveryWindow
from gajim.gtk.history import HistoryWindow from gajim.gtk.history import HistoryWindow
from gajim.gtk.accounts import AccountsWindow from gajim.gtk.accounts import AccountsWindow
from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.tooltips import RosterTooltip
@ -4035,7 +4035,7 @@ class RosterWindow:
else: else:
try: try:
# Object will add itself to the window dict # Object will add itself to the window dict
disco.ServiceDiscoveryWindow(account, address_entry=True) ServiceDiscoveryWindow(account, address_entry=True)
except GajimGeneralException: except GajimGeneralException:
pass pass