AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rearrange the code a bit.

Browse Source 
2006-04-12  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkkeys-x11.c (gdk_keymap_get_entries_for_keycode):
	Rearrange the code a bit.
This commit is contained in:
Matthias Clasen 2006-04-12 17:57:30 +00:00 committed by Matthias Clasen
parent 374c855496
commit 6d66ce2fc3
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-04-12 Matthias Clasen <mclasen@redhat.com> 2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkkeys-x11.c (gdk_keymap_get_entries_for_keycode):
Rearrange the code a bit.
* gtk/gtktextlayout.c (gtk_text_layout_validate_yrange): * gtk/gtktextlayout.c (gtk_text_layout_validate_yrange):
Handle _gtk_text_line_get_data() returning NULL in all Handle _gtk_text_line_get_data() returning NULL in all
cases. (Coverity) cases. (Coverity)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-04-12 Matthias Clasen <mclasen@redhat.com> 2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkkeys-x11.c (gdk_keymap_get_entries_for_keycode):
Rearrange the code a bit.
* gtk/gtktextlayout.c (gtk_text_layout_validate_yrange): * gtk/gtktextlayout.c (gtk_text_layout_validate_yrange):
Handle _gtk_text_line_get_data() returning NULL in all Handle _gtk_text_line_get_data() returning NULL in all
cases. (Coverity) cases. (Coverity)

38
gdk/x11/gdkkeys-x11.c
View File

@ -1015,36 +1015,20 @@ gdk_keymap_get_entries_for_keycode (GdkKeymap *keymap,
++i; ++i;
} }
} }
*n_entries = 0;
if (keys)
{
*n_entries = key_array->len;
*keys = (GdkKeymapKey*) g_array_free (key_array, FALSE);
}
if ((key_array && key_array->len > 0) || if (keyvals)
(keyval_array && keyval_array->len > 0))
{ {
if (keys) *n_entries = keyval_array->len;
*keys = (GdkKeymapKey*) key_array->data; *keyvals = (guint*) g_array_free (keyval_array, FALSE);
if (keyvals)
*keyvals = (guint*) keyval_array->data;
if (key_array)
*n_entries = key_array->len;
else
*n_entries = keyval_array->len;
} }
else
{
if (keys)
*keys = NULL;
if (keyvals)
*keyvals = NULL;
*n_entries = 0;
}
if (key_array)
g_array_free (key_array, key_array->len > 0 ? FALSE : TRUE);
if (keyval_array)
g_array_free (keyval_array, keyval_array->len > 0 ? FALSE : TRUE);
return *n_entries > 0; return *n_entries > 0;
} }