Merge lp:~darcy-develin/scratch/fix-1046534 into lp:~elementary-apps/scratch/scratch

[Darcy Luís Neves Brás da Silva]

fix bug #1046534 by using a File to get a display_name that is appropriate for presentation opposed to the original one that is still encoded as uri

[Cody Garver (codygarver)]

Approved on the ML by mefrio.

review: Approve

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2012-08-07 14:20:48 +0000
+++ src/Scratch.vala	2012-09-06 20:39:21 +0000
@@ -127,14 +127,24 @@
                 }
             }
 
+            /* Is not open
+             * filename is still encoded as uri, so a file is created
+             * to extract a decoded version/display_name
+             */
+
+            var f = File.new_for_uri(filename);
+            string decoded_filename = f.query_info(FileAttribute.STANDARD_DISPLAY_NAME, FileQueryInfoFlags.NONE).get_display_name();
+            f.unref();
+
             current_directory = Path.get_dirname (filename);
-            var document = new Document(filename, window);
+            /* use the decoded version for presentation */
+            var document = new Document(decoded_filename, window);
             document.create_sourceview ();
             documents.append (document);
             document.closed.connect( (doc) => { documents.remove(doc); });
             document.tab.make_backup ();
             window.current_notebook.set_tab ();
-            window.set_window_title (filename);
+            window.set_window_title (decoded_filename);
             return document;
 
         }