From 7b981d2886181bdc2ebb7aacdb0495796d6b7635 Mon Sep 17 00:00:00 2001 From: Kai Willadsen Date: Sun, 23 Sep 2012 12:34:21 +1000 Subject: [PATCH 1/2] Move FileMerge output-redirection changes to FileDiff --- meld/filediff.py | 3 +++ meld/filemerge.py | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/meld/filediff.py b/meld/filediff.py index 733c5b2..f4f5847 100644 --- a/meld/filediff.py +++ b/meld/filediff.py @@ -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 = [] diff --git a/meld/filemerge.py b/meld/filemerge.py index 5eeb0d9..1106deb 100644 --- a/meld/filemerge.py +++ b/meld/filemerge.py @@ -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 -- 1.7.3.4