diff --git a/ChangeLog b/ChangeLog index 708056fc1..78fe1934e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 708056fc1..78fe1934e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 708056fc1..78fe1934e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 708056fc1..78fe1934e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 708056fc1..78fe1934e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 708056fc1..78fe1934e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 708056fc1..78fe1934e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 708056fc1..78fe1934e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-08-30 Sebastian Wilhelmi + + * glib/gmain.c (g_main_context_add_poll_unlocked): Don't free + cached_poll_array, when adding new poll's. This is taken care for + in g_main_context_iterate. + 2001-08-30 Tor Lillqvist After being away for about five months, I'm back working on diff --git a/glib/gmain.c b/glib/gmain.c index b55bb6bc5..35be1a42a 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -2634,12 +2634,6 @@ g_main_context_add_poll_unlocked (GMainContext *context, newrec->next = pollrec; context->n_poll_records++; - if (context->cached_poll_array && - context->cached_poll_array_size < context->n_poll_records) - { - g_free (context->cached_poll_array); - context->cached_poll_array = NULL; - } #ifdef G_THREADS_ENABLED context->poll_changed = TRUE;