From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 2 Mar 2008 18:41:32 +0000 (+0100)
Subject: Merge branch 'backport' into work
X-Git-Tag: mikabox-3.4.7.2~70
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=9676757a08b3e2e508c47f7795326bda8e54dc53

Merge branch 'backport' into work

Conflicts:

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

9676757a08b3e2e508c47f7795326bda8e54dc53
diff --cc openbox/actions/if.c
index 63a7fbc,4c98966..833bdd3
--- a/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");
          }
      }