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):
Handle _gtk_text_line_get_data() returning NULL in all
cases. (Coverity)
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):
Handle _gtk_text_line_get_data() returning NULL in all
cases. (Coverity)
++i;
}
}
-
- if ((key_array && key_array->len > 0) ||
- (keyval_array && keyval_array->len > 0))
- {
- if (keys)
- *keys = (GdkKeymapKey*) key_array->data;
- if (keyvals)
- *keyvals = (guint*) keyval_array->data;
+ *n_entries = 0;
- if (key_array)
- *n_entries = key_array->len;
- else
- *n_entries = keyval_array->len;
+ if (keys)
+ {
+ *n_entries = key_array->len;
+ *keys = (GdkKeymapKey*) g_array_free (key_array, FALSE);
}
- else
+
+ if (keyvals)
{
- if (keys)
- *keys = NULL;
-
- if (keyvals)
- *keyvals = NULL;
-
- *n_entries = 0;
+ *n_entries = keyval_array->len;
+ *keyvals = (guint*) g_array_free (keyval_array, FALSE);
}
- 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;
}