[meld/meld-3-14] filediff: Hack around double setting of filechooser paths (bgo#755362)

[Kai Willadsen <kaiw src gnome org>]

commit d5431e997c2df748ec24e57891848ff1d7374162
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Aug 12 08:59:05 2015 +1000

    filediff: Hack around double setting of filechooser paths (bgo#755362)
    
    This causes a crash on at least some versions of GTK+, but we kind of
    need it (for now at least) to handle --output setting. We should be
    able to work around this better, but for now this hack will do the
    job.
    
    Also, this bug has already been fixed in GTK+, but only in 3.18 so
    it's well above what we're going to require for this release of Meld.

 meld/filediff.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 9ff8e81..c132959 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1045,7 +1045,11 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         if os.path.exists(buf.data.savefile):
             writable = os.access(buf.data.savefile, os.W_OK)
         self.set_buffer_writable(buf, writable)
-        self.fileentry[1].set_filename(buf.data.savefile)
+
+        # FIXME: Hack around bgo#737804; remove after GTK+ 3.18 is required
+        def set_merge_file_entry():
+            self.fileentry[1].set_filename(buf.data.savefile)
+        self.scheduler.add_task(set_merge_file_entry)
         self.recompute_label()
 
     def _set_save_action_sensitivity(self):