2007-03-23 [wwp] 2.8.1cvs41

	* src/action.c
		Reverted that part of the action dialog closure logics, to
		pre-2.8.1cvs19. Managing action dialog w/ no output may be
		done later in a different way (or may not).

diff --git a/ChangeLog b/ChangeLog
index 1c6d4eecfe85ec1b36e3562426e51475d031e6df..8ed890aa7ac35f9fb2114daa50eae0678dce5d37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-23 [wwp]       2.8.1cvs41
+
+       * src/action.c
+               Reverted that part of the action dialog closure logics, to
+               pre-2.8.1cvs19. Managing action dialog w/ no output may be
+               done later in a different way (or may not).
+
 2007-03-22 [wwp]       2.8.1cvs40
 
        * src/action.c

diff --git a/PATCHSETS b/PATCHSETS
index 411ab5c53692f8f82a0923052a273a83d7974252..8ba225633c9d5d827310afff314219af958bc5a9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2457,3 +2457,4 @@
 ( 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
+( cvs diff -u -r 1.12.2.44 -r 1.12.2.45 src/action.c;  ) > 2.8.1cvs41.patchset

diff --git a/configure.ac b/configure.ac
index 67d5632b8272169b5e67d2beff53ada859a5bdb9..19b0d3bd579ec42dfce949095b2867cecb6d7de2 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=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

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