From d5683c5125a69ff54cc27b737de861a63bcfa0a2 Mon Sep 17 00:00:00 2001
From: Paulo Zanoni <pzanoni@mandriva.com>
Date: Tue, 1 Mar 2011 10:38:01 -0300
Subject: [PATCH 907/908] Add "-nr" argument for backwards compatibility

We used to have patch implementing this argument. The patch was integrated
upstream but as "-background none" instead of "-nr". Let's keep the "-nr"
option while we still have "-nr" users.
---
 os/utils.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/os/utils.c b/os/utils.c
index 18fd911..b703828 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -513,6 +513,7 @@ void UseMsg(void)
     ErrorF("-nolisten string       don't listen on protocol\n");
     ErrorF("-noreset               don't reset after last client exists\n");
     ErrorF("-background [none]     create root window with no background\n");
+    ErrorF("-nr                    same as '-background none'\n");
     ErrorF("-reset                 reset after last client exists\n");
     ErrorF("-p #                   screen-saver pattern duration (minutes)\n");
     ErrorF("-pn                    accept failure to listen on all ports\n");
@@ -783,6 +784,10 @@ ProcessCommandLine(int argc, char *argv[])
 	{
 	    dispatchExceptionAtReset = DE_RESET;
 	}
+	else if ( strcmp( argv[i], "-nr") == 0)
+	{
+	    bgNoneRoot = TRUE;
+	}
 	else if ( strcmp( argv[i], "-p") == 0)
 	{
 	    if(++i < argc)
-- 
1.7.1