Only set time_is_current to FALSE if context->timeout is not zero.

2004-04-22  Matthias Clasen  <mclasen@redhat.com>

	* glib/gmain.c (g_main_context_query): Only set time_is_current to
	FALSE if context->timeout is not zero.  (#137795, Christian Krause)
This commit is contained in:
Matthias Clasen 2004-04-22 14:32:58 +00:00 committed by Matthias Clasen
parent b65c56ffd6
commit cbfb32bcff
7 changed files with 31 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2004-04-22 Matthias Clasen <mclasen@redhat.com>
* glib/gmain.c (g_main_context_query): Only set time_is_current to
FALSE if context->timeout is not zero. (#137795, Christian Krause)
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* tests/printf-test.c (main): Comment out a nonessential testcase

View File

@ -1,3 +1,8 @@
2004-04-22 Matthias Clasen <mclasen@redhat.com>
* glib/gmain.c (g_main_context_query): Only set time_is_current to
FALSE if context->timeout is not zero. (#137795, Christian Krause)
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* tests/printf-test.c (main): Comment out a nonessential testcase

View File

@ -1,3 +1,8 @@
2004-04-22 Matthias Clasen <mclasen@redhat.com>
* glib/gmain.c (g_main_context_query): Only set time_is_current to
FALSE if context->timeout is not zero. (#137795, Christian Krause)
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* tests/printf-test.c (main): Comment out a nonessential testcase

View File

@ -1,3 +1,8 @@
2004-04-22 Matthias Clasen <mclasen@redhat.com>
* glib/gmain.c (g_main_context_query): Only set time_is_current to
FALSE if context->timeout is not zero. (#137795, Christian Krause)
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* tests/printf-test.c (main): Comment out a nonessential testcase

View File

@ -1,3 +1,8 @@
2004-04-22 Matthias Clasen <mclasen@redhat.com>
* glib/gmain.c (g_main_context_query): Only set time_is_current to
FALSE if context->timeout is not zero. (#137795, Christian Krause)
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* tests/printf-test.c (main): Comment out a nonessential testcase

View File

@ -1,3 +1,8 @@
2004-04-22 Matthias Clasen <mclasen@redhat.com>
* glib/gmain.c (g_main_context_query): Only set time_is_current to
FALSE if context->timeout is not zero. (#137795, Christian Krause)
2004-04-21 Matthias Clasen <mclasen@redhat.com>
* tests/printf-test.c (main): Comment out a nonessential testcase

View File

@ -2349,7 +2349,7 @@ g_main_context_query (GMainContext *context,
if (timeout)
{
*timeout = context->timeout;
if (timeout != 0)
if (*timeout != 0)
context->time_is_current = FALSE;
}