2007-09-26 [colin] 3.0.1cvs29
authorColin Leroy <colin@colino.net>
Wed, 26 Sep 2007 07:51:39 +0000 (07:51 +0000)
committerColin Leroy <colin@colino.net>
Wed, 26 Sep 2007 07:51:39 +0000 (07:51 +0000)
* src/inc.c
Fix bug 1334, 'user defined mail incorporation
script not run'

ChangeLog
PATCHSETS
configure.ac
src/inc.c

index 41edf6343ef878663f7b1fd48d70380da7bc58ed..788a9e7adec9f2b0f87bd907290d8c8022e4a7a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-26 [colin]     3.0.1cvs29
+
+       * src/inc.c
+               Fix bug 1334, 'user defined mail incorporation 
+               script not run'
+
 2007-09-25 [colin]     3.0.1cvs28
 
        * src/codeconv.c
index 30b7e32983f7867dbeabe8314b662fe2e2f1c72e..178ac27ceea655a170456bb8c2116964f20d0358 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.410 -r 1.382.2.411 src/compose.c;  ) > 3.0.1cvs26.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/printing.c;  ) > 3.0.1cvs27.patchset
 ( cvs diff -u -r 1.65.2.58 -r 1.65.2.59 src/codeconv.c;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/common/xml.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/common/xml.h;  ) > 3.0.1cvs28.patchset
+( cvs diff -u -r 1.149.2.82 -r 1.149.2.83 src/inc.c;  ) > 3.0.1cvs29.patchset
index 2889bb494acaf286b722d52fd973d003f78bac2b..719d029d3dc47d773da9ffa63d4cbf50015c3fbd 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 02258f77de06c43a10107f91d38a72b6af8dcc53..b40f18ff76f7ae9ff45c034963ea33e592d63529 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -336,6 +336,17 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
                return;
        }
 
+       if (prefs_common.use_extinc && prefs_common.extinc_cmd) {
+               /* external incorporating program */
+               if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
+                       log_error(LOG_PROTOCOL, _("%s failed\n"), prefs_common.extinc_cmd);
+                       
+                       main_window_unlock(mainwin);
+                       inc_autocheck_timer_set();
+                       return;
+               }
+       }
+       
        /* check local folders */
        account_new_msgs = inc_all_spool();
        if (account_new_msgs > 0)