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

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

[Sergey "Shnatsel" Davidoff (shnatsel)]

Screw code reviews.

review: Approve

[David Gomes (davidgomes)]

This is an Approve, except for that missing space before the first Opening Parenthes on Line 24.

review: Approve

[Sergey "Shnatsel" Davidoff (shnatsel)]

I mean, all it does is reverting a previous merge that causes crashes and bug 1048186, and we're waiting for... over two days to just revert a commit? I'm catalyzing this!

[Danielle Foré (danrabbit)]

Wow Sergey, way to be mature and a good example. Mefrio already said he'd do reviews when he gets back. Not to mention Scratch does not have anything targeted for Beta1, so it's NOT a development focus right now.

If you want something reviewed faster, please actually review it. Merging code just because you're impatient is irresponsible and selfish.

[Sergey "Shnatsel" Davidoff (shnatsel)]

Okay, I knew you'd say that so I've added a follow-up explaination ;)

=== modified file 'src/Scratch.vala'
--- src/Scratch.vala	2012-09-06 20:31:51 +0000
+++ src/Scratch.vala	2012-09-10 07:45:27 +0000
@@ -126,25 +126,19 @@
                     return doc;
                 }
             }
-
-            /* 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);
-            /* use the decoded version for presentation */
-            var document = new Document(decoded_filename, window);
+            /* FIXME : filename is still encoded as uri */
+            var document = new Document(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 (decoded_filename);
+            /* FIXME : filename is still encoded as uri */
+            window.set_window_title (filename);
             return document;
 
         }