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

[chaz/openbox] / openbox / screen.c

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 */