xmlNodePtr n;
Options *o;
- o = g_new0(Options, 1);
+ o = g_slice_new0(Options);
o->dialog = TRUE;
o->bar = TRUE;
o->actions = g_slist_delete_link(o->actions, o->actions);
}
- g_free(o);
+ g_slice_free(Options, o);
}
static gboolean run_func(ObActionsData *data, gpointer options)
if (e->type == KeyRelease) {
/* remove from the state the mask of the modifier key being
released, if it is a modifier key being released that is */
- mods &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode);
+ mods &= ~obt_keyboard_keyevent_to_modmask(e);
}
if (e->type == KeyPress) {
}
/* There were no modifiers and they pressed enter */
- else if (sym == XK_Return && !initial_state) {
+ else if ((sym == XK_Return || sym == XK_KP_Enter) && !initial_state) {
end_cycle(FALSE, e->xkey.state, options);
return FALSE;
}