From: Andre Noll <maan@systemlinux.org>
Date: Mon, 7 Jan 2008 15:32:02 +0000 (+0100)
Subject: Merge commit 'remotes/yangtse/master'
X-Git-Tag: v0.3.0~12
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=1ce6af6bcbef182148e6ae06d71f4caf053bd644;hp=123ace95d32271900674b83872abbaad5024a885;p=paraslash.git

Merge commit 'remotes/yangtse/master'
---

diff --git a/gui.c b/gui.c
index 2fddc2f8..0cb4b74a 100644
--- a/gui.c
+++ b/gui.c
@@ -979,7 +979,7 @@ static int send_output(void)
 static int client_cmd_cmdline(char *cmd)
 {
 	int ret, fds[3] = {0, 1, 0};
-	char *c = make_message(BINDIR "/para_client %s", cmd);
+	char *c = make_message(BINDIR "/para_client -- %s", cmd);
 
 	outputf(COLOR_COMMAND, "%s", c);
 	print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");
diff --git a/gui.ggo b/gui.ggo
index 9701c39e..40a40563 100644
--- a/gui.ggo
+++ b/gui.ggo
@@ -1,9 +1,52 @@
+#------------------------
 section "general options"
-option "auto_decode" a "auto-decode audio stream" flag on
-option "config_file" c "(default='~/.paraslash/gui.conf')" string typestr="filename" optional
-option "loglevel" l "set loglevel (0-6)" int typestr="level" default="4" optional
-option "timeout" t "set timeout" int typestr="milliseconds" default="30" optional
-option "stat_cmd" s "command to read server and audiod status data from" string typestr="command" default="para_audioc stat" optional
+#------------------------
 
+option "config_file" c
+#~~~~~~~~~~~~~~~~~~~~~~
+"(default='~/.paraslash/gui.conf')"
+
+	string typestr="filename"
+	optional
+
+option "loglevel" l
+#~~~~~~~~~~~~~~~~~~
+ "set loglevel (0-6)"
+
+	int typestr="level"
+	default="4"
+	optional
+
+option "timeout" t
+#~~~~~~~~~~~~~~~~~
+"set timeout"
+
+	int typestr="milliseconds"
+	default="30"
+	optional
+
+option "stat_cmd" s
+#~~~~~~~~~~~~~~~~~~
+"command to read server and audiod status
+data from"
+
+	string typestr="command"
+	default="para_audioc stat"
+	optional
+
+#---------------------------------
 section "mapping keys to commands"
-option "key_map" k "Map key k to command c using mode m. Mode may be d, x or p for display, external and paraslash commands, respectively. Of course, this option may be given multiple times, one for each key mapping." string typestr="k:m:c" optional multiple
+#---------------------------------
+
+option "key_map" k
+#~~~~~~~~~~~~~~~~~
+
+"Map key k to command c using mode m. Mode
+may be d, x or p for display, external and
+paraslash commands, respectively. Of course,
+this option may be given multiple times, one
+for each key mapping."
+
+	string typestr="k:m:c"
+	optional
+	multiple