count the EnterNotify events and tell openbox to ignore them when ungrabbing the...

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 73754f0b87d9f502d25bb009c41600a1736a54d6..c86b739cb9ff1366c38bc8b27ee25fbd06b8608b 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -227,8 +227,11 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
     node = node->children;
     
-    if ((n = parse_find_node("number", node)))
-        config_desktops_num = parse_int(doc, n);
+    if ((n = parse_find_node("number", node))) {
+        guint d = parse_int(doc, n);
+        if (d > 0)
+            config_desktops_num = d;
+    }
     if ((n = parse_find_node("names", node))) {
         GSList *it;
         xmlNodePtr nname;
@@ -385,7 +388,7 @@ typedef struct
 {
     const gchar *button;
     const gchar *context;
-    ObMouseAction mact;
+    const ObMouseAction mact;
     const gchar *actname;
 } ObDefMouseBind;