Files

Merge lp:~mefrio-g/pantheon-files/fix-983560 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-983560
  2. Merge into trunk
Proposed by Mario Guerriero
Status: Merged
Merged at revision: 810
Proposed branch: lp:~mefrio-g/pantheon-files/fix-983560
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 48 lines (+5/-5)
1 file modified
schemas/org.gnome.marlin.gschema.xml (+5/-5)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/fix-983560
Reviewer Review Type Date Requested Status
Pim Vullers (community) Needs Fixing
elementary Apps team Pending
Review via email: mp+105839@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Pim Vullers (pimvullers) wrote :

Using this patch I still get the following error, so it seems you missed one plugin:

CMake Error at cmake/GSettings.cmake:31 (message):
  Schema validation error: warning: Schema
  'org.gnome.marlin.plugins.openterminal' has path
  '/apps/marlin/plugins/openterminal/'. Paths starting with '/apps/',
  '/desktop/' or '/system/' are deprecated.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'schemas/org.gnome.marlin.gschema.xml'
2--- schemas/org.gnome.marlin.gschema.xml 2012-01-19 11:03:51 +0000
3+++ schemas/org.gnome.marlin.gschema.xml 2012-05-15 15:17:18 +0000
4@@ -26,7 +26,7 @@
5 <value value="2" nick="informal"/>
6 </enum>
7
8- <schema path="/apps/marlin/preferences/" id="org.gnome.marlin.preferences">
9+ <schema path="/org/pantheon/pantheon-files/preferences/" id="org.gnome.marlin.preferences">
10 <key type="b" name="show-menubar">
11 <default>false</default>
12 <summary>Show the menubar</summary>
13@@ -175,7 +175,7 @@
14 </key>
15 </schema>
16
17- <schema path="/apps/marlin/icon-view/" id="org.gnome.marlin.icon-view">
18+ <schema path="/org/pantheon/pantheon-files/icon-view/" id="org.gnome.marlin.icon-view">
19 <key name="default-zoom-level" enum="org.gnome.marlin.ZoomLevel">
20 <default>'normal'</default>
21 <summary>icon default zoom level</summary>
22@@ -188,7 +188,7 @@
23 </key>
24 </schema>
25
26- <schema path="/apps/marlin/list-view/" id="org.gnome.marlin.list-view">
27+ <schema path="/org/pantheon/pantheon-files/list-view/" id="org.gnome.marlin.list-view">
28 <key name="default-zoom-level" enum="org.gnome.marlin.ZoomLevel">
29 <default>'smallest'</default>
30 <summary>icon default zoom level</summary>
31@@ -201,7 +201,7 @@
32 </key>
33 </schema>
34
35- <schema path="/apps/marlin/compact-view/" id="org.gnome.marlin.compact-view">
36+ <schema path="/org/pantheon/pantheon-files/compact-view/" id="org.gnome.marlin.compact-view">
37 <key name="default-zoom-level" enum="org.gnome.marlin.ZoomLevel">
38 <default>'smallest'</default>
39 <summary>icon default zoom level</summary>
40@@ -214,7 +214,7 @@
41 </key>
42 </schema>
43
44- <schema path="/apps/marlin/column-view/" id="org.gnome.marlin.column-view">
45+ <schema path="/org/pantheon/pantheon-files/column-view/" id="org.gnome.marlin.column-view">
46 <key name="default-zoom-level" enum="org.gnome.marlin.ZoomLevel">
47 <default>'smallest'</default>
48 <summary>icon default zoom level</summary>

Subscribers

People subscribed via source and target branches

to all changes: