[Xfce4-commits] r29426 - xfconf/trunk/xfconfd

[Stephan Arts]

Author: stephan
Date: 2009-02-01 21:47:21 +0000 (Sun, 01 Feb 2009)
New Revision: 29426

Modified:
   xfconf/trunk/xfconfd/xfconf-backend-factory.c
Log:
Replace GUINT_TO_POINTER and GPOINTER_TO_UINT with GSIZE_TO_POINTER and GPOINTER_TO_SIZE respectively.
Fixes segfault on AMD64 (Bug #4881)



Modified: xfconf/trunk/xfconfd/xfconf-backend-factory.c
===================================================================
--- xfconf/trunk/xfconfd/xfconf-backend-factory.c	2009-02-01 18:18:32 UTC (rev 29425)
+++ xfconf/trunk/xfconfd/xfconf-backend-factory.c	2009-02-01 21:47:21 UTC (rev 29426)
@@ -49,7 +49,7 @@
     
 #ifdef BUILD_XFCONF_BACKEND_PERCHANNEL_XML
     g_hash_table_insert(backends, XFCONF_BACKEND_PERCHANNEL_XML_TYPE_ID,
-                        GUINT_TO_POINTER(XFCONF_TYPE_BACKEND_PERCHANNEL_XML));
+                        GSIZE_TO_POINTER(XFCONF_TYPE_BACKEND_PERCHANNEL_XML));
 #endif
 }
 
@@ -63,7 +63,7 @@
     
     xfconf_backend_factory_ensure_backends();
     
-    backend_gtype = GPOINTER_TO_UINT(g_hash_table_lookup(backends, type));
+    backend_gtype = GPOINTER_TO_SIZE(g_hash_table_lookup(backends, type));
     if(0 == backend_gtype) {
         if(error) {
             g_set_error(error, XFCONF_ERROR, 0,