[orca] Fix for bgo#598917 - Orca Multiple Instances

[William Walker <wwalker src gnome org>]

commit 7562396cb98108ddd61b4cb49fb7490786be2871
Author: Willie Walker <william walker sun com>
Date:   Tue Nov 10 14:26:05 2009 -0500

    Fix for bgo#598917 - Orca Multiple Instances

 docs/man/orca.1  |    3 +++
 src/orca/orca.in |    6 ++++++
 src/orca/orca.py |   10 +++++++++-
 3 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/docs/man/orca.1 b/docs/man/orca.1
index 1ee32c9..d8cdd0c 100644
--- a/docs/man/orca.1
+++ b/docs/man/orca.1
@@ -116,6 +116,9 @@ help and exits.
 .B \-q, --quit
 Quit
 .BR orca .
+.TP
+.B \-z
+Do not automatically kill other orca processes.
 
 .SH KEYBOARD SETTINGS
 Orca provides two keyboard modes, Desktop and Laptop keyboard layout. The
diff --git a/src/orca/orca.in b/src/orca/orca.in
index ecf54ec..f9c623a 100644
--- a/src/orca/orca.in
+++ b/src/orca/orca.in
@@ -158,6 +158,12 @@ else
         CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"`
     fi
 
+    # Allow a -z override to avoid cleanup.
+    #
+    if [ `echo $ARGS | grep -c "\-z"` -gt 0 ] ; then
+	CLEANUP=0
+    fi
+
     # Clean up before running orca to get anything that might
     # be laying around.
     #
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 0cf7484..62539e7 100644
--- a/src/orca/orca.py
+++ b/src/orca/orca.py
@@ -1535,6 +1535,13 @@ def usage():
     print "-q, --quit                   " + \
           _("Quits Orca (if shell script used)")
 
+    # Translators: this is the Orca command line option that will enable to
+    # to launch multiple instances of orca on multi-head computers. If this
+    # command line option is specified, the script will not kill any other
+    # instances of Orca that are already running.
+    #
+    print "-z                           " +\
+          _("Orca does not kill other running orca processes")
     print
 
     # Translators: this is text being sent to a terminal and we want to
@@ -1617,10 +1624,11 @@ def main():
         # n is for no setup
         # t is for text setup
         # v is for version
+        # z is for no exit
         #
         opts, args = getopt.getopt(
             arglist,
-            "?stnvld:e:u:",
+            "?zstnvld:e:u:",
             ["help",
              "user-prefs-dir=",
              "enable=",