}
if (ob_sm_save_file != NULL) {
- ob_debug_type(OB_DEBUG_SM, "Loading from session file %s\n",
- ob_sm_save_file);
- session_load_file(ob_sm_save_file);
+ if (ob_sm_restore) {
+ ob_debug_type(OB_DEBUG_SM, "Loading from session file %s\n",
+ ob_sm_save_file);
+ session_load_file(ob_sm_save_file);
+ }
} else {
gchar *filename;
if (sm_conn) {
/* if permanent is true then we will change our session state so that
the SM won't run us again */
- session_setup_restart_style(!permanent);
+ if (permanent)
+ session_setup_restart_style(FALSE);
SmcCloseConnection(sm_conn, 0, NULL);
SmcSaveCompleteProcMask |
SmcShutdownCancelledProcMask,
&cb, oldid, &ob_sm_id,
- SM_ERR_LEN, sm_err);
+ SM_ERR_LEN-1, sm_err);
g_free(oldid);
+ ob_debug_type(OB_DEBUG_SM, "Connected to SM with id: %s\n", ob_sm_id);
if (sm_conn == NULL)
ob_debug("Failed to connect to session manager: %s\n", sm_err);
return sm_conn != NULL;
.vals = &vals
};
SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting program: %s\n", sm_argv[0]);
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
.vals = &vals
};
SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting user: %s\n", user);
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
static void session_setup_restart_style(gboolean restart)
{
- char restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning;
+ gchar restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning;
SmPropValue vals = {
.value = &restart_hint,
.vals = &vals
};
SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting restart: %d\n", restart);
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
.vals = &vals
};
SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting pid: %s\n", pid);
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
.vals = &vals
};
SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting priority: %d\n", priority);
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
.num_vals = sm_argc,
.vals = vals
};
+ SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting clone command: (%d)\n", sm_argc);
for (i = 0; i < sm_argc; ++i) {
vals[i].value = sm_argv[i];
vals[i].length = strlen(sm_argv[i]) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value);
}
- SmProp *list = ∝
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
.num_vals = sm_argc + 4,
.vals = vals
};
+ SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting restart command: (%d)\n", sm_argc+4);
for (i = 0; i < sm_argc; ++i) {
vals[i].value = sm_argv[i];
vals[i].length = strlen(sm_argv[i]) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value);
}
- vals[i].value = g_strdup("--sm-save-file");
- vals[i].length = strlen("--sm-save-file") + 1;
- vals[i+1].value = ob_sm_save_file;
- vals[i+1].length = strlen(ob_sm_save_file) + 1;
+ vals[i].value = g_strdup("--sm-client-id");
+ vals[i].length = strlen("--sm-client-id") + 1;
+ vals[i+1].value = ob_sm_id;
+ vals[i+1].length = strlen(ob_sm_id) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value);
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+1].value);
- vals[i+2].value = g_strdup("--sm-client-id");
- vals[i+2].length = strlen("--sm-client-id") + 1;
- vals[i+3].value = ob_sm_id;
- vals[i+3].length = strlen(ob_sm_id) + 1;
+ vals[i+2].value = g_strdup("--sm-save-file");
+ vals[i+2].length = strlen("--sm-save-file") + 1;
+ vals[i+3].value = ob_sm_save_file;
+ vals[i+3].length = strlen(ob_sm_save_file) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+2].value);
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+3].value);
- SmProp *list = ∝
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, savedata)) {
ob_debug_type(OB_DEBUG_SM, "Requst for phase 2 failed\n");
+ g_free(savedata);
SmcSaveYourselfDone(conn, FALSE);
}
}
{
xmlDocPtr doc;
xmlNodePtr node, n;
+ GList *it, *inext;
if (!parse_load(path, "openbox_session", &doc, &node))
return;
session_state_free(state);
}
+ /* Remove any duplicates. This means that if two windows (or more) are
+ saved with the same session state, we won't restore a session for any
+ of them because we don't know what window to put what on. AHEM FIREFOX.
+
+ This is going to be an O(2^n) kind of operation unfortunately.
+ */
+ for (it = session_saved_state; it; it = inext) {
+ GList *jt, *jnext;
+ gboolean founddup = FALSE;
+ ObSessionState *s1 = it->data;
+
+ inext = g_list_next(it);
+
+ for (jt = g_list_next(it); jt; jt = jnext) {
+ ObSessionState *s2 = jt->data;
+ gboolean match;
+
+ jnext = g_list_next(jt);
+
+ if (s1->id && s2->id)
+ match = strcmp(s1->id, s2->id) == 0;
+ else if (s1->command && s2->command)
+ match = strcmp(s1->command, s2->command) == 0;
+ else
+ match = FALSE;
+
+ if (match &&
+ !strcmp(s1->name, s2->name) &&
+ !strcmp(s1->class, s2->class) &&
+ !strcmp(s1->role, s2->role))
+ {
+ session_state_free(s2);
+ session_saved_state =
+ g_list_delete_link(session_saved_state, jt);
+ founddup = TRUE;
+ }
+ }
+
+ if (founddup) {
+ session_state_free(s1);
+ session_saved_state = g_list_delete_link(session_saved_state, it);
+ }
+ }
+
xmlFreeDoc(doc);
}