Merge lp:~niclasl/scratch/fix-1351611 into lp:~elementary-apps/scratch/scratch

[Niclas Lockner]

Fix bug #1351611: The text in the sourceview buffer is now set synchronuously.

The text in the sourceview buffer is now set synchronuously.

The cause of the bug was that there was a window from that the content was loaded from file, to that the callback added to the Idle queue was executed where a call to save would clear the file.

A possible scenario where this would happen is:

1. Some files are opened when Scratch is opened
2. A "focus in" event loads the content of the active tab's file. The callback in set_text is queued.
3. The user switches tab, causing a "focus out" event on the old tab which calls save.
4. Save writes the current content of the empty buffer to file and sets the saved state to true
5. The callback gets executed, filling the buffer with the file content
6. The user closes Scratch. Since saved == true, the content in the buffer is not written to the (now empty) file.

Also, I could not find a reason why the buffer text assignment should be done in a Idle callback, so removing it should not introduce a threading issue.

[xapantu (xapantu)]

It looks fine, even if it is hard to test. Removing the idle makes sense.

review: Approve

=== modified file 'src/Widgets/SourceView.vala'
--- src/Widgets/SourceView.vala	2014-06-26 08:18:30 +0000
+++ src/Widgets/SourceView.vala	2014-08-05 12:59:13 +0000
@@ -258,15 +258,17 @@
         }
 
         public void set_text (string text, bool opening = true) {
-            GLib.Idle.add (() => {
-                if (opening) buffer.begin_not_undoable_action ();
-                buffer.text = text;
-                if (opening) buffer.end_not_undoable_action ();
-                Gtk.TextIter? start = null;
-                buffer.get_start_iter (out start);
-                buffer.place_cursor (start);
-                return false;
-            });
+            if (opening)
+                buffer.begin_not_undoable_action ();
+
+            buffer.text = text;
+
+            if (opening)
+                buffer.end_not_undoable_action ();
+
+            Gtk.TextIter? start = null;
+            buffer.get_start_iter (out start);
+            buffer.place_cursor (start);
         }
         
         public void set_language (SourceLanguage lang) {