[meld] recent: Remove flags from recent items return
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] recent: Remove flags from recent items return
- Date: Sun, 6 Jan 2019 02:57:27 +0000 (UTC)
commit a042d2be616038683ec5d55c9474f10840416898
Author: Kai Willadsen <kai willadsen gmail com>
Date: Tue Dec 11 07:08:32 2018 +1000
recent: Remove flags from recent items return
These were never set and never used.
meld/meldwindow.py | 2 +-
meld/recent.py | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 76474bbb..67b4b39f 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -605,7 +605,7 @@ class MeldWindow(Gtk.ApplicationWindow):
return doc
def append_recent(self, uri):
- comparison_type, gfiles, flags = recent_comparisons.read(uri)
+ comparison_type, gfiles = recent_comparisons.read(uri)
comparison_method = {
RecentType.File: self.append_filediff,
RecentType.Folder: self.append_dirdiff,
diff --git a/meld/recent.py b/meld/recent.py
index de780fd2..9cb49ce7 100644
--- a/meld/recent.py
+++ b/meld/recent.py
@@ -149,9 +149,8 @@ class RecentFiles:
else:
paths = config.get("Comparison", "paths").split(";")
gfiles = tuple(Gio.File.new_for_path(p) for p in paths)
- flags = tuple()
- return recent_type, gfiles, flags
+ return recent_type, gfiles
def _write_recent_file(self, recent_type: RecentType, uris):
# TODO: Use GKeyFile instead, and return a Gio.File. This is why we're
@@ -198,10 +197,10 @@ class RecentFiles:
self._stored_comparisons = {}
for item_uri in item_uris:
try:
- recent_type, gfiles, flags = self.read(item_uri)
+ recent_type, gfiles = self.read(item_uri)
except (IOError, ValueError):
continue
- # Store and look up comparisons by type and paths, ignoring flags
+ # Store and look up comparisons by type and paths
gfile_uris = tuple(gfile.get_uri() for gfile in gfiles)
self._stored_comparisons[recent_type, gfile_uris] = item_uri
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]