merge r6225 from trunk

diff --git a/openbox/prop.c b/openbox/prop.c
index 704c9109c17d4852f7ef66a5c8dc85506328e575..e35c93aadcfbd4dd5c9c36e20595f1cb327fdd1a 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -167,8 +167,8 @@ void prop_startup()
 
     CREATE(openbox_pid, "_OPENBOX_PID");
     CREATE(openbox_config, "_OPENBOX_CONFIG");
-    CREATE(openbox_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
-    CREATE(openbox_control, "_OB_CONTROL");
+    CREATE(openbox_wm_state_undecorated, "_OPENBOX_WM_STATE_UNDECORATED");
+    CREATE(openbox_control, "_OPENBOX_CONTROL");
 }
 
 #include <X11/Xutil.h>