From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 17 Apr 2013 10:49:12 +0000 (+0200)
Subject: Merge branch 'mikabox/actions' into wip/mikabox
X-Git-Tag: mikabox-3.5-7~39
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=339f770f7577345b5f482d8d0c4e0d46c3058778;p=mikachu%2Fopenbox.git

Merge branch 'mikabox/actions' into wip/mikabox

Conflicts:
	openbox/actions.c
---

339f770f7577345b5f482d8d0c4e0d46c3058778
diff --cc obt/prop.c
index f7919d6c,693d4d2b..5d0736ea
--- a/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 acb5c956,621376d2..804ac409
--- a/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 ac849a97,419f2831..7d93e129
--- a/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);