From: Matthias Clasen Date: Thu, 22 Apr 2004 14:32:58 +0000 (+0000) Subject: Only set time_is_current to FALSE if context->timeout is not zero. X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=cbfb32bcff83eeb9d792eee824c7d5fa01e1e1f3;p=dana%2Fcg-glib.git Only set time_is_current to FALSE if context->timeout is not zero. 2004-04-22 Matthias Clasen * glib/gmain.c (g_main_context_query): Only set time_is_current to FALSE if context->timeout is not zero. (#137795, Christian Krause) --- diff --git a/ChangeLog b/ChangeLog index c813ca8d..d5feb1e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen + + * 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 * tests/printf-test.c (main): Comment out a nonessential testcase diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c813ca8d..d5feb1e1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen + + * 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 * tests/printf-test.c (main): Comment out a nonessential testcase diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c813ca8d..d5feb1e1 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen + + * 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 * tests/printf-test.c (main): Comment out a nonessential testcase diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c813ca8d..d5feb1e1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen + + * 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 * tests/printf-test.c (main): Comment out a nonessential testcase diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c813ca8d..d5feb1e1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen + + * 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 * tests/printf-test.c (main): Comment out a nonessential testcase diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c813ca8d..d5feb1e1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen + + * 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 * tests/printf-test.c (main): Comment out a nonessential testcase diff --git a/glib/gmain.c b/glib/gmain.c index 36c9e175..3427f950 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -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; }