From e369df6bd686ec67b156eb4ec03bc6717eeea30e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 27 Sep 2002 22:54:58 +0000 Subject: [PATCH] (#91249, Thomas Leonard) Fri Sep 27 18:14:00 2002 Owen Taylor (#91249, Thomas Leonard) * gtk/gtkselection.c (gtk_selection_convert): Initialize idle time to 0. * gtk/gtkselection.c: Up idle timeout to 5 minutes from 5 seconds. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtkselection.c | 12 ++++++++---- 7 files changed, 68 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index babbee2979..f3bfb0bc6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Sep 27 18:14:00 2002 Owen Taylor + + (#91249, Thomas Leonard) + + * gtk/gtkselection.c (gtk_selection_convert): Initialize + idle time to 0. + + * gtk/gtkselection.c: Up idle timeout to 5 minutes + from 5 seconds. + Fri Sep 27 17:40:47 2002 Owen Taylor * modules/input/Makefile.am: Patch from J. Ali Harlow diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index babbee2979..f3bfb0bc6b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Fri Sep 27 18:14:00 2002 Owen Taylor + + (#91249, Thomas Leonard) + + * gtk/gtkselection.c (gtk_selection_convert): Initialize + idle time to 0. + + * gtk/gtkselection.c: Up idle timeout to 5 minutes + from 5 seconds. + Fri Sep 27 17:40:47 2002 Owen Taylor * modules/input/Makefile.am: Patch from J. Ali Harlow diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index babbee2979..f3bfb0bc6b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Fri Sep 27 18:14:00 2002 Owen Taylor + + (#91249, Thomas Leonard) + + * gtk/gtkselection.c (gtk_selection_convert): Initialize + idle time to 0. + + * gtk/gtkselection.c: Up idle timeout to 5 minutes + from 5 seconds. + Fri Sep 27 17:40:47 2002 Owen Taylor * modules/input/Makefile.am: Patch from J. Ali Harlow diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index babbee2979..f3bfb0bc6b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Fri Sep 27 18:14:00 2002 Owen Taylor + + (#91249, Thomas Leonard) + + * gtk/gtkselection.c (gtk_selection_convert): Initialize + idle time to 0. + + * gtk/gtkselection.c: Up idle timeout to 5 minutes + from 5 seconds. + Fri Sep 27 17:40:47 2002 Owen Taylor * modules/input/Makefile.am: Patch from J. Ali Harlow diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index babbee2979..f3bfb0bc6b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Fri Sep 27 18:14:00 2002 Owen Taylor + + (#91249, Thomas Leonard) + + * gtk/gtkselection.c (gtk_selection_convert): Initialize + idle time to 0. + + * gtk/gtkselection.c: Up idle timeout to 5 minutes + from 5 seconds. + Fri Sep 27 17:40:47 2002 Owen Taylor * modules/input/Makefile.am: Patch from J. Ali Harlow diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index babbee2979..f3bfb0bc6b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Fri Sep 27 18:14:00 2002 Owen Taylor + + (#91249, Thomas Leonard) + + * gtk/gtkselection.c (gtk_selection_convert): Initialize + idle time to 0. + + * gtk/gtkselection.c: Up idle timeout to 5 minutes + from 5 seconds. + Fri Sep 27 17:40:47 2002 Owen Taylor * modules/input/Makefile.am: Patch from J. Ali Harlow diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 56672f255b..b8a081cc55 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -69,6 +69,9 @@ #else #define GTK_SELECTION_MAX_SIZE 4000 #endif + +#define IDLE_ABORT_TIME 300 + enum { INCR, MULTIPLE, @@ -684,6 +687,7 @@ gtk_selection_convert (GtkWidget *widget, info->widget = widget; info->selection = selection; info->target = target; + info->idle_time = 0; info->buffer = NULL; info->offset = -1; @@ -1426,9 +1430,9 @@ gtk_selection_incr_timeout (GtkIncrInfo *info) } /* If retrieval is finished */ - if (!tmp_list || info->idle_time >= 5) + if (!tmp_list || info->idle_time >= IDLE_ABORT_TIME) { - if (tmp_list && info->idle_time >= 5) + if (tmp_list && info->idle_time >= IDLE_ABORT_TIME) { current_incrs = g_list_remove_link (current_incrs, tmp_list); g_list_free (tmp_list); @@ -1676,9 +1680,9 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info) } /* If retrieval is finished */ - if (!tmp_list || info->idle_time >= 5) + if (!tmp_list || info->idle_time >= IDLE_ABORT_TIME) { - if (tmp_list && info->idle_time >= 5) + if (tmp_list && info->idle_time >= IDLE_ABORT_TIME) { current_retrievals = g_list_remove_link (current_retrievals, tmp_list); g_list_free (tmp_list);