--- evolution-2.7.90/shell/e-shell-window-commands.c.submit-bug-report	2006-04-24 06:49:10.000000000 -0400
+++ evolution-2.7.90/shell/e-shell-window-commands.c	2006-08-07 13:11:24.000000000 -0400
@@ -114,26 +114,22 @@
 		    EShellWindow *window,
 		    const char *path)
 {
-        int pid;
-        char *args[] = {
-                "bug-buddy",
-                "--sm-disable",
-                "--package=evolution",
-                "--package-ver="VERSION,
-                NULL
-        };
-
-        args[0] = g_find_program_in_path ("bug-buddy");
-        if (!args[0]) {
-                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy is not installed."));
-		return;
-        }
+	gchar *command_line;
+	GError *error = NULL;
+
+        command_line = "bug-buddy --sm-disable --package=Evolution";
 
-        pid = gnome_execute_async (NULL, 4, args);
-        g_free (args[0]);
+	g_debug ("Spawning: %s", command_line);
 
-        if (pid == -1)
-                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy could not be run."));
+	if (!g_spawn_command_line_async (command_line, &error)) {
+		if (error->code == G_SPAWN_ERROR_NOENT)
+			e_notice (NULL, GTK_MESSAGE_ERROR,
+				_("Bug buddy is not installed."));
+		else
+			e_notice (NULL, GTK_MESSAGE_ERROR,
+				_("Bug buddy could not be run."));
+		g_error_free (error);
+	}
 }
 
 /* must be in utf8, the weird breaking of escaped strings
