diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-06-23 14:32:44 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-23 14:32:44 +0000 |
| commit | b09d194d3c527d12e8ebcb9d2bcad57a5848ca16 (patch) | |
| tree | e29f153a251b9c4fa058c632ad43a24253b202bb /modules | |
| parent | 7ab5f8c5a7eb26ea3dfa77875eb97deef7e6d704 (diff) | |
| download | gdk-pixbuf-b09d194d3c527d12e8ebcb9d2bcad57a5848ca16.tar.gz | |
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)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/gtkimcontextxim.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |