Commit d01bd6a4 authored by Kai Willadsen's avatar Kai Willadsen

filediff: Add hack to work around double setting of filechooser paths

This causes a crash on at least some versions of GKT+, 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.
parent 7424577c
......@@ -976,7 +976,11 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
buf.data.savefile = os.path.abspath(filename)
buf.data.label = filename
self.update_buffer_writable(buf)
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):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment