Merge lp:~marcus-lundgren/feedler/fix-1021860 into lp:feedler

Proposed by Marcus Lundgren
Status: Merged
Approved by: Daniel Kur
Approved revision: 287
Merged at revision: 313
Proposed branch: lp:~marcus-lundgren/feedler/fix-1021860
Merge into: lp:feedler
Diff against target: 49 lines (+14/-3)
3 files modified
src/ui/view-list.vala (+5/-1)
src/ui/view-web.vala (+6/-1)
src/window.vala (+3/-1)
To merge this branch: bzr merge lp:~marcus-lundgren/feedler/fix-1021860
Reviewer Review Type Date Requested Status
Daniel Kur Pending
Review via email: mp+116309@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ui/view-list.vala'
2--- src/ui/view-list.vala 2012-06-18 05:38:02 +0000
3+++ src/ui/view-list.vala 2012-07-23 15:31:29 +0000
4@@ -143,7 +143,11 @@
5 item.append ("<div class='item'><span class='title'>"+feed.subject+"</span><br/>");
6 item.append ("<span class='time'>"+feed.date+", by "+feed.author+"</span><br/>");
7 item.append ("<span class='content'>"+feed.text+"</span></div><br/>");
8- GLib.FileUtils.set_contents (path, item.str);
9+
10+ GLib.File file = GLib.File.new_for_path (path);
11+ uint8[] data = item.data;
12+ string s;
13+ file.replace_contents (data, null, false, 0, out s);
14 return true;
15 }
16 }
17
18=== modified file 'src/ui/view-web.vala'
19--- src/ui/view-web.vala 2012-06-04 20:56:36 +0000
20+++ src/ui/view-web.vala 2012-07-23 15:31:29 +0000
21@@ -62,7 +62,12 @@
22 try
23 {
24 var path = GLib.Environment.get_tmp_dir () + "/feedler.html";
25- GLib.FileUtils.set_contents (path, content.str);
26+
27+ GLib.File file = GLib.File.new_for_path (path);
28+ uint8[] data = content.data;
29+ string s;
30+ file.replace_contents (data, null, false, 0, out s);
31+
32 return true;
33 }
34 catch (GLib.Error e)
35
36=== modified file 'src/window.vala'
37--- src/window.vala 2012-06-19 15:27:22 +0000
38+++ src/window.vala 2012-07-23 15:31:29 +0000
39@@ -596,7 +596,9 @@
40 {
41 try
42 {
43- GLib.FileUtils.set_contents (file.get_filename (), this.db.export_to_opml ());
44+ uint8[] data = this.db.export_to_opml ().data;
45+ string s;
46+ file.get_file ().replace_contents (data, null, false, 0, out s);
47 }
48 catch (GLib.Error e)
49 {

Subscribers

People subscribed via source and target branches

to all changes: