luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-28 02:20:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix gsettings mapping for uint64

Browse Source 
Bug #616295.
This commit is contained in:
Christian Persch 2010-04-20 19:39:03 -04:00 committed by Matthias Clasen
parent 1b61680abb
commit 9488d18a87
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gsettings-mapping.c
View File

@ -137,7 +137,7 @@ g_settings_set_mapping_unsigned_int (const GValue *value,
const GVariantType *expected_type) const GVariantType *expected_type)
{ {
GVariant *variant = NULL; GVariant *variant = NULL;
gulong u; guint64 u;
if (G_VALUE_HOLDS_UINT (value)) if (G_VALUE_HOLDS_UINT (value))
u = g_value_get_uint (value); u = g_value_get_uint (value);
@ -283,7 +283,7 @@ g_settings_get_mapping_unsigned_int (GValue *value,
GVariant *variant) GVariant *variant)
{ {
const GVariantType *type; const GVariantType *type;
gulong u; guint64 u;
type = g_variant_get_type (variant); type = g_variant_get_type (variant);

4
gio/tests/gsettings.c
View File

@ -827,11 +827,11 @@ test_simple_binding (void)
g_object_set (obj, "uint64", (guint64) G_MAXUINT64, NULL); g_object_set (obj, "uint64", (guint64) G_MAXUINT64, NULL);
g_settings_get (settings, "uint64", "t", &u64); 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_settings_set (settings, "uint64", "t", (guint64) G_MAXINT64);
g_object_get (obj, "uint64", &u64, NULL); 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); g_settings_bind (settings, "string", obj, "string", G_SETTINGS_BIND_DEFAULT);