From c2aba7ccb6793de228e81e412fddffec67b7c23f Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Sat, 10 Sep 2016 16:38:54 -0500
Subject: [PATCH] Revert import changes

Seems to be an issue with the folder name - maybe conflicting in some
way?
---
 resources/lib/connectmanager.py                    | 6 +-----
 resources/lib/dialog/__init__.py                   | 1 -
 resources/lib/dialogs/__init__.py                  | 6 ++++++
 resources/lib/{dialog => dialogs}/loginconnect.py  | 0
 resources/lib/{dialog => dialogs}/loginmanual.py   | 0
 resources/lib/{dialog => dialogs}/serverconnect.py | 0
 resources/lib/{dialog => dialogs}/servermanual.py  | 0
 resources/lib/{dialog => dialogs}/usersconnect.py  | 0
 8 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 resources/lib/dialog/__init__.py
 create mode 100644 resources/lib/dialogs/__init__.py
 rename resources/lib/{dialog => dialogs}/loginconnect.py (100%)
 rename resources/lib/{dialog => dialogs}/loginmanual.py (100%)
 rename resources/lib/{dialog => dialogs}/serverconnect.py (100%)
 rename resources/lib/{dialog => dialogs}/servermanual.py (100%)
 rename resources/lib/{dialog => dialogs}/usersconnect.py (100%)

diff --git a/resources/lib/connectmanager.py b/resources/lib/connectmanager.py
index f7dae624..848b9d95 100644
--- a/resources/lib/connectmanager.py
+++ b/resources/lib/connectmanager.py
@@ -10,11 +10,7 @@ import xbmcaddon
 import clientinfo
 import read_embyserver as embyserver
 import connect.connectionmanager as connectionmanager
-from dialog.serverconnect import ServerConnect
-from dialog.usersconnect import UsersConnect
-from dialog.loginconnect import LoginConnect
-from dialog.loginmanual import LoginManual
-from dialog.servermanual import ServerManual
+from dialogs import ServerConnect, UsersConnect, LoginConnect, LoginManual, ServerManual
 
 ##################################################################################################
 
diff --git a/resources/lib/dialog/__init__.py b/resources/lib/dialog/__init__.py
deleted file mode 100644
index b93054b3..00000000
--- a/resources/lib/dialog/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file to make this directory a package.
diff --git a/resources/lib/dialogs/__init__.py b/resources/lib/dialogs/__init__.py
new file mode 100644
index 00000000..b6c69bf6
--- /dev/null
+++ b/resources/lib/dialogs/__init__.py
@@ -0,0 +1,6 @@
+# Dummy file to make this directory a package.
+from serverconnect import ServerConnect
+from usersconnect import UsersConnect
+from loginconnect import LoginConnect
+from loginmanual import LoginManual
+from servermanual import ServerManual
diff --git a/resources/lib/dialog/loginconnect.py b/resources/lib/dialogs/loginconnect.py
similarity index 100%
rename from resources/lib/dialog/loginconnect.py
rename to resources/lib/dialogs/loginconnect.py
diff --git a/resources/lib/dialog/loginmanual.py b/resources/lib/dialogs/loginmanual.py
similarity index 100%
rename from resources/lib/dialog/loginmanual.py
rename to resources/lib/dialogs/loginmanual.py
diff --git a/resources/lib/dialog/serverconnect.py b/resources/lib/dialogs/serverconnect.py
similarity index 100%
rename from resources/lib/dialog/serverconnect.py
rename to resources/lib/dialogs/serverconnect.py
diff --git a/resources/lib/dialog/servermanual.py b/resources/lib/dialogs/servermanual.py
similarity index 100%
rename from resources/lib/dialog/servermanual.py
rename to resources/lib/dialogs/servermanual.py
diff --git a/resources/lib/dialog/usersconnect.py b/resources/lib/dialogs/usersconnect.py
similarity index 100%
rename from resources/lib/dialog/usersconnect.py
rename to resources/lib/dialogs/usersconnect.py