Merge lp:~scopecreator-team/scopecreator/rss-emblem into lp:~scopecreator-team/scopecreator/rss-template

Proposed by Chris Wayne on 2015-05-20
Status: Merged
Merged at revision: 11
Proposed branch: lp:~scopecreator-team/scopecreator/rss-emblem
Merge into: lp:~scopecreator-team/scopecreator/rss-template
Diff against target: 32 lines (+3/-2)
2 files modified
po/rss.pot (+2/-2)
src/scope/query.cpp (+1/-0)
To merge this branch: bzr merge lp:~scopecreator-team/scopecreator/rss-emblem
Reviewer Review Type Date Requested Status
Scott Sweeny (community) 2015-05-20 Approve on 2015-05-20
Review via email: mp+259619@code.launchpad.net

This proposal supersedes a proposal from 2015-05-20.

To post a comment you must log in.
Scott Sweeny (ssweeny) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/rss.pot'
2--- po/rss.pot 2015-03-25 03:39:55 +0000
3+++ po/rss.pot 2015-05-20 13:57:31 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2015-03-24 23:39-0400\n"
9+"POT-Creation-Date: 2015-05-20 09:29-0400\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -21,6 +21,6 @@
14 msgid "Vox"
15 msgstr ""
16
17-#: ../src/scope/query.cpp:213
18+#: ../src/scope/query.cpp:214
19 msgid "Open"
20 msgstr ""
21
22=== modified file 'src/scope/query.cpp'
23--- src/scope/query.cpp 2015-03-25 03:17:53 +0000
24+++ src/scope/query.cpp 2015-05-20 13:57:31 +0000
25@@ -202,6 +202,7 @@
26 res["author"] = sc::Variant(item.author);
27 res["summary"] = sc::Variant(item.summary);
28 res["content"] = sc::Variant(item.content);
29+ res["emblem"] = sc::Variant(scope_directory_+"/images/emblem.png");
30
31 if (res.art().empty()) {
32 res.set_art(scope_directory_ + "/icon.png");

Subscribers

People subscribed via source and target branches

to all changes: