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

Proposed by Jeremy Bicha
Status: Merged
Merged at revision: 1183
Proposed branch: lp:~jbicha/unity/whitelist-printer-applet-771562
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
com.canonical.Unity.gschema.xml (+1/-1)
To merge this branch: bzr merge lp:~jbicha/unity/whitelist-printer-applet-771562
Reviewer Review Type Date Requested Status
Didier Roche Approve
Review via email: mp+59152@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche (didrocks) wrote :

Thanks for your contribution to unity! :-)

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

review: Approve
Revision history for this message
David Barth (dbarth) wrote :

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

Revision history for this message
Jeremy Bicha (jbicha) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'com.canonical.Unity.gschema.xml'
2--- com.canonical.Unity.gschema.xml 2011-04-09 15:18:20 +0000
3+++ com.canonical.Unity.gschema.xml 2011-04-27 01:15:45 +0000
4@@ -45,7 +45,7 @@
5 </schema>
6 <schema path="/desktop/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
7 <key type="as" name="systray-whitelist">
8- <default>[ 'JavaEmbeddedFrame', 'Mumble', 'Wine', 'Skype', 'hp-systray' ]</default>
9+ <default>[ 'JavaEmbeddedFrame', 'Mumble', 'Wine', 'Skype', 'hp-systray', 'scp-dbus-service' ]</default>
10 <summary>List of client names, resource classes or wm classes to allow in the Panel's systray implementation.</summary>
11 <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>
12 </key>