From: Mikael Magnusson <mikachu@gmail.com>
Date: Thu, 24 Apr 2014 22:22:22 +0000 (+0200)
Subject: Fix mismerge of if.c
X-Git-Tag: mikabox-3.5-7~10
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=81593851153b90845e07a62c9fe5e8bc6e36f805;p=mikachu%2Fopenbox.git

Fix mismerge of if.c
---

diff --git a/openbox/actions.c b/openbox/actions.c
index d2cb5658..b13725a6 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -37,7 +37,6 @@ static ObActionsAct* actions_build_act_from_string(const gchar *name);
 
 static ObActionsAct *interactive_act = NULL;
 static guint         interactive_initial_state = 0;
-static gboolean      stop_running = FALSE;
 
 struct _ObActionsDefinition {
     guint ref;
@@ -328,11 +327,6 @@ static void actions_setup_data(ObActionsData *data,
     data->client = client;
 }
 
-void actions_stop_running()
-{
-    stop_running = TRUE;
-}
-
 void actions_run_acts(GSList *acts,
                       ObUserAction uact,
                       guint state,
@@ -345,8 +339,6 @@ void actions_run_acts(GSList *acts,
     GSList *it;
     gboolean update_user_time;
 
-    stop_running = FALSE;
-
     /* Don't allow saving the initial state when running things from the
        menu */
     if (uact == OB_USER_ACTION_MENU_SELECTION)
@@ -384,9 +376,6 @@ void actions_run_acts(GSList *acts,
             if (!act->def->run(&data, act->options)) {
                 if (actions_act_is_interactive(act)) {
                     actions_interactive_end_act();
-                } else if (stop_running) {
-                    stop_running = FALSE;
-                    break;
                 }
                 if (client && client == focus_client &&
                     act->def->modifies_focused_window)
diff --git a/openbox/actions/if.c b/openbox/actions/if.c
index 6ee2bdd9..b20b6167 100644
--- a/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@ -103,6 +103,8 @@ void action_if_startup(void)
     actions_register("Stop", NULL, NULL, run_func_stop);
     actions_register("Continue", NULL, NULL, run_func_continue);
     actions_register("ForEach", setup_func, free_func, run_func_foreach);
+
+    actions_set_can_stop("Stop", TRUE);
     //actions_register("GroupMembers", setup_func, free_func, run_func_group);
 }
 
@@ -205,13 +207,6 @@ static void setup_query(Options* o, xmlNodePtr node, QueryTarget target) {
             g_free(s);
         }
     }
-    if ((n = obt_xml_find_node(node, "screendesktop"))) {
-        gchar *s;
-        if ((s = obt_xml_node_string(n))) {
-          q->screendesktop_number = atoi(s);
-          g_free(s);
-        }
-    }
     if ((n = obt_xml_find_node(node, "activedesktop"))) {
         q->screendesktop_number = obt_xml_node_int(n);
     }
@@ -466,7 +461,7 @@ static gboolean run_func_foreach(ObActionsData *data, gpointer options)
 
 static gboolean run_func_continue(ObActionsData *data, gpointer options)
 {
-    actions_stop_running();
+
 }
 
 /*