From 496dac3760529669c8d4fa2e32e1797b092e7632 Mon Sep 17 00:00:00 2001
From: Jonathan Blandford <jrb@redhat.com>
Date: Tue, 21 Dec 2004 21:09:52 +0000
Subject: 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 1ffe0c0..6882d41 100644
--- 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 0fb34ec..7dad330 100644
--- 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);
 }
--
cgit v0.9.1