# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1178342351 0
# Node ID ff85eb760c7dc4df02e99256c1aef88ba506915a
# Parent  64b7d4ebd2b253f96bfb8b3387a0a9eefee0cd7a# Parent  bcba07153da51d581d5abab22d5744172d11bb04
merge of '124e6be3465f8d19ae38e557d6609fe2fa4f787a'
     and '296e8ceb51de5268dfac776070185220b6ec5d4a'

diff -r bcba07153da5 -r ff85eb760c7d pidgin/gtksound.c
--- a/pidgin/gtksound.c	Sat May 05 04:08:07 2007 +0000
+++ b/pidgin/gtksound.c	Sat May 05 05:19:11 2007 +0000
@@ -418,6 +418,7 @@
 	if (!strcmp(method, "custom")) {
 		const char *sound_cmd;
 		char *command;
+		char *esc_filename;
 		GError *error = NULL;
 
 		sound_cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
@@ -429,16 +430,19 @@
 			return;
 		}
 
+		esc_filename = g_strdup_printf("'%s'", filename);
+
 		if(strstr(sound_cmd, "%s"))
-			command = purple_strreplace(sound_cmd, "%s", filename);
+			command = purple_strreplace(sound_cmd, "%s", esc_filename);
 		else
-			command = g_strdup_printf("%s %s", sound_cmd, filename);
+			command = g_strdup_printf("%s %s", sound_cmd, esc_filename);
 
 		if(!g_spawn_command_line_async(command, &error)) {
 			purple_debug_error("gtksound", "sound command could not be launched: %s\n", error->message);
 			g_error_free(error);
 		}
 
+		g_free(esc_filename);
 		g_free(command);
 		return;
 	}