From eb27c618788009353ac280e284a13e403c91d089 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 18 Dec 2011 13:07:07 +0100
Subject: [PATCH] accessible: Use set_widget() in destroy notify

We don't want to bypass the unset_widget call.
---
 gtk/gtkaccessible.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index e999b092d7..a84eddf033 100644
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -216,6 +216,13 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
     class->connect_widget_destroyed (accessible);
 }
 
+static void
+gtk_accessible_widget_destroyed (GtkWidget     *widget,
+                                 GtkAccessible *accessible)
+{
+  gtk_accessible_set_widget (accessible, NULL);
+}
+
 static void
 gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 {
@@ -223,5 +230,5 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 
   if (priv->widget)
     g_signal_connect (priv->widget, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &priv->widget);
+                      G_CALLBACK (gtk_accessible_widget_destroyed), accessible);
 }