Made the actions' input/ouput dialog display without delay

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 134c9c03b090b3e9ff02c9128630be758eeb611b..a051d0d6b54da8c31e3936a0a1a5aa7f341907eb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-07-30 [melvin]    0.8.0claws28
+
+       * src/prefs_actions.c
+               Made the actions' input/output dialog display
+               without delay.
+

 2002-07-30 [christoph] 0.8.0claws27
 
        * src/procmsg.c
 2002-07-30 [christoph] 0.8.0claws27
 
        * src/procmsg.c

diff --git a/configure.in b/configure.in
index 79fe25c572f3a10306a33ce646beb4ee06c32eb1..bf9b68ad0e25cdea793fb6e1df0b46024c2bf061 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws27
+EXTRA_VERSION=claws28

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 562a412062e24d9e98bda379691639de1c878954..e097335c89a12d7537a2d25cd17e3af1e1dcad93 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -51,8 +51,6 @@
 #include "gtkstext.h"
 #include "mimeview.h"
 
 #include "gtkstext.h"
 #include "mimeview.h"
 

-#define WAIT_LAP 10000
-

 typedef enum
 {
        ACTION_NONE     = 1 << 0,
 typedef enum
 {
        ACTION_NONE     = 1 << 0,


@@ -93,7 +91,6 @@ struct _Children
        GtkWidget       *scrolledwin;
 
        gchar           *action;
        GtkWidget       *scrolledwin;
 
        gchar           *action;

-       guint            timer;

        GSList          *list;
        gint             nb;
        gint             open_in;
        GSList          *list;
        gint             nb;
        gint             open_in;


@@ -1221,12 +1218,8 @@ static gboolean execute_actions(gchar *action, GtkWidget *window,
                                              GDK_INPUT_READ,
                                              catch_status, child_info);
                }
                                              GDK_INPUT_READ,
                                              catch_status, child_info);
                }

-               children->timer = children->open_in ? 0 :
-                                 gtk_timeout_add(WAIT_LAP, wait_for_children,
-                                                 children);

        }
        }

-       if (children->open_in)
-               create_io_dialog(children);
+       create_io_dialog(children);

 
        return is_ok;
 }
 
        return is_ok;
 }


@@ -1456,14 +1449,6 @@ static gint wait_for_children(gpointer data)
                cur = cur->next;
        }
 
                cur = cur->next;
        }
 

-       if (!children->dialog && 
-           (new_output || children->timer))
-               create_io_dialog(children);
-
-       if (children->timer) {
-               gtk_timeout_remove(children->timer);
-               children->timer = 0;
-       }

        children->output |= new_output;
 
        if (new_output || (children->dialog && (nb != children->nb)))
        children->output |= new_output;
 
        if (new_output || (children->dialog && (nb != children->nb)))