Commit be31afa3 authored by Kai Willadsen's avatar Kai Willadsen

Move FileMerge output-redirection changes to FileDiff

parent d3787b5b
......@@ -876,6 +876,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
if len(self.textbuffer) < 2:
return
self.textbuffer[1].data.savefile = os.path.abspath(filename)
self.textbuffer[1].data.set_label(filename)
self.fileentry[1].set_filename(os.path.abspath(filename))
self.recompute_label()
def recompute_label(self):
filenames = []
......
......@@ -37,12 +37,6 @@ class FileMerge(filediff.FileDiff):
self.textview[0].set_editable(0)
self.textview[2].set_editable(0)
def set_merge_output_file(self, filename):
filediff.FileDiff.set_merge_output_file(self, filename)
self.textbuffer[1].data.set_label(filename)
self.fileentry[1].set_filename(os.path.abspath(filename))
self.recompute_label()
def _set_files_internal(self, files):
textbuffers = self.textbuffer[:]
textbuffers[1] = self.hidden_textbuffer
......
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