# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1002746539 0
# Node ID ad4a0b3f0032ff0f89aaa0754337d97fae29f8dc
# Parent  8530d4d72fabe1236187a1eb69ecea75cc1d811f
[gaim-migrate @ 2491]
handle spaces better

committer: Tailor Script <tailor@pidgin.im>

diff -r 8530d4d72fab -r ad4a0b3f0032 src/browser.c
--- a/src/browser.c	Wed Oct 10 20:23:25 2001 +0000
+++ b/src/browser.c	Wed Oct 10 20:42:19 2001 +0000
@@ -611,7 +611,8 @@
 				*ms = 0;
 				g_snprintf(command, sizeof(command), "%s\"%s\"%s", web_command, url,
 					   ms + 2);
-			}
+			} else
+				g_snprintf(command, sizeof(command), web_command);
 
 			args[0] = "sh";
 			args[1] = "-c";
diff -r 8530d4d72fab -r ad4a0b3f0032 src/sound.c
--- a/src/sound.c	Wed Oct 10 20:23:25 2001 +0000
+++ b/src/sound.c	Wed Oct 10 20:42:19 2001 +0000
@@ -398,7 +398,15 @@
 		if (sound_cmd[0]) {
 			char *args[4];
 			char command[4096];
-			g_snprintf(command, sizeof command, sound_cmd, filename);
+			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);
 			args[0] = "sh";
 			args[1] = "-c";
 			args[2] = command;