[meld] ui: Remove old glade-integration stuff and fix imports

[Kai Willadsen <kaiw src gnome org>]

commit 0ddfe7c8a218e6cebeae4460a917e05cbff90b35
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Dec 18 06:53:32 2013 +1000

    ui: Remove old glade-integration stuff and fix imports

 meld/ui/gladesupport.py |   14 +++++++-------
 meld/ui/gnomeglade.py   |    3 ---
 2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/meld/ui/gladesupport.py b/meld/ui/gladesupport.py
index 9ada093..2827db8 100644
--- a/meld/ui/gladesupport.py
+++ b/meld/ui/gladesupport.py
@@ -1,8 +1,8 @@
 
-from . import historyentry
-from . import msgarea
-from . import statusbar
-import meld.linkmap
-import meld.diffmap
-import meld.preferences
-import meld.sourceview
+from meld import diffmap
+from meld import linkmap
+from meld import preferences
+from meld import sourceview
+from meld.ui import historyentry
+from meld.ui import msgarea
+from meld.ui import statusbar
diff --git a/meld/ui/gnomeglade.py b/meld/ui/gnomeglade.py
index db58ac3..206dc2e 100644
--- a/meld/ui/gnomeglade.py
+++ b/meld/ui/gnomeglade.py
@@ -22,9 +22,6 @@ from gi.repository import Gtk
 
 import meld.conf
 
-# Import support module to get all builder-constructed widgets in the namespace
-from meld.ui import gladesupport
-
 
 def ui_file(filename):
     return os.path.join(meld.conf.DATADIR, "ui", filename)