Merge lp:~larsu/unity/add-indicator-printers-support into lp:unity

[Lars Karlitski]

= Problem description =

In precise, print status is shown via an indicator instead of using system-config-printer's applet (which is whitelisted in Unity right now).

= The fix =

This patch makes sure the print indicator is shown at the correct position in the panel and removes the whitelist entry for 'scp-dbus-service'.

= Test coverage =

None, trivial change.

[Gord Allott (gordallott)]

+1

review: Approve

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2012-02-07 15:41:42 +0000
+++ com.canonical.Unity.gschema.xml	2012-02-22 14:26:43 +0000
@@ -40,7 +40,7 @@
   </schema>
   <schema path="/desktop/unity/panel/" id="com.canonical.Unity.Panel" gettext-domain="unity">
     <key type="as" name="systray-whitelist">
-      <default>[ 'JavaEmbeddedFrame', 'Wine', 'scp-dbus-service', 'Update-notifier' ]</default>
+      <default>[ 'JavaEmbeddedFrame', 'Wine', 'Update-notifier' ]</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>

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2012-02-04 05:28:23 +0000
+++ services/panel-service.c	2012-02-22 14:26:43 +0000
@@ -99,6 +99,7 @@
 static const gchar * indicator_order[][2] = {
   {"libappmenu.so", NULL},                    /* indicator-appmenu" */
   {"libapplication.so", NULL},                /* indicator-application" */
+  {"libprintersmenu.so", NULL},               /* indicator-printers */
   {"libapplication.so", "gsd-keyboard-xkb"},  /* keyboard layout selector */
   {"libmessaging.so", NULL},                  /* indicator-messages */
   {"libpower.so", NULL},                      /* indicator-power */