Merge branch 'backport' into work

Conflicts:

	openbox/config.c

diff --cc data/rc.xml
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/config.c
index eaaab5368ee2d65fba0b1617425bae380b1ebc92,673af4bdbeee9c69be5d6e54474ea7fd1cadcaea..a268eb5b82e003144764f51c070fe389f363efd5
--- 1/openbox/config.c
--- 2/openbox/config.c
+++ b/openbox/config.c
@@@ -238,18 -245,20 +240,20 @@@ static void parse_per_app_settings(xmlN
                          if (!g_ascii_strcasecmp(s, "mouse"))
                              settings->monitor = 0;
                          else
 -                            settings->monitor = parse_int(doc, c) + 1;
 +                            settings->monitor = obt_parse_node_int(c) + 1;
                          g_free(s);
                      }
 -                parse_attr_bool("force", n, &settings->pos_force);
+ 
++                obt_parse_attr_bool(n, "force", &settings->pos_force);
              }
  
 -            if ((n = parse_find_node("focus", app->children)))
 -                if (!parse_contains("default", doc, n))
 -                    settings->focus = parse_bool(doc, n);
 +            if ((n = obt_parse_find_node(app->children, "focus")))
 +                if (!obt_parse_node_contains(n, "default"))
 +                    settings->focus = obt_parse_node_bool(n);
  
 -            if ((n = parse_find_node("desktop", app->children))) {
 -                if (!parse_contains("default", doc, n)) {
 -                    gchar *s = parse_string(doc, n);
 +            if ((n = obt_parse_find_node(app->children, "desktop"))) {
 +                if (!obt_parse_node_contains(n, "default")) {
 +                    gchar *s = obt_parse_node_string(n);
                      if (!g_ascii_strcasecmp(s, "all"))
                          settings->desktop = DESKTOP_ALL;
                      else {
@@@ -746,19 -765,21 +750,21 @@@ static void parse_menu(xmlNodePtr node
          if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) {
              gchar *c;
  
 -            c = parse_string(doc, node);
 +            c = obt_parse_node_string(node);
              config_menu_files = g_slist_append(config_menu_files,
 -                                               parse_expand_tilde(c));
 +                                               obt_paths_expand_tilde(c));
              g_free(c);
          }
 -        if ((n = parse_find_node("hideDelay", node)))
 -            config_menu_hide_delay = parse_int(doc, n);
 -        if ((n = parse_find_node("middle", node)))
 -            config_menu_middle = parse_bool(doc, n);
 -        if ((n = parse_find_node("submenuShowDelay", node)))
 -            config_submenu_show_delay = parse_int(doc, n);
 -        if ((n = parse_find_node("applicationIcons", node)))
 -            config_menu_client_list_icons = parse_bool(doc, n);
 -        if ((n = parse_find_node("manageDesktops", node)))
 -            config_menu_manage_desktops = parse_bool(doc, n);
 +        if ((n = obt_parse_find_node(node, "hideDelay")))
 +            config_menu_hide_delay = obt_parse_node_int(n);
 +        if ((n = obt_parse_find_node(node, "middle")))
 +            config_menu_middle = obt_parse_node_bool(n);
 +        if ((n = obt_parse_find_node(node, "submenuShowDelay")))
 +            config_submenu_show_delay = obt_parse_node_int(n);
 +        if ((n = obt_parse_find_node(node, "applicationIcons")))
 +            config_menu_client_list_icons = obt_parse_node_bool(n);
++        if ((n = obt_parse_find_node(node, "manageDesktops")))
++            config_menu_manage_desktops = obt_parse_node_bool(n);
      }
  }
  
@@@ -949,9 -971,10 +955,10 @@@ void config_startup(ObtParseInst *i
      config_menu_middle = FALSE;
      config_submenu_show_delay = 0;
      config_menu_client_list_icons = TRUE;
+     config_menu_manage_desktops = TRUE;
      config_menu_files = NULL;
  
 -    parse_register(i, "menu", parse_menu, NULL);
 +    obt_parse_register(i, "menu", parse_menu, NULL);
  
      config_per_app_settings = NULL;
  

diff --cc openbox/config.h
Simple merge

diff --cc openbox/event.c
index bce1de12e7e3d0e827f78eedbbd9995ef3397757,7e2766f0d7f9ee1dc2acfd93b06d9e681782dbb4..73797496c8ecdef60d3a793ae5d51276a67ab124
--- 1/openbox/event.c
--- 2/openbox/event.c
+++ b/openbox/event.c
@@@ -1964,10 -1961,10 +1969,10 @@@ void event_end_ignore_all_enters(gulon
         movement will be ignored until we create some further network traffic.
         Instead ignore up to NextRequest-1, then when we increment the serial,
         we will be *past* the range of ignored serials */
 -    event_ignore_enter_range(start, NextRequest(ob_display)-1);
 +    event_ignore_enter_range(start, NextRequest(obt_display)-1);
  }
  
- static gboolean is_enter_focus_event_ignored(XEvent *e)
+ static gboolean is_enter_focus_event_ignored(gulong serial)
  {
      GSList *it, *next;
  

diff --cc openbox/focus.c
Simple merge

diff --cc openbox/menuframe.c
Simple merge

diff --cc openbox/openbox.c
Simple merge

diff --cc openbox/place.c
Simple merge

diff --cc openbox/stacking.c
Simple merge

diff --cc render/theme.c
Simple merge