Merge branch 'backport' into work

diff --combined openbox/actions/session.c
index e9cc40dbbd4e780acae71c21cf1f524f81528016,04ba96cbd81dc5edfe9bb1667c1fc3436b8fc1ff..58652adb46021c9d314bf4b20730133891311ace
--- 1/openbox/actions/session.c
--- 2/openbox/actions/session.c
+++ b/openbox/actions/session.c
@@@ -8,7 -8,7 +8,7 @@@ typedef struct 
      gboolean silent;
  } Options;
  
 -static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 +static gpointer setup_func(xmlNodePtr node);
  static gboolean logout_func(ObActionsData *data, gpointer options);
  
  void action_session_startup(void)
@@@ -17,7 -17,7 +17,7 @@@
                       NULL, NULL);
  }
  
 -static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 +static gpointer setup_func(xmlNodePtr node)
  {
      xmlNodePtr n;
      Options *o;
@@@ -25,8 -25,8 +25,8 @@@
      o = g_new0(Options, 1);
      o->prompt = TRUE;
  
 -    if ((n = parse_find_node("prompt", node)))
 -        o->prompt = parse_bool(doc, n);
 +    if ((n = obt_parse_find_node(node, "prompt")))
 +        o->prompt = obt_parse_node_bool(n);
  
      return o;
  }
@@@ -72,7 -72,7 +72,7 @@@ static gboolean logout_func(ObActionsDa
          prompt_show(p, NULL, FALSE);
      }
      else
-         prompt_cb(NULL, 1, NULL);
+         prompt_cb(NULL, 1, o);
  
      return FALSE;
  }