use CurrentTime again?

[chaz/openbox] / plugins / keyboard / keysrc.yacc

diff --git a/plugins/keyboard/keysrc.yacc b/plugins/keyboard/keysrc.yacc
index 3546d0978c2748d14435214e911ba1624a3dd909..3e4eeff6900a79d3a018e7e561676467fe3b55f5 100644 (file)
--- a/plugins/keyboard/keysrc.yacc
+++ b/plugins/keyboard/keysrc.yacc
@@ -39,8 +39,8 @@ config:
   ;
 
 fields:
-  FIELD { $$ = g_list_prepend(NULL, $1); }
-  | fields FIELD { $$ = g_list_prepend($1, $2); }
+  FIELD { $$ = g_list_append(NULL, $1); }
+  | fields FIELD { $$ = g_list_append($1, $2); }
   ;
 
 %%
@@ -86,8 +86,10 @@ static void addbinding(GList *keylist, char *action, char *apath, int num)
     /* these have extra data! */
     if (a->func == action_execute || a->func == action_restart)
         a->data.execute.path = apath;
+    else
+        g_free(apath);
     if (a->func == action_desktop)
-        a->data.desktop.desk = (unsigned) num + 1;
+        a->data.desktop.desk = (unsigned) num - 1;
     if (a->func == action_move_relative_horz ||
         a->func == action_move_relative_vert ||
         a->func == action_resize_relative_horz ||