[meld/meld-3-12] filediff: Correctly decode file parse names (bgo#743095)

[Kai Willadsen <kaiw src gnome org>]

commit 2c1eebc4cc34d780d6b7f11b58a8df040a1dff64
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Jan 23 07:13:30 2015 +1000

    filediff: Correctly decode file parse names (bgo#743095)
    
    This change fixes file change notifications for files with Unicode file
    names.

 meld/filediff.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 58c6c3c..1304cec 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1277,8 +1277,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             # Notification for unknown buffer
             return
         gfile = Gio.File.new_for_path(data.filename)
-
-        primary = _("File %s has changed on disk") % gfile.get_parse_name()
+        display_name = gfile.get_parse_name().decode('utf-8')
+        primary = _("File %s has changed on disk") % display_name
         secondary = _("Do you want to reload the file?")
         msgarea = self.msgarea_mgr[pane].new_from_text_and_icon(
                         Gtk.STOCK_DIALOG_WARNING, primary, secondary)