diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 8 | ||||
| -rw-r--r-- | modules/input/gtkimcontextxim.c | 5 |
9 files changed, 70 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Sat Jun 23 10:27:53 2001 Owen Taylor <otaylor@redhat.com> + + * modules/input/gtkimcontextxim.c: Fixup some problems with + text length handling in error cases. + + * gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder + a bit to make test actually warn on attempt to allocation + a negative size. (#56101, Matthias Clasen) + Fri Jun 22 14:06:08 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fa8adf814..094419983 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Sat Jun 23 10:27:53 2001 Owen Taylor <otaylor@redhat.com> + + * modules/input/gtkimcontextxim.c: Fixup some problems with + text length handling in error cases. + + * gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder + a bit to make test actually warn on attempt to allocation + a negative size. (#56101, Matthias Clasen) + Fri Jun 22 14:06:08 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fa8adf814..094419983 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Sat Jun 23 10:27:53 2001 Owen Taylor <otaylor@redhat.com> + + * modules/input/gtkimcontextxim.c: Fixup some problems with + text length handling in error cases. + + * gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder + a bit to make test actually warn on attempt to allocation + a negative size. (#56101, Matthias Clasen) + Fri Jun 22 14:06:08 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fa8adf814..094419983 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Sat Jun 23 10:27:53 2001 Owen Taylor <otaylor@redhat.com> + + * modules/input/gtkimcontextxim.c: Fixup some problems with + text length handling in error cases. + + * gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder + a bit to make test actually warn on attempt to allocation + a negative size. (#56101, Matthias Clasen) + Fri Jun 22 14:06:08 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fa8adf814..094419983 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Sat Jun 23 10:27:53 2001 Owen Taylor <otaylor@redhat.com> + + * modules/input/gtkimcontextxim.c: Fixup some problems with + text length handling in error cases. + + * gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder + a bit to make test actually warn on attempt to allocation + a negative size. (#56101, Matthias Clasen) + Fri Jun 22 14:06:08 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fa8adf814..094419983 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Sat Jun 23 10:27:53 2001 Owen Taylor <otaylor@redhat.com> + + * modules/input/gtkimcontextxim.c: Fixup some problems with + text length handling in error cases. + + * gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder + a bit to make test actually warn on attempt to allocation + a negative size. (#56101, Matthias Clasen) + Fri Jun 22 14:06:08 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fa8adf814..094419983 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Sat Jun 23 10:27:53 2001 Owen Taylor <otaylor@redhat.com> + + * modules/input/gtkimcontextxim.c: Fixup some problems with + text length handling in error cases. + + * gtk/gtkwidget.c (gtk_widget_size_allocate): Reorder + a bit to make test actually warn on attempt to allocation + a negative size. (#56101, Matthias Clasen) + Fri Jun 22 14:06:08 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 2ebaa48db..8dee43782 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -2275,18 +2275,16 @@ gtk_widget_size_allocate (GtkWidget *widget, real_allocation.y = aux_info->y; } - real_allocation.width = MAX (real_allocation.width, 1); - real_allocation.height = MAX (real_allocation.height, 1); - if (real_allocation.width < 0 || real_allocation.height < 0) { g_warning ("gtk_widget_size_allocate(): attempt to allocate widget with width %d and height %d", real_allocation.width, real_allocation.height); - real_allocation.width = 1; - real_allocation.height = 1; } + real_allocation.width = MAX (real_allocation.width, 1); + real_allocation.height = MAX (real_allocation.height, 1); + if (GTK_WIDGET_NO_WINDOW (widget)) { if (widget->allocation.x != real_allocation.x || diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index e1e81adec..6f4e4f4a0 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -607,7 +607,7 @@ xim_text_to_utf8 (GtkIMContextXIM *context, XIMText *xim_text, gchar **text) -1, "UTF-8", context->mb_charset, - NULL, &text_length, &error); + NULL, NULL, &error); if (result) { @@ -622,6 +622,9 @@ xim_text_to_utf8 (GtkIMContextXIM *context, XIMText *xim_text, gchar **text) { g_warning ("Error converting text from IM to UCS-4: %s", error->message); g_error_free (error); + + *text = NULL; + return 0; } *text = result; |