From a0ae4d95fddce400e4fff159c8a55284eeba489b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 6 Jan 2006 14:05:17 +0000 Subject: [PATCH] Disconnect from the old adjustments signals. (#325869, Jorn Baayen) 2006-01-06 Matthias Clasen * gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from the old adjustments signals. (#325869, Jorn Baayen) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkviewport.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c193f0ecd0..011342cdad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-01-06 Matthias Clasen + * gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from + the old adjustments signals. (#325869, Jorn Baayen) + * NEWS: Updates 2006-01-05 Johan Dahlin diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c193f0ecd0..011342cdad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-01-06 Matthias Clasen + * gtk/gtkviewport.c (viewport_set_adjustment): Disconnect from + the old adjustments signals. (#325869, Jorn Baayen) + * NEWS: Updates 2006-01-05 Johan Dahlin diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index c87da8b200..6a79941d58 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -464,8 +464,8 @@ viewport_set_adjustment (GtkViewport *viewport, if (!adjustment) adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); - if (*adjustmentp) - g_object_unref (*adjustmentp); + + viewport_disconnect_adjustment (viewport, orientation); *adjustmentp = adjustment; g_object_ref (adjustment); gtk_object_sink (GTK_OBJECT (adjustment));