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
=== modified file 'src/ui/view-list.vala'
--- src/ui/view-list.vala 2012-06-18 05:38:02 +0000
+++ src/ui/view-list.vala 2012-07-23 15:31:29 +0000
@@ -143,7 +143,11 @@
143 item.append ("<div class='item'><span class='title'>"+feed.subject+"</span><br/>");143 item.append ("<div class='item'><span class='title'>"+feed.subject+"</span><br/>");
144 item.append ("<span class='time'>"+feed.date+", by "+feed.author+"</span><br/>");144 item.append ("<span class='time'>"+feed.date+", by "+feed.author+"</span><br/>");
145 item.append ("<span class='content'>"+feed.text+"</span></div><br/>");145 item.append ("<span class='content'>"+feed.text+"</span></div><br/>");
146 GLib.FileUtils.set_contents (path, item.str);146
147 GLib.File file = GLib.File.new_for_path (path);
148 uint8[] data = item.data;
149 string s;
150 file.replace_contents (data, null, false, 0, out s);
147 return true;151 return true;
148 }152 }
149 }153 }
150154
=== modified file 'src/ui/view-web.vala'
--- src/ui/view-web.vala 2012-06-04 20:56:36 +0000
+++ src/ui/view-web.vala 2012-07-23 15:31:29 +0000
@@ -62,7 +62,12 @@
62 try62 try
63 {63 {
64 var path = GLib.Environment.get_tmp_dir () + "/feedler.html";64 var path = GLib.Environment.get_tmp_dir () + "/feedler.html";
65 GLib.FileUtils.set_contents (path, content.str);65
66 GLib.File file = GLib.File.new_for_path (path);
67 uint8[] data = content.data;
68 string s;
69 file.replace_contents (data, null, false, 0, out s);
70
66 return true;71 return true;
67 }72 }
68 catch (GLib.Error e)73 catch (GLib.Error e)
6974
=== modified file 'src/window.vala'
--- src/window.vala 2012-06-19 15:27:22 +0000
+++ src/window.vala 2012-07-23 15:31:29 +0000
@@ -596,7 +596,9 @@
596 {596 {
597 try597 try
598 {598 {
599 GLib.FileUtils.set_contents (file.get_filename (), this.db.export_to_opml ());599 uint8[] data = this.db.export_to_opml ().data;
600 string s;
601 file.get_file ().replace_contents (data, null, false, 0, out s);
600 }602 }
601 catch (GLib.Error e)603 catch (GLib.Error e)
602 {604 {

Subscribers

People subscribed via source and target branches

to all changes: