dispose can be called multiple times.

Tue Dec 21 16:08:17 2004  Jonathan Blandford  <jrb@redhat.com>

        * shell/ev-window.c (ev_window_dispose): dispose can be called
        multiple times.

diff --git a/ChangeLog b/ChangeLog
index 1ffe0c05bff48da1585f3f47723a6ec48714fe30..6882d41333a923bacf51d41f53fc56edaa1d20dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 21 16:08:17 2004  Jonathan Blandford  <jrb@redhat.com>
+
+       * shell/ev-window.c (ev_window_dispose): dispose can be called
+       multiple times.
+
 2004-12-21  Havoc Pennington  <hp@redhat.com>
 
        * shell/ev-window.c (ev_window_init): set title to Document Viewer

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 0fb34ec4fa1b424bade168218d70b38ff1544dfe..7dad33013e14f65df8643ffae2aeb9c03f0aa6fd 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -484,7 +484,10 @@ ev_window_dispose (GObject *object)
 
        priv = EV_WINDOW (object)->priv;
 
-       g_object_unref (priv->ui_manager);
+       if (priv->ui_manager) {
+               g_object_unref (priv->ui_manager);
+               priv->ui_manager = NULL;
+       }
 
        G_OBJECT_CLASS (parent_class)->dispose (object);
 }