M openbox/prop.c → openbox/prop.c

@@ -170,7 +170,7 @@ CREATE(rootpmapid, "_XROOTPMAP_ID");
     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");

M openbox/prop.h → openbox/prop.h

@@ -191,7 +191,7 @@ 
     /* 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;

M openbox/screen.c → openbox/screen.c

@@ -196,7 +196,7 @@ 
     /* 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 @@ supported[i++] = prop_atoms.kde_net_wm_frame_strut;
     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 @@ XSelectInput(ob_display, RootWindow(ob_display, ob_screen),
                  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 */