From 9488d18a87bdba2b4180280d8109ab5381acf9c8 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 20 Apr 2010 19:39:03 -0400 Subject: [PATCH] Fix gsettings mapping for uint64 Bug #616295. --- gio/gsettings-mapping.c | 4 ++-- gio/tests/gsettings.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gio/gsettings-mapping.c b/gio/gsettings-mapping.c index 2c6cfad..bdd2c9c 100644 --- a/gio/gsettings-mapping.c +++ b/gio/gsettings-mapping.c @@ -137,7 +137,7 @@ g_settings_set_mapping_unsigned_int (const GValue *value, const GVariantType *expected_type) { GVariant *variant = NULL; - gulong u; + guint64 u; if (G_VALUE_HOLDS_UINT (value)) u = g_value_get_uint (value); @@ -283,7 +283,7 @@ g_settings_get_mapping_unsigned_int (GValue *value, GVariant *variant) { const GVariantType *type; - gulong u; + guint64 u; type = g_variant_get_type (variant); diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c index 33b8f67..c1b3251 100644 --- a/gio/tests/gsettings.c +++ b/gio/tests/gsettings.c @@ -827,11 +827,11 @@ test_simple_binding (void) g_object_set (obj, "uint64", (guint64) G_MAXUINT64, NULL); g_settings_get (settings, "uint64", "t", &u64); - g_assert_cmpint (u64, ==, G_MAXUINT64); + g_assert_cmpuint (u64, ==, G_MAXUINT64); g_settings_set (settings, "uint64", "t", (guint64) G_MAXINT64); g_object_get (obj, "uint64", &u64, NULL); - g_assert_cmpint (u64, ==, G_MAXINT64); + g_assert_cmpuint (u64, ==, (guint64) G_MAXINT64); g_settings_bind (settings, "string", obj, "string", G_SETTINGS_BIND_DEFAULT); -- 2.7.4