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
This commit is contained in:
Manish Singh 1998-12-19 11:47:58 +00:00
parent 8fc5066a69
commit 5225ae6105
8 changed files with 48 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;
}