When trying to find a file in dirdiff or vcview mode the following
error would be displayed:
  TypeError: treeview_search_cb() takes exactly 5 arguments (6 given)

Add an unused "data" argument to treeview_search_cb() to silence the
warning and allow file searching to work.

Signed-off-by: Peter Tyser <[email protected]>
---
 meld/tree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meld/tree.py b/meld/tree.py
index aa57c9d..bcc7251 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -221,7 +221,7 @@ class DiffTreeStore(Gtk.TreeStore):
 
         return prev_path, next_path
 
-    def treeview_search_cb(self, model, column, key, it):
+    def treeview_search_cb(self, model, column, key, it, data):
         # If the key contains a path separator, search the whole path,
         # otherwise just use the filename. If the key is all lower-case, do a
         # case-insensitive match.
-- 
1.8.3.2

_______________________________________________
meld-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/meld-list

Reply via email to