Merge branch 'backport' into work

[chaz/openbox] / openbox / session.c

diff --git a/openbox/session.c b/openbox/session.c
index ca45adb934e9b670e6b68b98f427e2fe6d9498d1..e4ecb6c7615c0c9057422c0bd8bb74fb1d1b2cdd 100644 (file)
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -401,7 +401,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)
 {
@@ -679,6 +678,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 +712,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 +777,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 +816,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 +825,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);
         }