summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-13 22:33:04 +0000
committerDana Jansens <danakj@orodu.net>2007-05-13 22:33:04 +0000
commit0ef82a1bda21d37f931a2fb0062c6274e360108a (patch)
treed3710fdefbab4d9fb8c139fef8664558dfc4be81 /openbox
parent99e23015cf2b7780f4a684669008ae38abe62932 (diff)
but rename ob_pid back to openbox_pid for backwards compatibility. this will go away entirely soon.
Diffstat (limited to 'openbox')
-rw-r--r--openbox/prop.c2
-rw-r--r--openbox/prop.h2
-rw-r--r--openbox/screen.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/openbox/prop.c b/openbox/prop.c
index 4cf832ff..36e52017 100644
--- 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 a1d9f52e..35eb1979 100644
--- 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 684dd5bb..d71c9eaa 100644
--- 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 */