Merge lp:~unity-team/unity/fix-empty-systray into lp:unity

[Neil J. Patel]

Bug attached, we shouldn't show the tray if there are no icons.

[Didier Roche-Tolomelli (didrocks)]

Approved

review: Approve

=== modified file 'src/PanelTray.cpp'
--- src/PanelTray.cpp	2011-04-13 10:33:02 +0000
+++ src/PanelTray.cpp	2011-04-19 13:57:30 +0000
@@ -57,8 +57,6 @@
 
     gtk_container_add (GTK_CONTAINER (_window), GTK_WIDGET (_tray));
     gtk_widget_show (GTK_WIDGET (_tray));
-
-    gtk_widget_show_all (_window);
   }
 }
 
@@ -109,6 +107,11 @@
     SetMinMaxSize ((_n_children * 24) + (PADDING * 2), 24);
     QueueRelayout ();
     QueueDraw ();
+
+    if (_n_children)
+      gtk_widget_show (_window);
+    else
+      gtk_widget_hide (_window);
   }
 }