From be334f90f603df90bee15d43f5f67a052fa07ff2 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Wed, 6 Apr 2011 11:11:54 +0200
Subject: 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
---
 applets/notification_area/na-tray.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'applets')

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);
@@ -874,6 +875,39 @@ idle_redraw_cb (NaTray *tray)
   return FALSE;
 }
 
+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)
 {
-- 
cgit v1.2.1