[meld/deprecation-cleanup] Replace gnomeglade imports with their source

[Kai Willadsen <kaiw src gnome org>]

commit e95fb2802d078d467cc57dc9246dba874c2a0873
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Dec 10 07:18:32 2018 +1000

    Replace gnomeglade imports with their source
    
    We had the alias in the gnomeglade module for compatibility, but that's
    not a thing any more.

 meld/dirdiff.py    | 3 +--
 meld/filediff.py   | 3 +--
 meld/meldwindow.py | 3 +--
 meld/vcview.py     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 8b2abc78..76e0bd3b 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -35,7 +35,7 @@ from gi.repository import Gtk
 # TODO: Don't from-import whole modules
 from meld import misc
 from meld import tree
-from meld.conf import _
+from meld.conf import _, ui_file
 from meld.iohelpers import trash_or_confirm
 from meld.melddoc import MeldDoc
 from meld.misc import all_same, apply_text_filters, with_focused_pane
@@ -46,7 +46,6 @@ from meld.ui._gtktemplate import Template
 from meld.ui.cellrenderers import (
     CellRendererByteSize, CellRendererDate, CellRendererFileMode)
 from meld.ui.emblemcellrenderer import EmblemCellRenderer
-from meld.ui.gnomeglade import ui_file
 from meld.ui.util import map_widgets_into_lists
 
 
diff --git a/meld/filediff.py b/meld/filediff.py
index 85269be1..261f64f0 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -27,7 +27,7 @@ from gi.repository import GtkSource
 
 # TODO: Don't from-import whole modules
 from meld import misc
-from meld.conf import _
+from meld.conf import _, ui_file
 from meld.const import MODE_DELETE, MODE_INSERT, MODE_REPLACE, NEWLINES
 from meld.iohelpers import prompt_save_filename
 from meld.matchers.diffutil import Differ, merged_chunk_order
@@ -44,7 +44,6 @@ from meld.sourceview import (
     get_custom_encoding_candidates, LanguageManager, TextviewLineAnimationType)
 from meld.ui._gtktemplate import Template
 from meld.ui.findbar import FindBar
-from meld.ui.gnomeglade import ui_file
 from meld.ui.util import map_widgets_into_lists
 from meld.undo import UndoSequence
 
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 0ca68345..9d9b59d8 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -22,7 +22,7 @@ from gi.repository import GLib
 from gi.repository import Gtk
 
 import meld.ui.util
-from meld.conf import _
+from meld.conf import _, ui_file
 from meld.dirdiff import DirDiff
 from meld.filediff import FileDiff
 from meld.filemerge import FileMerge
@@ -31,7 +31,6 @@ from meld.newdifftab import NewDiffTab
 from meld.recent import recent_comparisons, RecentType
 from meld.task import LifoScheduler
 from meld.ui._gtktemplate import Template
-from meld.ui.gnomeglade import ui_file
 from meld.ui.notebooklabel import NotebookLabel
 from meld.vcview import VcView
 from meld.windowstate import SavedWindowState
diff --git a/meld/vcview.py b/meld/vcview.py
index 3792b3f7..e531a6b1 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -31,14 +31,13 @@ from gi.repository import Gtk
 from gi.repository import Pango
 
 from meld import tree
-from meld.conf import _
+from meld.conf import _, ui_file
 from meld.iohelpers import trash_or_confirm
 from meld.melddoc import MeldDoc
 from meld.misc import error_dialog, read_pipe_iter
 from meld.recent import RecentType
 from meld.settings import bind_settings, settings
 from meld.ui._gtktemplate import Template
-from meld.ui.gnomeglade import ui_file
 from meld.ui.vcdialogs import CommitDialog, PushDialog
 from meld.vc import _null, get_vcs
 from meld.vc._vc import Entry