Merge lp:~mfisch/unity/unity-lp1215951 into lp:unity

[Matt Fischer]

Adds a gsetting for the infographic URI

Adds a gsetting for the infographic URI, needed to fix https://bugs.launchpad.net/unity8/+bug/1215951

[Michael Zanetti (mzanetti)]

shouldn't this change rather be in /usr/share/glib-2.0/schemas/com.canonical.unity-greeter.gschema.xml ?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3478
http://jenkins.qa.ubuntu.com/job/unity-ci/313/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/201

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/313/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

I don't believe this is intended for lp:unity, so I'm going to mark this as rejected. If I'm mistaken, please let me know and we'll figure out why this is needed for Unity 7.

review: Disapprove

Unmerged revisions

3478. By Matt Fischer on 2013-08-26

Add a gsetting for the infographic URI

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2013-08-01 19:13:16 +0000
+++ com.canonical.Unity.gschema.xml	2013-08-26 18:55:32 +0000
@@ -73,4 +73,11 @@
       <description>The scopes listed in the scope bar will be ordered according to this list.</description>
     </key>
   </schema>
+  <schema path="/com/canonical/unity/greeter/" id="com.canonical.Unity.Greeter" gettext-domain="unity">
+    <key type="s" name="infographic-uri">
+      <default>'file:///usr/share/unity8/Greeter/graphics/infographic_circle.png'</default>
+      <summary>Path to the infographic circle</summary>
+      <description>Path to the infographic circl</description>
+    </key>
+  </schema>
 </schemalist>