[meld: 6/8] [FIX] 1. inline 2. shorten the line
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 6/8] [FIX] 1. inline 2. shorten the line
- Date: Mon, 28 Feb 2022 21:55:53 +0000 (UTC)
commit 882d023338c63085d3384e0f493394b265c0da5a
Author: Helly Guo <buffoonguo gmail com>
Date: Sun Feb 27 20:13:35 2022 +0800
[FIX] 1. inline 2. shorten the line
meld/dirdiff.py | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index ba45f1c9..336f1c41 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -1277,7 +1277,8 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
self.set_action_enabled('folder-compare', True)
self.set_action_enabled('folder-mark', True)
self.set_action_enabled('folder-compare-marked',
- self.marked is not None and self.marked.get('pane', -1) != pane)
+ self.marked is not None and
+ self.marked.get('pane', -1) != pane)
self.set_action_enabled('folder-delete', is_valid)
self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
self.set_action_enabled(
@@ -1469,12 +1470,6 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
}
def action_diff_marked(self, *args):
- if self.marked is None:
- return
-
- marked = self.marked['mark']
- marked_pane = self.marked['pane']
-
pane = self._get_focused_pane()
if pane is None:
return
@@ -1484,7 +1479,7 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
return
row_paths = [
- self.model.value_paths(marked)[marked_pane],
+ self.model.value_paths(self.marked['mark'])[self.marked['pane']],
self.model.value_paths(selected)[pane]
]
gfiles = [Gio.File.new_for_path(p)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]