From f5f9c6a39d31b8484be7032418ebbde92ebdcb68 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 21 Aug 2006 07:53:24 +0000 Subject: Fix for bug 346797 svn path=/trunk/; revision=32609 --- shell/ChangeLog | 7 +++++++ shell/e-shell-window-commands.c | 30 +++++++++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/shell/ChangeLog b/shell/ChangeLog index f6021d1983..0b455905f6 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2006-08-21 Srinivasa Ragavan + + ** Fix for bug #346797 Patch by Matthew Barnes + + * e-shell-window-commands.c: (command_submit_bug): Fix to use new bug + buddy. + 2006-08-17 Kjartan Maraas * e-user-creatable-items-handler.c: (new_button_change), diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 789ce308f6..31531065c2 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -114,26 +114,22 @@ command_submit_bug (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - int pid; - char *args[] = { - "bug-buddy", - "--sm-disable", - "--package=evolution", - "--package-ver="VERSION, - NULL - }; + gchar *command_line; + GError *error = 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; - } + 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 -- cgit v1.2.3