Commit b09d194d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Fixup some problems with text length handling in error cases.

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)
parent 7ab5f8c5
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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 ||
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment