Merge branch 'backport' into work

diff --combined openbox/actions/session.c
index 27df917,10759b2..775deab
--- 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;
  }
@@@ -60,12 -60,12 +60,12 @@@ static gboolean logout_func(ObActionsDa
          ObPrompt *p;
          ObPromptAnswer answers[] = {
              { _("Cancel"), 0 },
-             { _("Log out"), 1 }
+             { _("Log Out"), 1 }
          };
  
          o2 = g_memdup(o, sizeof(Options));
          p = prompt_new(_("Are you sure you want to log out?"),
-                        _("Log out"),
+                        _("Log Out"),
                         answers, 2, 0, 0, prompt_cb, prompt_cleanup, o2);
          prompt_show(p, NULL, FALSE);
      }

diff --combined openbox/ping.c
index 8320249,46952f7..b847929
--- 1/openbox/ping.c
--- 2/openbox/ping.c
+++ b/openbox/ping.c
@@@ -19,11 -19,11 +19,11 @@@
  
  #include "ping.h"
  #include "client.h"
 -#include "prop.h"
  #include "event.h"
  #include "debug.h"
 -#include "mainloop.h"
  #include "openbox.h"
 +#include "obt/mainloop.h"
 +#include "obt/prop.h"
  
  typedef struct _ObPingTarget
  {
@@@ -38,7 -38,7 +38,7 @@@ static guint32     ping_next_id = 1
  
  #define PING_TIMEOUT (G_USEC_PER_SEC * 3)
  /*! Warn the user after this many PING_TIMEOUT intervals */
- #define PING_TIMEOUT_WARN 1
+ #define PING_TIMEOUT_WARN 2
  
  static void     ping_send(ObPingTarget *t);
  static void     ping_end(ObClient *client, gpointer data);
@@@ -79,8 -79,8 +79,8 @@@ void ping_start(struct _ObClient *clien
      t->client = client;
      t->h = h;
  
 -    ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
 -                             t, g_direct_equal, NULL);
 +    obt_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout,
 +                              t, g_direct_equal, NULL);
      /* act like we just timed out immediately, to start the pinging process
         now instead of after the first delay.  this makes sure the client
         ends up in the ping_ids hash table now. */
@@@ -95,7 -95,7 +95,7 @@@ void ping_got_pong(guint32 id
      ObPingTarget *t;
  
      if ((t = g_hash_table_lookup(ping_ids, &id))) {
 -        /*ob_debug("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/
 +        /*ob_debug("-PONG: '%s' (id %u)", t->client->title, t->id);*/
          if (t->waiting > PING_TIMEOUT_WARN) {
              /* we had notified that they weren't responding, so now we
                 need to notify that they are again */
@@@ -107,7 -107,7 +107,7 @@@
          ping_end(t->client, NULL);
      }
      else
 -        ob_debug("Got PONG with id %u but not waiting for one\n", id);
 +        ob_debug("Got PONG with id %u but not waiting for one", id);
  }
  
  static gboolean find_client(gpointer key, gpointer value, gpointer client)
@@@ -130,10 -130,10 +130,10 @@@ static void ping_send(ObPingTarget *t
          g_hash_table_insert(ping_ids, &t->id, t);
      }
  
 -    /*ob_debug("+PING: '%s' (id %u)\n", t->client->title, t->id);*/
 -    PROP_MSG_TO(t->client->window, t->client->window, wm_protocols,
 -                prop_atoms.net_wm_ping, t->id, t->client->window, 0, 0,
 -                NoEventMask);
 +    /*ob_debug("+PING: '%s' (id %u)", t->client->title, t->id);*/
 +    OBT_PROP_MSG_TO(t->client->window, t->client->window, WM_PROTOCOLS,
 +                    OBT_PROP_ATOM(NET_WM_PING), t->id, t->client->window, 0, 0,
 +                    NoEventMask);
  }
  
  static gboolean ping_timeout(gpointer data)
@@@ -158,8 -158,7 +158,8 @@@ static void ping_end(ObClient *client, 
      if ((t = g_hash_table_find(ping_ids, find_client, client))) {
          g_hash_table_remove(ping_ids, &t->id);
  
 -        ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE);
 +        obt_main_loop_timeout_remove_data(ob_main_loop, ping_timeout,
 +                                          t, FALSE);
  
          g_free(t);
      }