seahorse r2778 - in trunk: . common src

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Feb  8 14:00:54 2009
New Revision: 2778
URL: http://svn.gnome.org/viewvc/seahorse?rev=2778&view=rev

Log:
GType is 64-bits on 64-bit platforms.

Fixes bug #562084. Research by Joe Marcus Clarke, Scott McVittie

Modified:
   trunk/ChangeLog
   trunk/common/seahorse-registry.c
   trunk/src/seahorse-viewer.c

Modified: trunk/common/seahorse-registry.c
==============================================================================
--- trunk/common/seahorse-registry.c	(original)
+++ trunk/common/seahorse-registry.c	Sun Feb  8 14:00:54 2009
@@ -142,7 +142,7 @@
 static gint
 object_has_type (gconstpointer object, gconstpointer type)
 {
-	if (G_OBJECT_TYPE (object) == GPOINTER_TO_UINT (type))
+	if (G_OBJECT_TYPE (object) == GPOINTER_TO_SIZE (type))
 		return 0;
 	return -1;
 }
@@ -222,14 +222,14 @@
 	g_return_if_fail (category);
 
 	pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry);
-	register_value_for_category (pv->types, g_quark_from_string (category), GUINT_TO_POINTER (type), NULL);
+	register_value_for_category (pv->types, g_quark_from_string (category), GSIZE_TO_POINTER (type), NULL);
 	
 	va_start (cats, category);
 	for (;;) {
 		category = va_arg (cats, const gchar*);
 		if (!category)
 			break;
-		register_value_for_category (pv->types, g_quark_from_string (category), GUINT_TO_POINTER (type), NULL);
+		register_value_for_category (pv->types, g_quark_from_string (category), GSIZE_TO_POINTER (type), NULL);
 	}
 	va_end (cats);
 }
@@ -302,7 +302,7 @@
 	pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry);
 
 	va_start (cats, category);
-	type = GPOINTER_TO_UINT (lookup_category_value (pv->types, category, cats));
+	type = GPOINTER_TO_SIZE (lookup_category_value (pv->types, category, cats));
 	va_end (cats);
 
 	return type;
@@ -344,7 +344,7 @@
 
 	va_start (cats, category);
 	object = lookup_category_value (pv->objects, category, cats);
-	type = GPOINTER_TO_UINT (lookup_category_value (pv->types, category, cats));
+	type = GPOINTER_TO_SIZE (lookup_category_value (pv->types, category, cats));
 	va_end (cats);
 
 	if (object) 
@@ -381,7 +381,7 @@
 	/* Instantiate other types if nothing of that type exists */
 	for (l = types; l; l = g_list_next (l)) {
 		if (!g_list_find_custom (objects, l->data, object_has_type))
-			objects = g_list_prepend (objects, g_object_new (GPOINTER_TO_UINT (l->data), NULL));
+			objects = g_list_prepend (objects, g_object_new (GPOINTER_TO_SIZE (l->data), NULL));
 	}
 	
 	g_list_free (types);

Modified: trunk/src/seahorse-viewer.c
==============================================================================
--- trunk/src/seahorse-viewer.c	(original)
+++ trunk/src/seahorse-viewer.c	Sun Feb  8 14:00:54 2009
@@ -654,7 +654,7 @@
 		/* Setup the commands */
 		types = seahorse_registry_object_types (seahorse_registry_get (), "commands", NULL, NULL);
 		for (l = types; l; l = g_list_next (l)) {
-			GType typ = GPOINTER_TO_INT (l->data);
+			GType typ = GPOINTER_TO_SIZE (l->data);
 			SeahorseCommands *commands;
 			
 			commands = g_object_new (typ, "view", self, NULL);