Merge lp:~robert-ancell/feedler/lp-983577 into lp:feedler

Proposed by Robert Ancell
Status: Merged
Approved by: Daniel Kur
Approved revision: 88
Merge reported by: Daniel Kur
Merged at revision: not available
Proposed branch: lp:~robert-ancell/feedler/lp-983577
Merge into: lp:feedler
Diff against target: 33 lines (+3/-3)
3 files modified
CMakeLists.txt (+1/-1)
org.elementary.feedler.gschema.xml (+1/-1)
src/feedler-settings.vala (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/feedler/lp-983577
Reviewer Review Type Date Requested Status
Daniel Kur Pending
Review via email: mp+102223@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 'CMakeLists.txt'
2--- CMakeLists.txt 2011-10-28 00:59:53 +0000
3+++ CMakeLists.txt 2012-04-17 01:19:18 +0000
4@@ -142,5 +142,5 @@
5 # GSettings Schema
6 #
7 include(GSettings)
8-add_schema("apps.feedler.gschema.xml")
9+add_schema("org.elementary.feedler.gschema.xml")
10
11
12=== renamed file 'apps.feedler.gschema.xml' => 'org.elementary.feedler.gschema.xml'
13--- apps.feedler.gschema.xml 2011-09-25 13:37:03 +0000
14+++ org.elementary.feedler.gschema.xml 2012-04-17 01:19:18 +0000
15@@ -1,5 +1,5 @@
16 <schemalist>
17- <schema path="/apps/feedler/" id="apps.feedler" gettext-domain="feedler">
18+ <schema path="/org/elementary/feedler/" id="apps.feedler" gettext-domain="feedler">
19 <key name="width" type="i">
20 <default>800</default>
21 <summary>Window Width</summary>
22
23=== modified file 'src/feedler-settings.vala'
24--- src/feedler-settings.vala 2011-09-25 13:37:03 +0000
25+++ src/feedler-settings.vala 2012-04-17 01:19:18 +0000
26@@ -13,6 +13,6 @@
27
28 public Settings ()
29 {
30- base ("apps.feedler");
31+ base ("org.elementary.feedler");
32 }
33 }

Subscribers

People subscribed via source and target branches

to all changes: