From 58877f347b514088fdec1cd62f232f19ff7bb5d5 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 8 Jun 2003 15:33:16 +0000 Subject: [PATCH] Fix bug with set_adjustment (viewport, NULL); Sun Jun 8 11:27:29 2003 Owen Taylor * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with set_adjustment (viewport, NULL); --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkviewport.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a5bb0eae6f..5cb5e25cf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 8 11:27:29 2003 Owen Taylor + + * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with + set_adjustment (viewport, NULL); + Fri Jun 6 16:25:44 2003 Owen Taylor * gtk/gtkviewport.c: Many fixes, along with extensive cleanups and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a5bb0eae6f..5cb5e25cf3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Jun 8 11:27:29 2003 Owen Taylor + + * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with + set_adjustment (viewport, NULL); + Fri Jun 6 16:25:44 2003 Owen Taylor * gtk/gtkviewport.c: Many fixes, along with extensive cleanups and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a5bb0eae6f..5cb5e25cf3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Jun 8 11:27:29 2003 Owen Taylor + + * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with + set_adjustment (viewport, NULL); + Fri Jun 6 16:25:44 2003 Owen Taylor * gtk/gtkviewport.c: Many fixes, along with extensive cleanups and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a5bb0eae6f..5cb5e25cf3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Jun 8 11:27:29 2003 Owen Taylor + + * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with + set_adjustment (viewport, NULL); + Fri Jun 6 16:25:44 2003 Owen Taylor * gtk/gtkviewport.c: Many fixes, along with extensive cleanups and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a5bb0eae6f..5cb5e25cf3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Jun 8 11:27:29 2003 Owen Taylor + + * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with + set_adjustment (viewport, NULL); + Fri Jun 6 16:25:44 2003 Owen Taylor * gtk/gtkviewport.c: Many fixes, along with extensive cleanups and diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index e32b2bac60..2a63f4e114 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -441,7 +441,7 @@ viewport_set_adjustment (GtkViewport *viewport, GtkAdjustment **adjustmentp = ADJUSTMENT_POINTER (viewport, orientation); gboolean value_changed; - if (adjustment == *adjustmentp) + if (adjustment && adjustment == *adjustmentp) return; if (!adjustment)