Merge branch 'backport' into work

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

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index b013b66be126a36ace5d4aef4b1dd957ef867ada..5354f087c55254f5fdd5fd700a63e88a93ac6cc7 100644 (file)
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -48,15 +48,15 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
     o->bar = TRUE;
-    o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_ICONS;
+    o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_LIST;
 
     if ((n = obt_parse_find_node(node, "linear")))
         o->linear = obt_parse_node_bool(n);
     if ((n = obt_parse_find_node(node, "dialog"))) {
         if (obt_parse_node_contains(n, "none"))
             o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_NONE;
-        else if (obt_parse_node_contains(n, "list"))
-            o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_LIST;
+        else if (obt_parse_node_contains(n, "icons"))
+            o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_ICONS;
     }
     if ((n = obt_parse_find_node(node, "bar")))
         o->bar = obt_parse_node_bool(n);
@@ -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");
         }
     }