Merge lp:~kelwin-lee/scratch/fix-1075241 into lp:~elementary-apps/scratch/scratch

[Cuzzie Lee]

Fixed bug #1075241

Fixes bug #1075241

[Mario Guerriero (mefrio-g)]

review: Approve

[lp:~kelwin-lee/scratch/fix-1075241]

1184. By Cuzzie Lee on 2013-08-19

Fixes bug #1190437

1185. By Cuzzie Lee on 2013-08-19

Fixes bug #1099130

[Mario Guerriero (mefrio-g)]

I just noticed that this branch make Scratch to load file all in a single line. It does not add any \n character at the source view so that the file is shown all in a line. I reverted, this merge request.

review: Needs Fixing

[lp:~kelwin-lee/scratch/fix-1075241]

1186. By Cuzzie Lee on 2013-08-19

Merged with latest revision

1187. By Cuzzie Lee on 2013-08-19

Append newline for local revision

1188. By Cuzzie Lee on 2013-08-20

Fixes bug #1075241

[Mario Guerriero (mefrio-g)]

review: Approve

=== modified file 'src/Services/FileHandler.vala'
--- src/Services/FileHandler.vala	2013-08-19 20:54:19 +0000
+++ src/Services/FileHandler.vala	2013-08-20 13:53:27 +0000
@@ -38,7 +38,7 @@
                     text.append (line);
                     text.append_c ('\n');
                 }
-                return text.str;
+                return text.erase(text.len - 1, 1);
             } catch (Error e) {
                 warning ("Cannot read \"%s\": %s", file.get_basename (), e.message);
                 return null;
@@ -57,7 +57,7 @@
                         text.append_c ('\n');
                     }
                 }
-                return text.str;
+                return text.erase(text.len - 1, 1);
             } catch (Error e) {
                 warning ("Cannot read \"%s\": %s", file.get_basename (), e.message);
                 return null;