X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=758e9887bb2ad3f2d8f5378ab3f0cda47dd57c96;hb=a93b00a5e93281c7c2c31112f0b6b827d605a19d;hp=ca45adb934e9b670e6b68b98f427e2fe6d9498d1;hpb=d78ae0546dae17eda6084a1bd33e63637ba802e5;p=chaz%2Fopenbox
diff --git a/openbox/session.c b/openbox/session.c
index ca45adb9..758e9887 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -34,6 +34,7 @@ void session_startup(gint argc, gchar **argv) {}
void session_shutdown(gboolean permanent) {}
GList* session_state_find(struct _ObClient *c) { return NULL; }
void session_request_logout(gboolean silent) {}
+gboolean session_connected(void) { return FALSE; }
#else
#include "debug.h"
@@ -159,6 +160,11 @@ void session_shutdown(gboolean permanent)
}
}
+gboolean session_connected(void)
+{
+ return !!sm_conn;
+}
+
/*! Connect to the session manager and set up our callback functions */
static gboolean session_connect(void)
{
@@ -401,7 +407,6 @@ static void sm_save_yourself_2(SmcConn conn, SmPointer data)
SmcSaveYourselfDone(conn, success);
}
-
static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
Bool shutdown, gint interact_style, Bool fast)
{
@@ -414,7 +419,7 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
(save_type == SmSaveLocal ? "SmSaveLocal" :
(save_type == SmSaveGlobal ? "SmSaveGlobal" :
(save_type == SmSaveBoth ? "SmSaveBoth" : "INVALID!!")));
- ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s\n", sname);
+ ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s", sname);
}
#endif
@@ -491,10 +496,14 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
if (screen_desktop_names) {
gint i;
+ gchar *t;
fprintf(f, "\n");
- for (i = 0; screen_desktop_names[i]; ++i)
- fprintf(f, " %s\n", screen_desktop_names[i]);
+ for (i = 0; screen_desktop_names[i]; ++i){
+ t = g_markup_escape_text(screen_desktop_names[i], -1);
+ fprintf(f, " %s\n", t);
+ g_free(t);
+ }
fprintf(f, "\n");
}
@@ -549,8 +558,11 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
if (c->sm_client_id)
fprintf(f, "\n", c->sm_client_id);
- else
- fprintf(f, "\n", c->wm_command);
+ else {
+ t = g_markup_escape_text(c->wm_command, -1);
+ fprintf(f, "\n", t);
+ g_free(t);
+ }
t = g_markup_escape_text(c->name, -1);
fprintf(f, "\t%s\n", t);
@@ -679,6 +691,7 @@ static void session_load_file(const gchar *path)
i = obt_parse_instance_new();
if (!obt_parse_load_file(i, path, "openbox_session")) {
+ ob_debug_type(OB_DEBUG_SM, "ERROR: session file is missing root node");
obt_parse_instance_unref(i);
return;
}
@@ -712,6 +725,7 @@ static void session_load_file(const gchar *path)
}
}
+ ob_debug_type(OB_DEBUG_SM, "loading windows");
for (node = obt_parse_find_node(node->children, "window"); node != NULL;
node = obt_parse_find_node(node->next, "window"))
{
@@ -776,9 +790,11 @@ static void session_load_file(const gchar *path)
/* save this. they are in the file in stacking order, so preserve
that order here */
session_saved_state = g_list_append(session_saved_state, state);
+ ob_debug_type(OB_DEBUG_SM, "loaded %s", state->name);
continue;
session_load_bail:
+ ob_debug_type(OB_DEBUG_SM, "loading FAILED");
session_state_free(state);
}
@@ -813,6 +829,7 @@ static void session_load_file(const gchar *path)
!strcmp(s1->class, s2->class) &&
!strcmp(s1->role, s2->role))
{
+ ob_debug_type(OB_DEBUG_SM, "removing duplicate %s", s2->name);
session_state_free(s2);
session_saved_state =
g_list_delete_link(session_saved_state, jt);
@@ -821,6 +838,7 @@ static void session_load_file(const gchar *path)
}
if (founddup) {
+ ob_debug_type(OB_DEBUG_SM, "removing duplicate %s", s1->name);
session_state_free(s1);
session_saved_state = g_list_delete_link(session_saved_state, it);
}