Merge branch 'backport' into work

Conflicts:

	obt/keyboard.c
	openbox/actions/cyclewindows.c
	openbox/actions/directionalwindows.c
	openbox/frame.c
	openbox/openbox.c

3 files changed, 2 insertions, 4 deletions

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 44d87cf6..5354f087 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -75,7 +75,7 @@ static gpointer setup_func(xmlNodePtr node)
         m = obt_parse_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
-            if (action) o->actions = g_slist_prepend(o->actions, action);
+            if (action) o->actions = g_slist_append(o->actions, action);
             m = obt_parse_find_node(m->next, "action");
         }
     }
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index d5535f6c..e1bd5520 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -118,8 +118,6 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
     guint d;
 
-
-
     switch (o->type) {
     case LAST:
         d = screen_last_desktop;
diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index c5c25c11..d3633d50 100644
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -91,7 +91,7 @@ static gpointer setup_func(xmlNodePtr node)
         m = obt_parse_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
-            if (action) o->actions = g_slist_prepend(o->actions, action);
+            if (action) o->actions = g_slist_append(o->actions, action);
             m = obt_parse_find_node(m->next, "action");
         }
     }