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

diff --cc Makefile.am
index 5e3098c63ab0e8ee0dabce767aca9340410d1d4e,b166897eef3085d43c374ff5faed97b77faf7881..bbeab2689fd977a879514f04026bec03dba0ac00
--- 1/Makefile.am
--- 2/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 95bae4453a4a23cd7647516ce19a2fddd53abbdf,2dc3a70c0816a4fa764aedc9703b9719d4ae153a..c695a42b8e4a5e6386aabf3eb553e86a2aa7e688
--- 1/openbox/actions/all.c
--- 2/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 ce57207c6b5a2fadb1cbedc9c5c4033eda6aa880,aa4e8b05b85faef59dbc5114d1f7f7c8abd6bd0a..535316255d47a4b830537830ae1454fbd1b6e989
--- 1/openbox/actions/all.h
--- 2/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/client.c
Simple merge

diff --cc openbox/config.c
index 03fc96b35bafc937f8fef9e4caf7411af1f03a7a,25e007103d4a30ea76a4f1bfcf44925cdffdf499..3558164693f5373616471684fe91de338ea7b6e0
--- 1/openbox/config.c
--- 2/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 ((n = obt_xml_find_node(node, "center")))
 -        config_place_center = obt_xml_node_bool(n);
+         if (obt_xml_node_contains(n, "Random"))
+             config_place_policy = OB_PLACE_POLICY_RANDOM;
      if ((n = obt_xml_find_node(node, "monitor"))) {
          if (obt_xml_node_contains(n, "active"))
              config_place_monitor = OB_PLACE_MONITOR_ACTIVE;

diff --cc openbox/config.h
Simple merge

diff --cc openbox/openbox.c
Simple merge

diff --cc openbox/place.h
Simple merge

diff --cc openbox/screen.c
Simple merge

diff --cc tests/icons.c
Simple merge