From 5225ae610541a6213efb4e59e3aaa2382f2013f3 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sat, 19 Dec 1998 11:47:58 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkmain.c | 16 ++++++---------- 8 files changed, 48 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9464a9a6cb..0d95a51225 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 19 03:44:29 PST 1998 Manish Singh + + * 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 * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9464a9a6cb..0d95a51225 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Dec 19 03:44:29 PST 1998 Manish Singh + + * 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 * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9464a9a6cb..0d95a51225 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Dec 19 03:44:29 PST 1998 Manish Singh + + * 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 * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9464a9a6cb..0d95a51225 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Dec 19 03:44:29 PST 1998 Manish Singh + + * 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 * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9464a9a6cb..0d95a51225 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Dec 19 03:44:29 PST 1998 Manish Singh + + * 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 * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9464a9a6cb..0d95a51225 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Dec 19 03:44:29 PST 1998 Manish Singh + + * 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 * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9464a9a6cb..0d95a51225 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Dec 19 03:44:29 PST 1998 Manish Singh + + * 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 * gtk/gtklabel.c (gtk_label_expose): removed return_if_fail diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 9082eac793..f73ddc504e 100644 --- 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; }