From f17611fa7369e373130b3ee69d3bbaa90a577620 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Apr 2008 13:07:09 +0000 Subject: [PATCH] Make the fix for bug 448943 work. 2008-04-04 Matthias Clasen * glib/gmain.c: Make the fix for bug 448943 work. svn path=/branches/glib-2-16/; revision=6827 --- ChangeLog | 4 ++++ glib/gmain.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc548846f..0b4a2b424 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-04-04 Matthias Clasen + + * glib/gmain.c: Make the fix for bug 448943 work. + 2008-04-04 Tor Lillqvist * configure.in: Make sure we don't build both shared and static at diff --git a/glib/gmain.c b/glib/gmain.c index d2d6122f2..b90bd8baf 100644 --- 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 = ABS (g_str_hash (session_bus_address)); + timer_perturb = ABS ((gint) g_str_hash (session_bus_address)); else timer_perturb = 0; }