Merge branch 'mikabox/actions' into wip/mikabox

Conflicts:
	openbox/actions.c

diff --cc Makefile.am
Simple merge

diff --cc obt/prop.c
index f7919d6c380a64d919d2d909a5f6cede435f5490,693d4d2b544db13c8ca453deeb983259a176b8b3..5d0736ea378a80131a179ef5d2abfb0466da1c25
--- 1/obt/prop.c
--- 2/obt/prop.c
+++ b/obt/prop.c
@@@ -197,9 -195,8 +197,10 @@@ void obt_prop_startup(void
      CREATE_(OB_APP_TITLE);
      CREATE_(OB_APP_NAME);
      CREATE_(OB_APP_CLASS);
 +    CREATE_(OB_APP_GROUP_NAME);
 +    CREATE_(OB_APP_GROUP_CLASS);
      CREATE_(OB_APP_TYPE);
+     CREATE_(OB_TARGET_WINDOW);
  }
  
  Atom obt_prop_atom(ObtPropAtom a)

diff --cc obt/prop.h
index acb5c956ede42d3c1ca2182de40218e5d071df1c,621376d22468a471a04dabd7cc0fd2fbe6af9c97..804ac4091f43b6370b69b37c5fa35f5722781f7f
--- 1/obt/prop.h
--- 2/obt/prop.h
+++ b/obt/prop.h
@@@ -219,9 -216,8 +219,10 @@@ typedef enum 
      OBT_PROP_OB_APP_TITLE,
      OBT_PROP_OB_APP_NAME,
      OBT_PROP_OB_APP_CLASS,
 +    OBT_PROP_OB_APP_GROUP_NAME,
 +    OBT_PROP_OB_APP_GROUP_CLASS,
      OBT_PROP_OB_APP_TYPE,
+     OBT_PROP_OB_TARGET_WINDOW,
  
      OBT_PROP_NUM_ATOMS
  } ObtPropAtom;

diff --cc openbox/actions.c
index ac849a9741b794070537ef1094e35787985628cd,419f283153b4ff79d3ed220319d96a5f87457fd4..7d93e1295f08bb80e9f3f35d04d7ae9933a3278f
--- 1/openbox/actions.c
--- 2/openbox/actions.c
+++ b/openbox/actions.c
@@@ -319,8 -306,9 +325,10 @@@ void actions_run_acts(GSList *acts
                        struct _ObClient *client)
  {
      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)
@@@ -356,13 -343,12 +364,17 @@@
          /* fire the action's run function with this data */
          if (ok) {
              if (!act->def->run(&data, act->options)) {
--                if (actions_act_is_interactive(act))
++                if (actions_act_is_interactive(act)) {
                      actions_interactive_end_act();
 -                else if (stop_running) {
++                } else if (stop_running) {
+                     stop_running = FALSE;
+                     break;
+                 }
 +                if (client && client == focus_client &&
 +                    act->def->modifies_focused_window)
 +                {
 +                    update_user_time = TRUE;
 +                }
              } else {
                  /* make sure its interactive if it returned TRUE */
                  g_assert(act->i_input);

diff --cc openbox/actions/if.c
Simple merge