luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 20:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_settings_schema_key_init: take GSettingsSchema*

Browse Source 
instead of of GSettings *
This commit is contained in:
Ryan Lortie 2011-11-14 17:03:57 +01:00
parent 10907cafc3
commit 54964e22d4
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gio/gsettings.c
View File

@ -889,7 +889,7 @@ endian_fixup (GVariant **value)
static void static void
g_settings_schema_key_init (GSettingsSchemaKey *key, g_settings_schema_key_init (GSettingsSchemaKey *key,
GSettings *settings, GSettingsSchema *schema,
const gchar *name) const gchar *name)
{ {
GVariantIter *iter; GVariantIter *iter;
@ -898,10 +898,10 @@ g_settings_schema_key_init (GSettingsSchemaKey *key,
memset (key, 0, sizeof *key); memset (key, 0, sizeof *key);
iter = g_settings_schema_get_value (settings->priv->schema, name); iter = g_settings_schema_get_value (schema, name);
key->gettext_domain = g_settings_schema_get_gettext_domain (settings->priv->schema); key->gettext_domain = g_settings_schema_get_gettext_domain (schema);
key->schema_name = settings->priv->schema_name; key->schema_name = g_settings_schema_get_name (schema);
key->default_value = g_variant_iter_next_value (iter); key->default_value = g_variant_iter_next_value (iter);
endian_fixup (&key->default_value); endian_fixup (&key->default_value);
key->type = g_variant_get_type (key->default_value); key->type = g_variant_get_type (key->default_value);
@ -1242,7 +1242,7 @@ g_settings_get_value (GSettings *settings,
g_return_val_if_fail (G_IS_SETTINGS (settings), NULL); g_return_val_if_fail (G_IS_SETTINGS (settings), NULL);
g_return_val_if_fail (key != NULL, NULL); g_return_val_if_fail (key != NULL, NULL);
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
value = g_settings_read_from_backend (settings, &skey); value = g_settings_read_from_backend (settings, &skey);
if (value == NULL) if (value == NULL)
@ -1288,7 +1288,7 @@ g_settings_get_enum (GSettings *settings,
g_return_val_if_fail (G_IS_SETTINGS (settings), -1); g_return_val_if_fail (G_IS_SETTINGS (settings), -1);
g_return_val_if_fail (key != NULL, -1); g_return_val_if_fail (key != NULL, -1);
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
if (!skey.is_enum) if (!skey.is_enum)
{ {
@ -1343,7 +1343,7 @@ g_settings_set_enum (GSettings *settings,
g_return_val_if_fail (G_IS_SETTINGS (settings), FALSE); g_return_val_if_fail (G_IS_SETTINGS (settings), FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE);
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
if (!skey.is_enum) if (!skey.is_enum)
{ {
@ -1399,7 +1399,7 @@ g_settings_get_flags (GSettings *settings,
g_return_val_if_fail (G_IS_SETTINGS (settings), -1); g_return_val_if_fail (G_IS_SETTINGS (settings), -1);
g_return_val_if_fail (key != NULL, -1); g_return_val_if_fail (key != NULL, -1);
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
if (!skey.is_flags) if (!skey.is_flags)
{ {
@ -1455,7 +1455,7 @@ g_settings_set_flags (GSettings *settings,
g_return_val_if_fail (G_IS_SETTINGS (settings), FALSE); g_return_val_if_fail (G_IS_SETTINGS (settings), FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE);
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
if (!skey.is_flags) if (!skey.is_flags)
{ {
@ -1507,7 +1507,7 @@ g_settings_set_value (GSettings *settings,
g_return_val_if_fail (G_IS_SETTINGS (settings), FALSE); g_return_val_if_fail (G_IS_SETTINGS (settings), FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE);
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
if (!g_settings_schema_key_type_check (&skey, value)) if (!g_settings_schema_key_type_check (&skey, value))
{ {
@ -1659,7 +1659,7 @@ g_settings_get_mapped (GSettings *settings,
g_return_val_if_fail (key != NULL, NULL); g_return_val_if_fail (key != NULL, NULL);
g_return_val_if_fail (mapping != NULL, NULL); g_return_val_if_fail (mapping != NULL, NULL);
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
if ((value = g_settings_read_from_backend (settings, &skey))) if ((value = g_settings_read_from_backend (settings, &skey)))
{ {
@ -2384,7 +2384,7 @@ g_settings_get_range (GSettings *settings,
const gchar *type; const gchar *type;
GVariant *range; GVariant *range;
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
if (skey.minimum) if (skey.minimum)
{ {
@ -2434,7 +2434,7 @@ g_settings_range_check (GSettings *settings,
GSettingsSchemaKey skey; GSettingsSchemaKey skey;
gboolean good; gboolean good;
g_settings_schema_key_init (&skey, settings, key); g_settings_schema_key_init (&skey, settings->priv->schema, key);
good = g_settings_schema_key_type_check (&skey, value) && good = g_settings_schema_key_type_check (&skey, value) &&
g_settings_schema_key_range_check (&skey, value); g_settings_schema_key_range_check (&skey, value);
g_settings_schema_key_clear (&skey); g_settings_schema_key_clear (&skey);
@ -2740,7 +2740,7 @@ g_settings_bind_with_mapping (GSettings *settings,
objectclass = G_OBJECT_GET_CLASS (object); objectclass = G_OBJECT_GET_CLASS (object);
binding = g_slice_new0 (GSettingsBinding); binding = g_slice_new0 (GSettingsBinding);
g_settings_schema_key_init (&binding->key, settings, key); g_settings_schema_key_init (&binding->key, settings->priv->schema, key);
binding->settings = g_object_ref (settings); binding->settings = g_object_ref (settings);
binding->object = object; binding->object = object;
binding->property = g_object_class_find_property (objectclass, property); binding->property = g_object_class_find_property (objectclass, property);