commit d9d580e0382 broke kdesktop again, so we have to fix it at an even finer level...

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index 9ff20a41b1a80ea7898a8746673e12d2bbcf00c4..11581af6b199d94900b082cf739de86b9a964253 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -23,6 +23,7 @@
 #include "event.h"
 #include "config.h"
 #include "client.h"
+#include "openbox.h"
 #include "debug.h"
 
 #include "actions/all.h"
@@ -172,7 +173,7 @@ ObActionsAct* actions_parse(xmlNodePtr node)
         if ((act = actions_build_act_from_string(name)))
             /* there is more stuff to parse here */
             if (act->def->setup)
-                act->options = act->def->setup(node->xmlChildrenNode);
+                act->options = act->def->setup(node->children);
 
         g_free(name);
     }
@@ -337,9 +338,7 @@ void actions_client_move(ObActionsData *data, gboolean start)
     else if (config_focus_follow &&
              data->context != OB_FRAME_CONTEXT_CLIENT)
     {
-        if (!data->button && data->client && !config_focus_under_mouse)
-            event_end_ignore_all_enters(ignore_start);
-        else {
+        if (data->uact == OB_USER_ACTION_MOUSE_PRESS) {
             struct _ObClient *c;
 
             /* usually this is sorta redundant, but with a press action
@@ -354,5 +353,7 @@ void actions_client_move(ObActionsData *data, gboolean start)
                 event_enter_client(c);
             }
         }
+        else if (!data->button && !config_focus_under_mouse)
+            event_end_ignore_all_enters(ignore_start);
     }
 }