diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-04-12 14:47:54 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-04-12 14:47:54 +0000 |
| commit | 33c469f4535a6b92917539feae189945a777da68 (patch) | |
| tree | 702087ac5c45bbdd68bc2d15208c27e7002db690 | |
| parent | 7a1a6da8495bb56bb938bacd58a4d52bf08a2974 (diff) | |
set the desktop from per-app-settings properly, i think.
also fix a compiler warning.
| -rw-r--r-- | openbox/client.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/openbox/client.c b/openbox/client.c index 43a283cd..9c6c74bd 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -690,7 +690,7 @@ static ObAppSettings *client_get_settings_state(ObClient *self) if (settings->desktop < screen_num_desktops || settings->desktop == DESKTOP_ALL) - client_set_desktop(self, settings->desktop, TRUE); + self->desktop = settings->desktop; if (settings->layer == -1) { self->below = TRUE; @@ -2398,10 +2398,12 @@ void client_configure_full(ObClient *self, ObCorner anchor, /* find the client's position relative to the root window */ oldrx = self->root_pos.x; oldry = self->root_pos.y; - rootmoved = (oldrx != (self->frame->area.x + self->frame->size.left - - self->border_width) || - oldry != (self->frame->area.y + self->frame->size.top - - self->border_width)); + rootmoved = (oldrx != (signed)(self->frame->area.x + + self->frame->size.left - + self->border_width) || + oldry != (signed)(self->frame->area.y + + self->frame->size.top - + self->border_width)); if (force_reply || ((!user || (user && final)) && rootmoved)) { |