diff --git a/ChangeLog b/ChangeLog
index 58c687ddca..c6bfa432c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-28  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 573287 – Warning on startup
+
+	* gtk/gtkstatusicon.c (gtk_status_icon_finalize): Disconnect
+	all tray icon signals. Noticed by Bastien Nocera
+
 2009-02-28  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 573211 – Setting screen for popup windows
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index c61d42b41c..83bdb2cc5c 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -942,6 +942,24 @@ gtk_status_icon_finalize (GObject *object)
   priv->blank_icon = NULL;
 
 #ifdef GDK_WINDOWING_X11
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_key_press, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_popup_menu, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_embedded_changed, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_orientation_changed, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_button_press, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_button_release, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_scroll, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+			                gtk_status_icon_query_tooltip, status_icon);
+  g_signal_handlers_disconnect_by_func (priv->tray_icon,
+		    	                gtk_status_icon_screen_changed, status_icon);
   gtk_widget_destroy (priv->image);
   gtk_widget_destroy (priv->tray_icon);
 #endif