Handle NULL entries (already dispatched) in pending_dispatches array

Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>

        * glib/gmain.c (g_main_context_prepare): Handle
        NULL entries (already dispatched) in pending_dispatches array
        (pointed out by Manish Singh)

diff --git a/ChangeLog b/ChangeLog
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 880dc31c27798edc47d847b4a432f1dc94e8673b..b3b5c9133f05b41e97f42e8d25148bfa09456934 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Feb  6 14:44:18 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/gmain.c (g_main_context_prepare): Handle 
+       NULL entries (already dispatched) in pending_dispatches array 
+       (pointed out by Manish Singh)
+
 Tue Feb  5 17:13:02 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_main_context_prepare): Unref pending

diff --git a/glib/gmain.c b/glib/gmain.c
index 6f0c2bf316fb8e22e94724cf13c2f668f9382aff..3bbcc064be23ce3fc0b5c9e496c57ab52a5bfc9d 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1892,7 +1892,10 @@ g_main_context_prepare (GMainContext *context,
   /* If recursing, clear list of pending dispatches */
 
   for (i = 0; i < context->pending_dispatches->len; i++)
-    SOURCE_UNREF ((GSource *)context->pending_dispatches->pdata[i], context);
+    {
+      if (context->pending_dispatches->pdata[i])
+       SOURCE_UNREF ((GSource *)context->pending_dispatches->pdata[i], context);
+    }
   g_ptr_array_set_size (context->pending_dispatches, 0);
   
   /* Prepare all sources */