From 1d8aed6816e1e2fccd6582c267a362462c9e0ff2 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Wed, 22 Apr 1998 03:33:50 +0000 Subject: [PATCH] prepend the running_timeouts list with the tmp_list link itself, not with Wed Apr 22 04:15:26 1998 Tim Janik * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the running_timeouts list with the tmp_list link itself, not with a new GList structure pointing to our link. that would fill up memory and causes the GList.data fields of the running_timeouts list to point to GList structures and not GtkTimeoutFunction structures which is a *really* bad thing. (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in the above entry ;). --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gtk/gtkmain.c | 6 ++++-- 8 files changed, 81 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd50bdce56..91b66b8067 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Wed Apr 22 04:15:26 1998 Tim Janik + + * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the + running_timeouts list with the tmp_list link itself, not with a new + GList structure pointing to our link. that would fill up memory and + causes the GList.data fields of the running_timeouts list to point to + GList structures and not GtkTimeoutFunction structures which is a + *really* bad thing. + (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in + the above entry ;). + Wed Apr 15 05:13:09 1998 Tim Janik * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fd50bdce56..91b66b8067 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Wed Apr 22 04:15:26 1998 Tim Janik + + * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the + running_timeouts list with the tmp_list link itself, not with a new + GList structure pointing to our link. that would fill up memory and + causes the GList.data fields of the running_timeouts list to point to + GList structures and not GtkTimeoutFunction structures which is a + *really* bad thing. + (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in + the above entry ;). + Wed Apr 15 05:13:09 1998 Tim Janik * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd50bdce56..91b66b8067 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Wed Apr 22 04:15:26 1998 Tim Janik + + * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the + running_timeouts list with the tmp_list link itself, not with a new + GList structure pointing to our link. that would fill up memory and + causes the GList.data fields of the running_timeouts list to point to + GList structures and not GtkTimeoutFunction structures which is a + *really* bad thing. + (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in + the above entry ;). + Wed Apr 15 05:13:09 1998 Tim Janik * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fd50bdce56..91b66b8067 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Wed Apr 22 04:15:26 1998 Tim Janik + + * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the + running_timeouts list with the tmp_list link itself, not with a new + GList structure pointing to our link. that would fill up memory and + causes the GList.data fields of the running_timeouts list to point to + GList structures and not GtkTimeoutFunction structures which is a + *really* bad thing. + (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in + the above entry ;). + Wed Apr 15 05:13:09 1998 Tim Janik * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fd50bdce56..91b66b8067 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Wed Apr 22 04:15:26 1998 Tim Janik + + * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the + running_timeouts list with the tmp_list link itself, not with a new + GList structure pointing to our link. that would fill up memory and + causes the GList.data fields of the running_timeouts list to point to + GList structures and not GtkTimeoutFunction structures which is a + *really* bad thing. + (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in + the above entry ;). + Wed Apr 15 05:13:09 1998 Tim Janik * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fd50bdce56..91b66b8067 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Wed Apr 22 04:15:26 1998 Tim Janik + + * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the + running_timeouts list with the tmp_list link itself, not with a new + GList structure pointing to our link. that would fill up memory and + causes the GList.data fields of the running_timeouts list to point to + GList structures and not GtkTimeoutFunction structures which is a + *really* bad thing. + (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in + the above entry ;). + Wed Apr 15 05:13:09 1998 Tim Janik * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fd50bdce56..91b66b8067 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Wed Apr 22 04:15:26 1998 Tim Janik + + * gtk/gtkmain.c (gtk_handle_current_timeouts): prepend the + running_timeouts list with the tmp_list link itself, not with a new + GList structure pointing to our link. that would fill up memory and + causes the GList.data fields of the running_timeouts list to point to + GList structures and not GtkTimeoutFunction structures which is a + *really* bad thing. + (gtk_handle_current_idles): likewise (exchange "timout" with "idle" in + the above entry ;). + Wed Apr 15 05:13:09 1998 Tim Janik * gtk/gtklabel.c (gtk_label_size_request): corrected a brace position diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 27c11c50d5..3e1b26f006 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1399,7 +1399,8 @@ gtk_handle_current_timeouts (guint32 the_time) timeoutf = tmp_list->data; current_timeouts = g_list_remove_link (current_timeouts, tmp_list); - running_timeouts = g_list_prepend (running_timeouts, tmp_list); + tmp_list->next = running_timeouts; + running_timeouts = tmp_list; result = gtk_invoke_timeout_function (timeoutf); @@ -1520,7 +1521,8 @@ gtk_handle_current_idles () idlef = tmp_list->data; current_idles = g_list_remove_link (current_idles, tmp_list); - running_idles = g_list_prepend (running_idles, tmp_list); + tmp_list->next = running_idles; + running_idles = tmp_list; result = gtk_idle_invoke_function (idlef);