# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1006236975 0
# Node ID 0899f8c99a15664b37cef6e772b1e43d4fb50c5b
# Parent  3316f391df3888a61ce61be2ebaa55e0fdb0b558
[gaim-migrate @ 2790]
that's just rather pathetic

committer: Tailor Script <tailor@pidgin.im>

diff -r 3316f391df38 -r 0899f8c99a15 README
--- a/README	Tue Nov 20 01:29:42 2001 +0000
+++ b/README	Tue Nov 20 06:16:15 2001 +0000
@@ -73,6 +73,10 @@
 The panel (if you made an applet) requires certain things to be in certain
 places, but the Makefile/configure script should figure things out for you.
 
+If you set a command for your browser or your sound player, make sure to put
+quotes around the %s where appropriate; otherwise, bad things could happen.
+Remember, you did it to yourself.
+
 Send me bug reports.  The web page is http://gaim.sourceforge.net/and the ftp
 site is ftp://ftp.sourceforge.net/pub/sourceforge/gaim. We also have a
 sourceforge page at http://sourceforge.net/projects/gaim/
diff -r 3316f391df38 -r 0899f8c99a15 src/browser.c
--- a/src/browser.c	Tue Nov 20 01:29:42 2001 +0000
+++ b/src/browser.c	Tue Nov 20 06:16:15 2001 +0000
@@ -622,14 +622,7 @@
 
 			char *ms;
 
-			if (strstr(web_command, "\"%s\""))
-				g_snprintf(command, sizeof(command), web_command, url);
-			else if ((ms = strstr(web_command, "%s")) != NULL) {
-				*ms = 0;
-				g_snprintf(command, sizeof(command), "%s\"%s\"%s", web_command, url,
-					   ms + 2);
-			} else
-				g_snprintf(command, sizeof(command), web_command);
+			g_snprintf(command, sizeof(command), web_command, url);
 
 			args[0] = "sh";
 			args[1] = "-c";
diff -r 3316f391df38 -r 0899f8c99a15 src/gaimrc.c
--- a/src/gaimrc.c	Tue Nov 20 01:29:42 2001 +0000
+++ b/src/gaimrc.c	Tue Nov 20 06:16:15 2001 +0000
@@ -1026,7 +1026,7 @@
 
 	report_idle = IDLE_SCREENSAVER;
 	web_browser = BROWSER_NETSCAPE;
-	g_snprintf(web_command, sizeof(web_command), "xterm -e lynx %%s");
+	g_snprintf(web_command, sizeof(web_command), "xterm -e lynx \"%%s\"");
 
 	auto_away = 10;
 	a = g_new0(struct away_message, 1);
diff -r 3316f391df38 -r 0899f8c99a15 src/sound.c
--- a/src/sound.c	Tue Nov 20 01:29:42 2001 +0000
+++ b/src/sound.c	Tue Nov 20 06:16:15 2001 +0000
@@ -406,14 +406,9 @@
 			char *args[4];
 			char command[4096];
 			char *ms;
-			if (strstr(sound_cmd, "\"%s\""))
-				g_snprintf(command, sizeof(command), sound_cmd, filename);
-			else if ((ms = strstr(sound_cmd, "%s")) != NULL) {
-				*ms = 0;
-				g_snprintf(command, sizeof(command), "%s\"%s\"%s", sound_cmd,
-					   filename, ms + 2);
-			} else
-				g_snprintf(command, sizeof(command), sound_cmd);
+
+			g_snprintf(command, sizeof(command), sound_cmd, filename);
+
 			args[0] = "sh";
 			args[1] = "-c";
 			args[2] = command;