callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup some problems with text length handling in error cases.

Browse Source 
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)
This commit is contained in:
Owen Taylor
2001-06-23 14:32:44 +00:00
committed by Owen Taylor
parent 7ab5f8c5a7
commit b09d194d3c
9 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/input/gtkimcontextxim.c
View File

@ -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;