Merge branch 'backport' into work

Conflicts:

	openbox/actions/desktop.c
	openbox/actions/if.c

diff --cc openbox/actions/desktop.c
Simple merge

diff --cc openbox/actions/if.c
index 63a7fbcd20d10c235282ce5e6fe99888e9dec06b,4c989664b3470df060bfb0aaee038013cc4fad97..833bdd3a19764669466cd0ae7a50760f98a4c50d
--- 1/openbox/actions/if.c
--- 2/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@@ -76,24 -80,24 +76,24 @@@ static gpointer setup_func(xmlNodePtr n
              o->unfocused = TRUE;
      }
  
 -    if ((n = parse_find_node("then", node))) {
 +    if ((n = obt_parse_find_node(node, "then"))) {
          xmlNodePtr m;
  
 -        m = parse_find_node("action", n->xmlChildrenNode);
 +        m = obt_parse_find_node(n->children, "action");
          while (m) {
 -            ObActionsAct *action = actions_parse(i, doc, m);
 +            ObActionsAct *action = actions_parse(m);
-             if (action) o->thenacts = g_slist_prepend(o->thenacts, action);
+             if (action) o->thenacts = g_slist_append(o->thenacts, action);
 -            m = parse_find_node("action", m->next);
 +            m = obt_parse_find_node(m->next, "action");
          }
      }
 -    if ((n = parse_find_node("else", node))) {
 +    if ((n = obt_parse_find_node(node, "else"))) {
          xmlNodePtr m;
  
 -        m = parse_find_node("action", n->xmlChildrenNode);
 +        m = obt_parse_find_node(n->children, "action");
          while (m) {
 -            ObActionsAct *action = actions_parse(i, doc, m);
 +            ObActionsAct *action = actions_parse(m);
-             if (action) o->elseacts = g_slist_prepend(o->elseacts, action);
+             if (action) o->elseacts = g_slist_append(o->elseacts, action);
 -            m = parse_find_node("action", m->next);
 +            m = obt_parse_find_node(m->next, "action");
          }
      }