[meld] filediff: Fix additional get_parse_name unicode breakage
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Fix additional get_parse_name unicode breakage
- Date: Thu, 22 Jan 2015 21:35:11 +0000 (UTC)
commit 06aad1b67ac6f79d0753511f0ba8b057f0030201
Author: Kai Willadsen <kai willadsen gmail com>
Date: Fri Jan 23 07:16:52 2015 +1000
filediff: Fix additional get_parse_name unicode breakage
meld/filediff.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index f9e3f4a..2fa674a 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1660,7 +1660,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
gfile = Gio.File.new_for_path(bufdata.filename)
primary = (
_("File %s has changed on disk since it was opened") %
- gfile.get_parse_name())
+ gfile.get_parse_name().decode('utf-8'))
secondary = _("If you save it, any external changes will be lost.")
msgarea = self.msgarea_mgr[pane].new_from_text_and_icon(
Gtk.STOCK_DIALOG_WARNING, primary, secondary)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]