summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-06-08 15:34:30 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-06-08 15:34:30 +0000
commit16400b3a1a896f0708c77b76473eaea2e3232e11 (patch)
treef80f97cbd23480e195d70913f6aa06c3a23a7067
parentd3ba9631d0b6f0d118d04729fd0bdf9c5a6d42cf (diff)
downloadgtk+-16400b3a1a896f0708c77b76473eaea2e3232e11.tar.gz
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);
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkviewport.c2
6 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 713b474974..aca7147d99 100644
--- 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 713b474974..aca7147d99 100644
--- 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 713b474974..aca7147d99 100644
--- 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 713b474974..aca7147d99 100644
--- 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 713b474974..aca7147d99 100644
--- 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 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)