From 6f55cf3dd4f00d52975b7cef09c2de602176fe7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Mon, 26 Mar 2018 00:19:59 +0200
Subject: [PATCH] Fix some problematic imports

---
 gajim/config.py         | 6 ++++--
 gajim/dialogs.py        | 6 ------
 gajim/gtkgui_helpers.py | 4 +---
 gajim/gui_interface.py  | 3 ++-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/gajim/config.py b/gajim/config.py
index 0bed8c324..b99d9d05f 100644
--- a/gajim/config.py
+++ b/gajim/config.py
@@ -48,6 +48,8 @@ from gajim import dialogs
 from gajim import cell_renderer_image
 from gajim import message_control
 from gajim.chat_control_base import ChatControlBase
+from gajim.gajim_themes_window import GajimThemesWindow
+from gajim.advanced_configuration_window import AdvancedConfigurationWindow
 from gajim import dataforms_widget
 from gajim import gui_menu_builder
 
@@ -696,7 +698,7 @@ class PreferencesWindow:
 
     def on_manage_theme_button_clicked(self, widget):
         if self.theme_preferences is None:
-            self.theme_preferences = dialogs.GajimThemesWindow()
+            self.theme_preferences = GajimThemesWindow()
         else:
             self.theme_preferences.window.present()
             self.theme_preferences.select_active_theme()
@@ -1188,7 +1190,7 @@ class PreferencesWindow:
             app.interface.instances['advanced_config'].window.present()
         else:
             app.interface.instances['advanced_config'] = \
-                    dialogs.AdvancedConfigurationWindow()
+                    AdvancedConfigurationWindow()
 
 #---------- ManageProxiesWindow class -------------#
 class ManageProxiesWindow:
diff --git a/gajim/dialogs.py b/gajim/dialogs.py
index 51dbfc166..8a63150e8 100644
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -53,12 +53,6 @@ from gajim.common import const
 from gajim.options_dialog import OptionsDialog
 from gajim.common.const import Option, OptionKind, OptionType
 
-# those imports are not used in this file, but in files that 'import dialogs'
-# so they can do dialog.GajimThemesWindow() for example
-from gajim.filetransfers_window import FileTransfersWindow
-from gajim.gajim_themes_window import GajimThemesWindow
-from gajim.advanced_configuration_window import AdvancedConfigurationWindow
-
 from gajim.common import app
 from gajim.common import helpers
 from gajim.common import i18n
diff --git a/gajim/gtkgui_helpers.py b/gajim/gtkgui_helpers.py
index fc201a600..953942cb3 100644
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -86,9 +86,6 @@ def get_icon_path(icon_name, size=16):
         log.error("Unable to find icon %s: %s" % (icon_name, str(e)))
 
 
-from gajim import dialogs
-
-
 HAS_PYWIN32 = True
 if os.name == 'nt':
     try:
@@ -447,6 +444,7 @@ def scale_with_ratio(size, width, height):
         return size, int(size / ratio)
 
 def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''):
+    from gajim import dialogs
     def on_continue(response, file_path):
         if response < 0:
             return
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index b37103301..d99eb7ff3 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -73,6 +73,7 @@ from gajim.chat_control import ChatControl
 from gajim.groupchat_control import GroupchatControl
 from gajim.groupchat_control import PrivateChatControl
 from gajim.message_window import MessageWindowMgr
+from gajim.filetransfers_window import FileTransfersWindow
 
 from gajim.atom_window import AtomWindow
 from gajim.session import ChatControlSession
@@ -2717,7 +2718,7 @@ class Interface:
         self.roster._after_fill()
 
         # get instances for windows/dialogs that will show_all()/hide()
-        self.instances['file_transfers'] = dialogs.FileTransfersWindow()
+        self.instances['file_transfers'] = FileTransfersWindow()
 
         GLib.timeout_add(100, self.autoconnect)
         if sys.platform == 'win32':