From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 4 Apr 2008 13:06:14 +0000 (+0000)
Subject: Make the fix for bug 448943 work.
X-Git-Tag: GLIB_2_17_0~93
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccd3ec90bf68c9b89e4582224099f7ff491d814b;p=platform%2Fupstream%2Fglib.git

Make the fix for bug 448943 work.

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

        * glib/gmain.c: Make the fix for bug 448943 work.



svn path=/trunk/; revision=6826
---

diff --git a/ChangeLog b/ChangeLog
index bf9befe..bb0cfc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gmain.c: Make the fix for bug 448943 work.
+
 2008-04-04  Tor Lillqvist  <tml@novell.com>
 
 	* configure.in: Make sure we don't build both shared and static at
diff --git a/glib/gmain.c b/glib/gmain.c
index d2d6122..b90bd8b 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;
     }