na: Fix thin lines appearing when an icon is removed

We were simply never removing the NaTrayChild/GtkSocket object from the
box when the icon/GtkPlug gets removed.

Conflicts:
	applets/notification_area/na-tray.c

1 files changed, 34 insertions, 0 deletions

diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c
index 2bacc7d2..4cb2a34a 100644
--- a/applets/notification_area/na-tray.c
+++ b/applets/notification_area/na-tray.c
@@ -240,6 +240,7 @@ tray_removed (NaTrayManager *manager,
     return;
 
   priv = tray->priv;
+
   g_assert (tray->priv->trays_screen == trays_screen);
 
   gtk_container_remove (GTK_CONTAINER (priv->box), icon);
@@ -875,6 +876,39 @@ idle_redraw_cb (NaTray *tray)
 }
 
 void
+na_tray_set_padding (NaTray *tray,
+                     gint    padding)
+{
+  NaTrayPrivate *priv = tray->priv;
+
+  if (get_tray (priv->trays_screen) == tray)
+    na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding);
+}
+
+void
+na_tray_set_icon_size (NaTray *tray,
+                       gint    size)
+{
+  NaTrayPrivate *priv = tray->priv;
+
+  if (get_tray (priv->trays_screen) == tray)
+    na_tray_manager_set_icon_size (priv->trays_screen->tray_manager, size);
+}
+
+void
+na_tray_set_colors (NaTray   *tray,
+                    GdkColor *fg,
+                    GdkColor *error,
+                    GdkColor *warning,
+                    GdkColor *success)
+{
+  NaTrayPrivate *priv = tray->priv;
+
+  if (get_tray (priv->trays_screen) == tray)
+    na_tray_manager_set_colors (priv->trays_screen->tray_manager, fg, error, warning, success);
+}
+
+void
 na_tray_force_redraw (NaTray *tray)
 {
   NaTrayPrivate *priv = tray->priv;