but rename ob_pid back to openbox_pid for backwards compatibility. this will go away...

diff --git a/openbox/prop.c b/openbox/prop.c
index 4cf832ffcd4f9769729d8f58fde190f3f754e0de..36e520171d061a1558482317e34587fa312e4e79 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -170,7 +170,7 @@ void prop_startup()
     CREATE(esetrootid, "ESETROOT_PMAP_ID");
 */
 
-    CREATE(ob_pid, "_OB_PID");
+    CREATE(openbox_pid, "_OPENBOX_PID");
     CREATE(ob_config, "_OB_CONFIG");
     CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
     CREATE(ob_control, "_OB_CONTROL");

diff --git a/openbox/prop.h b/openbox/prop.h
index a1d9f52ee843f0407cdf8e06c52562c6d7a68477..35eb1979211c3a1bde3e84764408edf4df03d17a 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -191,7 +191,7 @@ typedef struct Atoms {
     /* Openbox specific atoms */
      
     Atom ob_wm_state_undecorated;
-    Atom ob_pid; /* this is depreecated in favour of ob_control */
+    Atom openbox_pid; /* this is depreecated in favour of ob_control */
     Atom ob_config;
     Atom ob_control;
 } Atoms;

diff --git a/openbox/screen.c b/openbox/screen.c
index 684dd5bb16e44b4ecc59e11d32b91e7ea8474d3b..d71c9eaafd5c039a9d3932f6399ec3d2ed2611fe 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -196,7 +196,7 @@ gboolean screen_annex(const gchar *program_name)
     /* set the OPENBOX_PID hint */
     pid = getpid();
     PROP_SET32(RootWindow(ob_display, ob_screen),
-               ob_pid, cardinal, pid);
+               openbox_pid, cardinal, pid);
 
     /* set supporting window */
     PROP_SET32(RootWindow(ob_display, ob_screen),
@@ -290,7 +290,7 @@ gboolean screen_annex(const gchar *program_name)
     supported[i++] = prop_atoms.kde_net_wm_window_type_override;
 
     supported[i++] = prop_atoms.ob_wm_state_undecorated;
-    supported[i++] = prop_atoms.ob_pid;
+    supported[i++] = prop_atoms.openbox_pid;
     supported[i++] = prop_atoms.ob_config;
     supported[i++] = prop_atoms.ob_control;
     g_assert(i == num_support);
@@ -373,7 +373,7 @@ void screen_shutdown(gboolean reconfig)
                  NoEventMask);
 
     /* we're not running here no more! */
-    PROP_ERASE(RootWindow(ob_display, ob_screen), ob_pid);
+    PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid);
     /* not without us */
     PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported);
     /* don't keep this mode */