diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-20 01:34:58 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-20 01:36:56 -0500 |
| commit | ea481338b5f16fd81a7b33e036ead39b918a51af (patch) | |
| tree | 93fcb3de5afdec06c6f21d344c4e9f046bf2804d /openbox/client.c | |
| parent | 8439c393d8c1dfb7db5cebd57d2e1e084e60234a (diff) | |
make the obt library branch compile again with all the changes merged in from backport
Diffstat (limited to 'openbox/client.c')
| -rw-r--r-- | openbox/client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openbox/client.c b/openbox/client.c index 281883b1..c91d6e3b 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -783,8 +783,8 @@ void client_unmanage(ObClient *self) /* these should not be left on the window ever. other window managers don't necessarily use them and it will mess them up (like compiz) */ - PROP_ERASE(self->window, net_wm_visible_name); - PROP_ERASE(self->window, net_wm_visible_icon_name); + OBT_PROP_ERASE(self->window, NET_WM_VISIBLE_NAME); + OBT_PROP_ERASE(self->window, NET_WM_VISIBLE_ICON_NAME); /* update the list hints */ client_set_list(); @@ -1528,7 +1528,7 @@ void client_update_protocols(ObClient *self) /* if this protocol is requested, then the window will be notified whenever we want it to receive focus */ self->focus_notify = TRUE; - else if (proto[i] == prop_atoms.net_wm_ping) + else if (proto[i] == OBT_PROP_ATOM(NET_WM_PING)) /* if this protocol is requested, then the window will allow pings to determine if it is still alive */ self->ping = TRUE; @@ -2282,7 +2282,7 @@ static void client_get_session_ids(ObClient *self) /* see if it has the PID set too (the PID requires that the WM_CLIENT_MACHINE be set) */ - if (PROP_GET32(self->window, net_wm_pid, cardinal, &pid)) + if (OBT_PROP_GET32(self->window, NET_WM_PID, CARDINAL, &pid)) self->pid = pid; } } @@ -3240,8 +3240,8 @@ void client_close(ObClient *self) else /* request the client to close with WM_DELETE_WINDOW */ OBT_PROP_MSG_TO(self->window, self->window, WM_PROTOCOLS, - OBT_PROP_ATOM(WM_DELETE_WINDOW), event_curtime, 0, 0, - NoEventMask); + OBT_PROP_ATOM(WM_DELETE_WINDOW), event_curtime, + 0, 0, 0, NoEventMask); } void client_kill(ObClient *self) |