[meld: 13/63] filediff, meldbuffer: Move label and filename reset into MeldBufferData

[Kai Willadsen <kaiw src gnome org>]

commit 4037942e18369d23f91bb3eccf8afc42b1b7572d
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 19 12:34:25 2015 +1000

    filediff, meldbuffer: Move label and filename reset into MeldBufferData

 meld/filediff.py   |    7 ++++---
 meld/meldbuffer.py |   19 ++++++-------------
 2 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 25abb71..f54fdef 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1016,8 +1016,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         self.label_changed()
 
     def set_files(self, files):
-        """Set num panes to len(files) and load each file given.
-           If an element is None, the text of a pane is left as is.
+        """Load the given files
+
+        If an element is None, the text of a pane is left as is.
         """
         self._disconnect_buffer_handlers()
         files = list(files)
@@ -1028,7 +1029,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 files[i] = f = f.decode('utf8')
             absfile = os.path.abspath(f)
             self.fileentry[i].set_filename(absfile)
-            self.textbuffer[i].reset_buffer(absfile)
+            self.textbuffer[i].data.reset(absfile)
             self.msgarea_mgr[i].clear()
 
         self.recompute_label()
diff --git a/meld/meldbuffer.py b/meld/meldbuffer.py
index 3236d87..51d12ba 100644
--- a/meld/meldbuffer.py
+++ b/meld/meldbuffer.py
@@ -68,14 +68,6 @@ class MeldBuffer(GtkSource.Buffer):
             return
         return GtkSource.Buffer.do_apply_tag(self, tag, start, end)
 
-    def reset_buffer(self, filename):
-        """Clear the contents of the buffer and reset its metadata"""
-        self.delete(*self.get_bounds())
-        label = self.data.label if self.data.filename == filename else filename
-        self.data.reset()
-        self.data.filename = filename
-        self.data.label = label
-
     def get_iter_at_line_or_eof(self, line):
         """Return a Gtk.TextIter at the given line, or the end of the buffer.
 
@@ -113,19 +105,20 @@ class MeldBufferData(GObject.GObject):
 
     def __init__(self, filename=None):
         GObject.GObject.__init__(self)
-        self.reset()
-        self.label = self.filename = filename
+        self._filename = None
+        self._label = None
+        self.reset(filename)
 
-    def reset(self):
+    def reset(self, filename):
         self.loaded = False
         self.modified = False
         self.editable = True
         self._monitor = None
         self._mtime = None
         self._disk_mtime = None
-        self.filename = None
+        self.label = self._label if self._filename == filename else filename
+        self.filename = filename
         self.savefile = None
-        self._label = None
         self.encoding = None
         self.newlines = None