Merge branch 'backport' into work

Conflicts:
	openbox/config.c

diff --git a/data/rc.xml b/data/rc.xml
index 04447f3..f223f67 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -692,7 +692,7 @@
       <y>200</y>
       <monitor>1</monitor>
       # specifies the monitor in a xinerama setup.
-      # 0 is the first head, or 'mouse' for wherever the mouse is
+      # 1 is the first head, or 'mouse' for wherever the mouse is
     </position>
 
     <focus>yes</focus>

diff --git a/openbox/config.c b/openbox/config.c
index 790b03b..e3be728 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -129,6 +129,7 @@ void config_app_settings_copy_non_defaults(const ObAppSettings *src,
     copy_if(type, (ObClientType)-1);
     copy_if(decor, -1);
     copy_if(shade, -1);
+    copy_if(monitor, -1);
     copy_if(focus, -1);
     copy_if(desktop, 0);
     copy_if(layer, -2);
@@ -264,7 +265,7 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d)
                         if (!g_ascii_strcasecmp(s, "mouse"))
                             settings->monitor = 0;
                         else
-                            settings->monitor = obt_parse_node_int(c) + 1;
+                            settings->monitor = obt_parse_node_int(c);
                         g_free(s);
                     }