Merge branch 'backport' into work

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

diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index 05b841d362434b4a432baf32309c8445f0ab62f8..d3633d507356aff655be907e9414c3772e16954c 100644 (file)
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -88,10 +88,10 @@ static gpointer setup_func(xmlNodePtr node)
     if ((n = obt_parse_find_node(node, "finalactions"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->xmlChildrenNode, "action");
+        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");
         }
     }
@@ -152,7 +152,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         cycling = TRUE;
 
         stacking_restore();
-        if (o->raise) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
+        if (o->raise && ft) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
     }
 
     return o->interactive;