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

Merge branch 'mikabox/crap' into wip/mikabox

Conflicts:
	openbox/actions/all.c
	openbox/actions/all.h
	openbox/client.c
	openbox/config.c
	openbox/place.c
	openbox/stacking.c
---

7cd370e5be6dab01b32a5af6b779dcf7a836c250
diff --cc Makefile.am
index 5e3098c6,b166897e..bbeab268
--- a/Makefile.am
+++ b/Makefile.am
@@@ -214,8 -203,8 +214,9 @@@ openbox_openbox_SOURCES = 
  	openbox/actions/if.c \
  	openbox/actions/kill.c \
  	openbox/actions/layer.c \
 +	openbox/actions/lock.c \
  	openbox/actions/lower.c \
+ 	openbox/actions/lowerraiseone.c \
  	openbox/actions/maximize.c \
  	openbox/actions/move.c \
  	openbox/actions/moverelative.c \
diff --cc openbox/actions/all.c
index 95bae445,2dc3a70c..c695a42b
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@@ -41,8 -39,7 +41,9 @@@ void action_all_startup(void
      action_growtoedge_startup();
      action_if_startup();
      action_focustobottom_startup();
 +    action_sendkeyevent_startup();
 +    action_lock_startup();
+     action_lowerraiseone_startup();
      /* 3.4-compatibility */
      action_shadelowerraise_startup();
  }
diff --cc openbox/actions/all.h
index ce57207c,aa4e8b05..53531625
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@@ -42,8 -40,7 +42,9 @@@ void action_movetoedge_startup(void)
  void action_growtoedge_startup(void);
  void action_if_startup(void);
  void action_focustobottom_startup(void);
 +void action_sendkeyevent_startup(void);
 +void action_lock_startup(void);
+ void action_lowerraiseone_startup(void);
  /* 3.4-compatibility */
  void action_shadelowerraise_startup(void);
  
diff --cc openbox/config.c
index 03fc96b3,25e00710..35581646
--- a/openbox/config.c
+++ b/openbox/config.c
@@@ -630,6 -575,10 +631,8 @@@ static void parse_placement(xmlNodePtr 
      if ((n = obt_xml_find_node(node, "policy")))
          if (obt_xml_node_contains(n, "UnderMouse"))
              config_place_policy = OB_PLACE_POLICY_MOUSE;
+         if (obt_xml_node_contains(n, "Random"))
+             config_place_policy = OB_PLACE_POLICY_RANDOM;
 -    if ((n = obt_xml_find_node(node, "center")))
 -        config_place_center = obt_xml_node_bool(n);
      if ((n = obt_xml_find_node(node, "monitor"))) {
          if (obt_xml_node_contains(n, "active"))
              config_place_monitor = OB_PLACE_MONITOR_ACTIVE;