summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-05-14 03:30:39 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-05-14 03:30:39 +0000
commit2fc15d31cf2fd3f416e2309adca113861205167f (patch)
tree443693d4c5d714386c0d9e2fd978c4ea7491bdf8
parent8941969cb1756be13bf391689c25c75a9e537d1f (diff)
downloadgtk+-2fc15d31cf2fd3f416e2309adca113861205167f.tar.gz
Move an assert to the right place. (#341661, Pascal Terjan)
2006-05-13 Matthias Clasen <mclasen@redhat.com> * gtk/gtktextview.c (gtk_text_view_allocate_children): Move an assert to the right place. (#341661, Pascal Terjan)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--gtk/gtktextview.c4
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2180aab0b1..f70c95b87c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-13 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktextview.c (gtk_text_view_allocate_children): Move
+ an assert to the right place. (#341661, Pascal Terjan)
+
2006-05-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c: Fix some corner cases in the size
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2180aab0b1..f70c95b87c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-13 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtktextview.c (gtk_text_view_allocate_children): Move
+ an assert to the right place. (#341661, Pascal Terjan)
+
2006-05-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c: Fix some corner cases in the size
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index ad5825994a..49b5dc2478 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2901,6 +2901,8 @@ gtk_text_view_allocate_children (GtkTextView *text_view)
{
GtkTextViewChild *child = tmp_list->data;
+ g_assert (child != NULL);
+
if (child->anchor)
{
/* We need to force-validate the regions containing
@@ -2933,8 +2935,6 @@ gtk_text_view_allocate_children (GtkTextView *text_view)
GtkAllocation allocation;
GtkRequisition child_req;
- g_assert (child != NULL);
-
allocation.x = child->x;
allocation.y = child->y;