[meld: 14/63] filediff: Absorb _load_files into out only file setter
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 14/63] filediff: Absorb _load_files into out only file setter
- Date: Wed, 16 Dec 2015 21:20:08 +0000 (UTC)
commit 8239c328cd9f6ae3a6fd2c364b9e8cd8d12a862c
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Jul 19 12:35:56 2015 +1000
filediff: Absorb _load_files into out only file setter
meld/filediff.py | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index f54fdef..23e6f20 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1020,6 +1020,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
If an element is None, the text of a pane is left as is.
"""
+ if len(files) != self.num_panes:
+ return
+
self._disconnect_buffer_handlers()
files = list(files)
for i, f in enumerate(files):
@@ -1034,17 +1037,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
self.recompute_label()
self.textview[len(files) >= 2].grab_focus()
- self._connect_buffer_handlers()
- self._load_files(files)
-
- def get_comparison(self):
- files = [b.data.filename for b in self.textbuffer[:self.num_panes]]
- return recent.TYPE_FILE, files
- def _load_files(self, files):
- if len(files) != self.num_panes:
- return
- self._disconnect_buffer_handlers()
self.undosequence.clear()
self.linediffer.clear()
@@ -1065,6 +1058,10 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
user_data=(pane,)
)
+ def get_comparison(self):
+ files = [b.data.filename for b in self.textbuffer[:self.num_panes]]
+ return recent.TYPE_FILE, files
+
def file_loaded(self, loader, result, user_data):
gfile = loader.get_location()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]