[meld] Fix error logic to avoid inserting binary data into the text buffer
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Fix error logic to avoid inserting binary data into the text buffer
- Date: Fri, 13 Jul 2012 23:02:59 +0000 (UTC)
commit 069c7ac65e3b2c7ed57f8386e4c92747a341ed8d
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Jul 14 05:55:20 2012 +1000
Fix error logic to avoid inserting binary data into the text buffer
As a result, we also avoid a GTK+ debug spew on the command line when
attempting to load binary files.
meld/filediff.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 5158cf0..ce618d0 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -948,6 +948,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
_("Could not read file"),
_("%s appears to be a binary file.") % t.filename)
tasks.remove(t)
+ continue
except ValueError as err:
t.codec.pop(0)
if len(t.codec):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]