Merge lp:~robert-ancell/lingo-dictionary/lp-983563 into lp:lingo-dictionary

Proposed by Robert Ancell
Status: Rejected
Rejected by: Cody Garver
Proposed branch: lp:~robert-ancell/lingo-dictionary/lp-983563
Merge into: lp:lingo-dictionary
Diff against target: 33 lines (+3/-3)
3 files modified
CMakeLists.txt (+1/-1)
org.elementary.lingo.gschema.xml (+1/-1)
src/lingo-settings.vala (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/lingo-dictionary/lp-983563
Reviewer Review Type Date Requested Status
Cody Garver (community) Disapprove
Review via email: mp+102215@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

This fix was superseded by commit 983560.

review: Disapprove

Unmerged revisions

128. By Robert Ancell

Fix GSettings path for settings and schema name

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 2012-01-07 18:58:13 +0000
3+++ CMakeLists.txt 2012-04-17 00:58:18 +0000
4@@ -117,5 +117,5 @@
5 # GSettings Schema
6 #
7 include(GSettings)
8-add_schema("apps.lingo.gschema.xml")
9+add_schema("org.elementary.lingo.gschema.xml")
10
11
12=== renamed file 'apps.lingo.gschema.xml' => 'org.elementary.lingo.gschema.xml'
13--- apps.lingo.gschema.xml 2011-08-15 02:23:11 +0000
14+++ org.elementary.lingo.gschema.xml 2012-04-17 00:58:18 +0000
15@@ -1,5 +1,5 @@
16 <schemalist>
17- <schema path="/apps/lingo/" id="apps.lingo" gettext-domain="lingo">
18+ <schema path="/org/elementary/lingo/" id="org.elementary.lingo" gettext-domain="lingo">
19 <key name="width" type="i">
20 <default>500</default>
21 <summary>Window Width</summary>
22
23=== modified file 'src/lingo-settings.vala'
24--- src/lingo-settings.vala 2012-02-04 00:37:44 +0000
25+++ src/lingo-settings.vala 2012-04-17 00:58:18 +0000
26@@ -27,7 +27,7 @@
27
28 public Settings () {
29
30- base ("apps.lingo");
31+ base ("org.elementary.lingo");
32 }
33 }
34

Subscribers

People subscribed via source and target branches

to all changes: