Bug 448943 – g_timeout_add_seconds() problems

2008-04-03  Matthias Clasen  <mclasen@redhat.com>

        Bug 448943 – g_timeout_add_seconds() problems

        * glib/gmain.c (g_timeout_set_expiration): Prevent expiration
        time going negative. Reported by Cody Russell, analyzed by
        Olivier Crete, patch by Sjoerd Simons.

svn path=/trunk/; revision=6814

diff --git a/ChangeLog b/ChangeLog
index e04b6a9..aac81eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-04-03  Matthias Clasen  <mclasen@redhat.com>
 
+       Bug 448943 – g_timeout_add_seconds() problems
+
+       * glib/gmain.c (g_timeout_set_expiration): Prevent expiration
+       time going negative. Reported by Cody Russell, analyzed by
+       Olivier Crete, patch by Sjoerd Simons.
+
+2008-04-03  Matthias Clasen  <mclasen@redhat.com>
+
        Bug 525674 – A typo in gmarkup.c
 
        * glib/gmarkup.c (g_markup_parse_context_get_element_stack): Fix

diff --git a/glib/gmain.c b/glib/gmain.c
index 28292ba..d2d6122 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -3320,7 +3320,7 @@ g_timeout_set_expiration (GTimeoutSource *timeout_source,
       if (!session_bus_address)
         session_bus_address = g_getenv ("HOSTNAME");
       if (session_bus_address)
-        timer_perturb = g_str_hash (session_bus_address);
+        timer_perturb = ABS (g_str_hash (session_bus_address));
       else
         timer_perturb = 0;
     }