fallback is still getting x errors. instead, fallback when the client iconifies,...

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 5cd39f3d2b56a970326672b6173058fb2d385a3e..73eadf8dc4bc969908a93d6b30ab2165266e414b 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1004,8 +1004,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        act->func == action_raiselower ||
                        act->func == action_shadelower ||
                        act->func == action_unshaderaise) {
-                if ((n = parse_find_node("group", node->xmlChildrenNode)))
-                    act->data.stacking.group = parse_bool(doc, n);
             }
             INTERACTIVE_LIMIT(act, uact);
         }
@@ -1166,7 +1164,8 @@ void action_focus(union ActionData *data)
            moving on us */
         event_halt_focus_delay();
 
-        client_focus(data->client.any.c);
+        if (client_validate(data->client.any.c))
+            client_focus(data->client.any.c);
     }
 }
 
@@ -1221,7 +1220,7 @@ void action_raiselower(union ActionData *data)
 void action_raise(union ActionData *data)
 {
     client_action_start(data);
-    stacking_raise(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
+    stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
     client_action_end(data);
 }
 
@@ -1244,7 +1243,7 @@ void action_shadelower(union ActionData *data)
 void action_lower(union ActionData *data)
 {
     client_action_start(data);
-    stacking_lower(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
+    stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
     client_action_end(data);
 }