From: Dana Jansens <danakj@orodu.net>
Date: Sat, 7 Nov 2009 02:02:23 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Tag: mikabox-3.5-7~412
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=a170ad7c85b5f23fafe64d28a3f183a7ce42ce53;hp=-c

Merge branch 'backport' into work
---

a170ad7c85b5f23fafe64d28a3f183a7ce42ce53
diff --combined openbox/actions/session.c
index e9cc40d,04ba96c..58652ad
--- a/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;
  }