Merge lp:~jbicha/unity/whitelist-printer-applet-771562 into lp:unity

[Jeremy Bícha]

[Didier Roche-Tolomelli (didrocks)]

Thanks for your contribution to unity! :-)

Accepted and will be available in the first unity update after natty.
Thanks a bunch!

review: Approve

[David Barth (dbarth)]

Jeremy, in order to integrate that into the unity code base, we need a copyright assignment. Please read the terms of the agreement at http://www.canonical.com/contributors and send the form to the official address, cc'ing <email address hidden> to speed up the process. Thanks

[Jeremy Bícha (jbicha)]

David, I submitted the copyright assignment March 10. Sorry it's taken me so long to submit my first Unity patch. :-)

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2011-04-09 15:18:20 +0000
+++ com.canonical.Unity.gschema.xml	2011-04-27 01:15:45 +0000
@@ -45,7 +45,7 @@
   </schema>
 	<schema path="/desktop/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
     <key type="as" name="systray-whitelist">
-      <default>[ 'JavaEmbeddedFrame', 'Mumble', 'Wine', 'Skype', 'hp-systray' ]</default>
+      <default>[ 'JavaEmbeddedFrame', 'Mumble', 'Wine', 'Skype', 'hp-systray', 'scp-dbus-service' ]</default>
       <summary>List of client names, resource classes or wm classes to allow in the Panel's systray implementation.</summary>
       <description>"" (empty) will not allow any tray icons, "all" will allow all tray icons, otherwise there will be an attempt to match each icon to a value here.</description>
     </key>