From 8af3bfb5e2e5f475449b0a5baabcc099556ff055 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 19 Mar 2009 16:35:36 +0000 Subject: [PATCH] 2009-03-19 [colin] 3.7.1cvs22 * src/toolbar.c Put spam button in default toolbar even if bogofilter and spamassassin are not built. Other anti-spam plugin could exist! :) * src/common/utils.c Fix exit status fetch on win32 --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/utils.c | 9 ++++++++- src/toolbar.c | 4 ---- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c2d47c37..c4f744cc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-03-19 [colin] 3.7.1cvs22 + + * src/toolbar.c + Put spam button in default toolbar even if + bogofilter and spamassassin are not built. + Other anti-spam plugin could exist! :) + * src/common/utils.c + Fix exit status fetch on win32 + 2009-03-18 [paul] 3.7.1cvs21 * src/gtk/spell_entry.c diff --git a/PATCHSETS b/PATCHSETS index 5f61cca5b..906d9776b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3761,3 +3761,4 @@ ( cvs diff -u -r 1.382.2.504 -r 1.382.2.505 src/compose.c; ) > 3.7.1cvs19.patchset ( cvs diff -u -r 1.36.2.167 -r 1.36.2.168 src/common/utils.c; ) > 3.7.1cvs20.patchset ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/spell_entry.c; ) > 3.7.1cvs21.patchset +( cvs diff -u -r 1.43.2.107 -r 1.43.2.108 src/toolbar.c; cvs diff -u -r 1.36.2.168 -r 1.36.2.169 src/common/utils.c; ) > 3.7.1cvs22.patchset diff --git a/configure.ac b/configure.ac index 6a1206aac..44bd33dd1 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=21 +EXTRA_VERSION=22 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/utils.c b/src/common/utils.c index 2fc71bea9..01578b5f2 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -3286,18 +3286,25 @@ static gint execute_sync(gchar *const argv[]) cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1); +#ifdef G_OS_UNIX if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &status, NULL) == FALSE) { g_warning("Couldn't execute command: %s\n", argv[0]); return -1; } -#ifdef G_OS_UNIX if (WIFEXITED(status)) return WEXITSTATUS(status); else return -1; #else + if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH| + G_SPAWN_CHILD_INHERITS_STDIN|G_SPAWN_LEAVE_DESCRIPTORS_OPEN, + NULL, NULL, NULL, NULL, &status, NULL) == FALSE) { + g_warning("Couldn't execute command: %s\n", argv[0]); + return -1; + } + return status; #endif } diff --git a/src/toolbar.c b/src/toolbar.c index 2f92040a2..a3297ddc6 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -489,9 +489,7 @@ static void toolbar_set_default_main(void) { A_SEPARATOR}, { A_TRASH}, #ifndef GENERIC_UMPC -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN)) { A_LEARN_SPAM}, -#endif #endif { A_SEPARATOR}, { A_GOTO_NEXT} @@ -593,9 +591,7 @@ static void toolbar_set_default_msgview(void) { A_SEPARATOR}, { A_TRASH}, #ifndef GENERIC_UMPC -#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN)) { A_LEARN_SPAM}, -#endif #endif { A_GOTO_NEXT} }; -- 2.25.1