[meld] Adjust imports to fix dbus-less Windows environment (closes bgo#678809)

[Kai Willadsen <kaiw src gnome org>]

commit 941658f590b0459ba13e2e30faa99e7478269912
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Jul 9 04:28:24 2012 +1000

    Adjust imports to fix dbus-less Windows environment (closes bgo#678809)

 bin/meld |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 2ca8451..6cb7a7b 100755
--- a/bin/meld
+++ b/bin/meld
@@ -132,7 +132,8 @@ except (ImportError, AssertionError) as e:
 gtk.icon_theme_get_default().append_search_path(meld.paths.icon_dir())
 
 def main():
-    from meld.meldapp import app
+    import meld.meldapp
+    app = meld.meldapp.app
     try:
         import meld.dbus_service
         already_running, dbus_app = meld.dbus_service.setup(app)