[kupfer: 24/41] main: Deprecate --relay option. Document this and --exec-helper

[Ulrik Sverdrup <usverdrup src gnome org>]

commit e36dd8a41723c7bc158679de915a1a453e1b8809
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Apr 26 18:44:03 2011 +0200

    main: Deprecate --relay option. Document this and --exec-helper

 Documentation/Manpage.rst |   18 +++++-------------
 kupfer/main.py            |    8 +++-----
 2 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/Documentation/Manpage.rst b/Documentation/Manpage.rst
index 15e8885..da55a31 100644
--- a/Documentation/Manpage.rst
+++ b/Documentation/Manpage.rst
@@ -57,19 +57,11 @@ OPTIONS
 --debug         Enable more verbose output that can help understanding
                 the program's operation.
 
---relay         Run libkeybinder relay service on the current
-                ``$DISPLAY``. kupfer is supported in a multihead
-                configuration with multiple X screens, if it all exists
-                inside one single desktop (and D-Bus) session.
-
-                On the first X screen, kupfer should be started
-                normally. For each additional screen with unique
-                ``$DISPLAY`` name, the relay service must be started. It
-                will pass on the summoning and trigger global keyboard
-                shortcuts.
-
-                ``kupfer --relay`` will wait if no running kupfer can be
-                contacted. It never exits until interrupted.
+--relay         Is deprecated and will be started by the Multihead
+                Support plugin when needed
+
+--exec-helper=HELPER    Run plugin helper program, which should be the
+                        name of a module inside kupfer.
 
 The following are generic options
 
diff --git a/kupfer/main.py b/kupfer/main.py
index 7045caf..957d98a 100644
--- a/kupfer/main.py
+++ b/kupfer/main.py
@@ -43,7 +43,7 @@ def get_options():
 		("no-splash", _("do not present main interface on launch")),
 		("list-plugins", _("list available plugins")),
 		("debug", _("enable debug info")),
-		("relay", _("run keyboard shortcut relay service on this display")),
+		("relay", ""),
 		("exec-helper=", _("run plugin helper")),
 	]
 	misc_options = [
@@ -98,7 +98,8 @@ def get_options():
 			global _debug
 			_debug = True
 		if k == "--relay":
-			keyrelay_main()
+			prt("WARNING: --relay is deprecated!")
+			exec_helper('kupfer.keyrelay')
 			raise SystemExit
 		if k == "--exec-helper":
 			exec_helper(v)
@@ -145,9 +146,6 @@ def exec_helper(helpername):
 	runpy.run_module(helpername, run_name='__main__', alter_sys=True)
 	raise SystemExit
 
-def keyrelay_main():
-	return exec_helper('kupfer.keyrelay')
-
 def gtkmain(quiet):
 	import pygtk
 	pygtk.require('2.0')