Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--shell/ev-window.c5
2 files changed, 9 insertions, 1 deletions
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);
}