From: Dana Jansens <danakj@orodu.net>
Date: Wed, 9 May 2007 18:07:21 +0000 (+0000)
Subject: merge r6225 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~131
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=424e9cf617845b6ce360a02ba72f11edae670552;p=dana%2Fopenbox.git

merge r6225 from trunk
---

diff --git a/openbox/prop.c b/openbox/prop.c
index 704c9109..e35c93aa 100644
--- 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>