summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-04-24 14:58:29 +0000
committerDana Jansens <danakj@orodu.net>2007-04-24 14:58:29 +0000
commit0771964c0f3d14992d7d798c317e5e7dde73bb43 (patch)
tree21414bef70a02f1354d11859b933f4916159b09b /openbox
parentc1a124fcf287f3fe87e623f906701b7d5b21c5f0 (diff)
set the max settings properly, was setting max_vert for both.
make sure the desktop property is set when per-app settings change it
Diffstat (limited to 'openbox')
-rw-r--r--openbox/client.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/openbox/client.c b/openbox/client.c
index f5eccbc0..0ff67ac5 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -683,7 +683,7 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
if (settings->max_vert != -1)
self->max_vert = !!settings->max_vert;
if (settings->max_horz != -1)
- self->max_vert = !!settings->max_horz;
+ self->max_horz = !!settings->max_horz;
if (settings->fullscreen != -1)
self->fullscreen = !!settings->fullscreen;
@@ -1019,10 +1019,6 @@ static void client_get_desktop(ObClient *self)
self->desktop = screen_desktop;
}
}
- if (self->desktop != d) {
- /* set the desktop hint, to make sure that it always exists */
- PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
- }
}
static void client_get_layer(ObClient *self)
@@ -2173,6 +2169,9 @@ static void client_apply_startup_state(ObClient *self, gint x, gint y)
self->area.x = x;
self->area.y = y;
+ /* set the desktop hint, to make sure that it always exists */
+ PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
+
/* these are in a carefully crafted order.. */
if (self->iconic) {