Fix bug with set_adjustment (viewport, NULL);

Sun Jun  8 11:27:29 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with
        set_adjustment (viewport, NULL);

diff --git a/ChangeLog b/ChangeLog
index 713b4749745737467a02c065f1af6e750b09d006..aca7147d9954e1a9b377a81396334075fb0de2ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  8 11:27:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with 
+       set_adjustment (viewport, NULL);
+
 2003-06-07  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (get_default_icons): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 713b4749745737467a02c065f1af6e750b09d006..aca7147d9954e1a9b377a81396334075fb0de2ea 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Jun  8 11:27:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with 
+       set_adjustment (viewport, NULL);
+
 2003-06-07  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (get_default_icons): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 713b4749745737467a02c065f1af6e750b09d006..aca7147d9954e1a9b377a81396334075fb0de2ea 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Jun  8 11:27:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with 
+       set_adjustment (viewport, NULL);
+
 2003-06-07  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (get_default_icons): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 713b4749745737467a02c065f1af6e750b09d006..aca7147d9954e1a9b377a81396334075fb0de2ea 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Jun  8 11:27:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with 
+       set_adjustment (viewport, NULL);
+
 2003-06-07  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (get_default_icons): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 713b4749745737467a02c065f1af6e750b09d006..aca7147d9954e1a9b377a81396334075fb0de2ea 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Jun  8 11:27:29 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (viewport_set_adjustment): Fix bug with 
+       set_adjustment (viewport, NULL);
+
 2003-06-07  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkiconfactory.c (get_default_icons): 

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index e32b2bac603d876234749b0cd0161f68f75402da..2a63f4e1146fa3a8ad9169031d1a79cf1868ac65 100644 (file)
--- 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)