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)

diff --git a/ChangeLog b/ChangeLog
index c813ca8..d5feb1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c813ca8..d5feb1e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c813ca8..d5feb1e 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c813ca8..d5feb1e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c813ca8..d5feb1e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c813ca8..d5feb1e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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

diff --git a/glib/gmain.c b/glib/gmain.c
index 36c9e17..3427f95 100644 (file)
--- 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;
     }