[meld/meld-3-12] filediff: Fix additional get_parse_name unicode breakage

[Kai Willadsen <kaiw src gnome org>]

commit 3df86c0faeed5cfe3939935fbac5e30c8d705774
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 1304cec..59666e3 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1666,7 +1666,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         if not force_overwrite and not bufdata.current_on_disk():
             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)