[meld] Move FileMerge output-redirection changes to FileDiff

[Kai Willadsen <kaiw src gnome org>]

commit be31afa353995c3331cddf5c3f5d3f8a8d49aac5
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Sep 23 12:34:21 2012 +1000

    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 ace18cc..7604d3d 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