From 59ccac4831e34c6682f3e615f0ff09fa7dfefc20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 28 Oct 2018 19:41:19 +0100
Subject: [PATCH] Move ServiceDiscoveryWindow to gtk folder

---
 gajim/app_actions.py                 | 4 ++--
 gajim/{disco.py => gtk/discovery.py} | 0
 gajim/roster_window.py               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename gajim/{disco.py => gtk/discovery.py} (100%)

diff --git a/gajim/app_actions.py b/gajim/app_actions.py
index d227c573f..da01dac4f 100644
--- a/gajim/app_actions.py
+++ b/gajim/app_actions.py
@@ -22,7 +22,6 @@ from gajim.common import helpers
 from gajim.common.app import interface
 from gajim.common.exceptions import GajimGeneralException
 from gajim import dialogs
-from gajim import disco
 
 import gajim.plugins.gui
 
@@ -44,6 +43,7 @@ from gajim.gtk.account_wizard import AccountCreationWizard
 from gajim.gtk.history import HistoryWindow
 from gajim.gtk.accounts import AccountsWindow
 from gajim.gtk.proxies import ManageProxies
+from gajim.gtk.discovery import ServiceDiscoveryWindow
 
 
 # General Actions
@@ -130,7 +130,7 @@ def on_service_disco(action, param):
     else:
         try:
             # Object will add itself to the window dict
-            disco.ServiceDiscoveryWindow(account, address_entry=True)
+            ServiceDiscoveryWindow(account, address_entry=True)
         except GajimGeneralException:
             pass
 
diff --git a/gajim/disco.py b/gajim/gtk/discovery.py
similarity index 100%
rename from gajim/disco.py
rename to gajim/gtk/discovery.py
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index 3700c9d61..526bff13e 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -46,7 +46,6 @@ from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE
 
 from gajim import dialogs
 from gajim import vcard
-from gajim import disco
 from gajim import gtkgui_helpers
 from gajim import gui_menu_builder
 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.account_wizard import AccountCreationWizard
 from gajim.gtk.service_registration import ServiceRegistration
+from gajim.gtk.discovery import ServiceDiscoveryWindow
 from gajim.gtk.history import HistoryWindow
 from gajim.gtk.accounts import AccountsWindow
 from gajim.gtk.tooltips import RosterTooltip
@@ -4035,7 +4035,7 @@ class RosterWindow:
         else:
             try:
                 # Object will add itself to the window dict
-                disco.ServiceDiscoveryWindow(account, address_entry=True)
+                ServiceDiscoveryWindow(account, address_entry=True)
             except GajimGeneralException:
                 pass