From: Mikael Magnusson <mikachu@gmail.com>
Date: Fri, 20 Feb 2009 16:44:16 +0000 (+0100)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=6d0c4d7fadd2d67760ef62e11385fd261ba6a3c4;p=chaz%2Fopenbox

Merge branch 'backport' into work

Conflicts:
	openbox/config.c
---

6d0c4d7fadd2d67760ef62e11385fd261ba6a3c4
diff --cc openbox/config.c
index 790b03ba,96fdd0f4..e3be728e
--- a/openbox/config.c
+++ b/openbox/config.c
@@@ -264,7 -268,7 +265,7 @@@ static void parse_per_app_settings(xmlN
                          if (!g_ascii_strcasecmp(s, "mouse"))
                              settings->monitor = 0;
                          else
-                             settings->monitor = obt_parse_node_int(c) + 1;
 -                            settings->monitor = parse_int(doc, c);
++                            settings->monitor = obt_parse_node_int(c);
                          g_free(s);
                      }