forked from AuroraMiddleware/gtk
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:
parent
8fc5066a69
commit
5225ae6105
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -525,26 +525,22 @@ gtk_events_pending (void)
|
||||
|
||||
gint
|
||||
gtk_main_iteration (void)
|
||||
{
|
||||
if (main_loops)
|
||||
{
|
||||
g_main_iteration (TRUE);
|
||||
|
||||
if (main_loops)
|
||||
return !g_main_is_running (main_loops->data);
|
||||
}
|
||||
else
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gint
|
||||
gtk_main_iteration_do (gboolean blocking)
|
||||
{
|
||||
if (main_loops)
|
||||
{
|
||||
g_main_iteration (blocking);
|
||||
|
||||
if (main_loops)
|
||||
return !g_main_is_running (main_loops->data);
|
||||
}
|
||||
else
|
||||
return TRUE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user