2007-03-22 [wwp] 2.8.1cvs40

	* src/action.c
		Fix sticky action dialog when got no output but action command
		is pipe'ing out or inserting (introduced w/ 2.8.1cvs19).

diff --git a/ChangeLog b/ChangeLog
index bae00099e9ba502800d0e6926d3e65ba0f001d26..1c6d4eecfe85ec1b36e3562426e51475d031e6df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-22 [wwp]       2.8.1cvs40
+
+       * src/action.c
+               Fix sticky action dialog when got no output but action command
+               is pipe'ing out or inserting (introduced w/ 2.8.1cvs19).
+
 2007-03-22 [colin]     2.8.1cvs39
 
        * src/prefs_filtering.c

diff --git a/PATCHSETS b/PATCHSETS
index a18734ae4e1008590a03ed20fbf0f8fca28dc467..411ab5c53692f8f82a0923052a273a83d7974252 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2456,3 +2456,4 @@
 ( cvs diff -u -r 1.207.2.153 -r 1.207.2.154 src/folderview.c;  cvs diff -u -r 1.20.2.19 -r 1.20.2.20 src/folderview.h;  cvs diff -u -r 1.274.2.180 -r 1.274.2.181 src/mainwindow.c;  cvs diff -u -r 1.395.2.289 -r 1.395.2.290 src/summaryview.c;  ) > 2.8.1cvs37.patchset
 ( cvs diff -u -r 1.28.2.24 -r 1.28.2.25 src/addrindex.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/ldapctrl.h;  cvs diff -u -r 1.3.2.16 -r 1.3.2.17 src/ldapquery.c;  ) > 2.8.1cvs38.patchset
 ( cvs diff -u -r 1.59.2.54 -r 1.59.2.55 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/combobox.h;  ) > 2.8.1cvs39.patchset
+( cvs diff -u -r 1.12.2.43 -r 1.12.2.44 src/action.c;  ) > 2.8.1cvs40.patchset

diff --git a/configure.ac b/configure.ac
index 0a6069edbf001f6aa26b9b428a616a3b1f955e42..67d5632b8272169b5e67d2beff53ada859a5bdb9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/action.c b/src/action.c
index d807eecea39fd235d9d966689f8437d632afa89c..ae111ec65fd1b81e6c6358169accd05abd6860bd 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1040,8 +1040,12 @@ static gint wait_for_children(Children *children)
        if (children->nb)
                return FALSE;
 
-       if (!children->dialog)
+       if (!children->dialog) {
                free_children(children);
+       } else if (!children->output
+                       && (children->action_type & (ACTION_PIPE_OUT | ACTION_INSERT))) {
+               gtk_widget_destroy(children->dialog);
+       }
 
        return FALSE;
 }