always run a g_main_iteration, even if there are no active main loops.

* gtk/gtkmain.c: always run a g_main_iteration, even if
there are no active main loops. This fixes the gimp splash
screen.

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 9464a9a6cb4f9c0bc4fcc01f855681c78b0e320d..0d95a512250320a6b14c7144b8958f332900c469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkmain.c: always run a g_main_iteration, even if
+       there are no active main loops. This fixes the gimp splash
+       screen.
+
 Sat Dec 19 05:37:51 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9464a9a6cb4f9c0bc4fcc01f855681c78b0e320d..0d95a512250320a6b14c7144b8958f332900c469 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkmain.c: always run a g_main_iteration, even if
+       there are no active main loops. This fixes the gimp splash
+       screen.
+
 Sat Dec 19 05:37:51 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9464a9a6cb4f9c0bc4fcc01f855681c78b0e320d..0d95a512250320a6b14c7144b8958f332900c469 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkmain.c: always run a g_main_iteration, even if
+       there are no active main loops. This fixes the gimp splash
+       screen.
+
 Sat Dec 19 05:37:51 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9464a9a6cb4f9c0bc4fcc01f855681c78b0e320d..0d95a512250320a6b14c7144b8958f332900c469 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkmain.c: always run a g_main_iteration, even if
+       there are no active main loops. This fixes the gimp splash
+       screen.
+
 Sat Dec 19 05:37:51 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9464a9a6cb4f9c0bc4fcc01f855681c78b0e320d..0d95a512250320a6b14c7144b8958f332900c469 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkmain.c: always run a g_main_iteration, even if
+       there are no active main loops. This fixes the gimp splash
+       screen.
+
 Sat Dec 19 05:37:51 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9464a9a6cb4f9c0bc4fcc01f855681c78b0e320d..0d95a512250320a6b14c7144b8958f332900c469 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkmain.c: always run a g_main_iteration, even if
+       there are no active main loops. This fixes the gimp splash
+       screen.
+
 Sat Dec 19 05:37:51 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9464a9a6cb4f9c0bc4fcc01f855681c78b0e320d..0d95a512250320a6b14c7144b8958f332900c469 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Dec 19 03:44:29 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * gtk/gtkmain.c: always run a g_main_iteration, even if
+       there are no active main loops. This fixes the gimp splash
+       screen.
+
 Sat Dec 19 05:37:51 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 9082eac79361451d1ba9de76536f42e621f2dfeb..f73ddc504e2d36fa866020976345edfa1efc9884 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -526,12 +526,10 @@ gtk_events_pending (void)
 gint 
 gtk_main_iteration (void)
 {
-  if (main_loops)
-    {
-      g_main_iteration (TRUE);
+  g_main_iteration (TRUE);
 
-      return !g_main_is_running (main_loops->data);
-    }
+  if (main_loops)
+    return !g_main_is_running (main_loops->data);
   else
     return TRUE;
 }
@@ -539,12 +537,10 @@ gtk_main_iteration (void)
 gint 
 gtk_main_iteration_do (gboolean blocking)
 {
-  if (main_loops)
-    {
-      g_main_iteration (blocking);
+  g_main_iteration (blocking);
 
-      return !g_main_is_running (main_loops->data);
-    }
+  if (main_loops)
+    return !g_main_is_running (main_loops->data);
   else
     return TRUE;
 }