missed some stuff?

This commit is contained in:
Dana Jansens 2007-05-06 22:58:51 +00:00
parent 7ffa091d5b
commit 2c507a7207
2 changed files with 8 additions and 3 deletions

View file

@ -673,9 +673,13 @@ static ObAppSettings *client_get_settings_state(ObClient *self)
if (settings->fullscreen != -1) if (settings->fullscreen != -1)
self->fullscreen = !!settings->fullscreen; self->fullscreen = !!settings->fullscreen;
if (settings->desktop < screen_num_desktops if (settings->desktop) {
|| settings->desktop == DESKTOP_ALL) if (settings->desktop == DESKTOP_ALL)
self->desktop = settings->desktop; self->desktop = settings->desktop;
else if (settings->desktop > 0 &&
settings->desktop <= screen_num_desktops)
self->desktop = settings->desktop - 1;
}
if (settings->layer == -1) { if (settings->layer == -1) {
self->below = TRUE; self->below = TRUE;

View file

@ -215,6 +215,7 @@ static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
gint i = parse_int(doc, n); gint i = parse_int(doc, n);
if (i > 0) if (i > 0)
settings->desktop = i; settings->desktop = i;
}
g_free(s); g_free(s);
} else } else
settings->desktop = 0; settings->desktop = 0;