more using g_slice_new() instead of g_new()

[chaz/openbox] / openbox / actions / directionalwindows.c

diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index e8410c96cc217fb954dc611bb771ee0f3b699748..f8393d2d9b035ca074b95440a32a8f0e70a63e1d 100644 (file)
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -135,7 +135,7 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
     o->dialog = TRUE;
     o->bar = TRUE;
 
@@ -225,7 +225,7 @@ static void free_func(gpointer options)
         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)
@@ -269,16 +269,16 @@ static gboolean i_input_func(guint initial_state,
     }
 
     if (e->type == KeyPress) {
+        KeySym sym = obt_keyboard_keypress_to_keysym(e);
+
         /* Escape cancels no matter what */
-        if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) {
+        if (sym == XK_Escape) {
             end_cycle(TRUE, e->xkey.state, options);
             return FALSE;
         }
 
         /* There were no modifiers and they pressed enter */
-        else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) &&
-                 !initial_state)
-        {
+        else if (sym == XK_Return && !initial_state) {
             end_cycle(FALSE, e->xkey.state, options);
             return FALSE;
         }