nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the new sm_client_id function so all windows who should save state do. session save/load seems to be working with gnome-session rather well.

Browse source
This commit is contained in:
Dana Jansens 2003-07-31 08:05:38 +00:00
parent 02c15aca65
commit d9cc4f6522
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
openbox/session.c
View file

@ -289,7 +289,7 @@ static gboolean session_save()
if (!client_normal(c)) if (!client_normal(c))
continue; continue;
if (!PROP_GETS(c->window, sm_client_id, locale, &client_id)) if (!(client_id = client_get_sm_client_id(c)))
continue; continue;
prex = c->area.x; prex = c->area.x;
@ -374,11 +374,11 @@ void session_state_free(ObSessionState *state)
} }
} }
static gboolean session_state_cmp(const ObSessionState *s, const ObClient *c) static gboolean session_state_cmp(ObSessionState *s, ObClient *c)
{ {
gchar *client_id; gchar *client_id;
if (!PROP_GETS(c->window, sm_client_id, locale, &client_id)) if (!(client_id = client_get_sm_client_id(c)))
return FALSE; return FALSE;
g_print("\nsaved %s\nnow %s\n", s->id, client_id); g_print("\nsaved %s\nnow %s\n", s->id, client_id);
if (strcmp(s->id, client_id)) { if (strcmp(s->id, client_id)) {
@ -386,13 +386,13 @@ static gboolean session_state_cmp(const ObSessionState *s, const ObClient *c)
return FALSE; return FALSE;
} }
g_free(client_id); g_free(client_id);
g_print("\nsaved %s\nnow %s\n", s->name, c->name); g_print("saved %s\nnow %s\n", s->name, c->name);
if (strcmp(s->name, c->name)) if (strcmp(s->name, c->name))
return FALSE; return FALSE;
g_print("\nsaved %s\nnow %s\n", s->class, c->class); g_print("saved %s\nnow %s\n", s->class, c->class);
if (strcmp(s->class, c->class)) if (strcmp(s->class, c->class))
return FALSE; return FALSE;
g_print("\nsaved %s\nnow %s\n", s->role, c->role); g_print("saved %s\nnow %s\n\n", s->role, c->role);
if (strcmp(s->role, c->role)) if (strcmp(s->role, c->role))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -417,6 +417,8 @@ void session_load(char *path)
xmlNodePtr node, n; xmlNodePtr node, n;
gchar *sm_id; gchar *sm_id;
g_message("loading session from %s", path);
if (!parse_load(path, "openbox_session", &doc, &node)) if (!parse_load(path, "openbox_session", &doc, &node))
return; return;