luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

store some extra info in GSettingsKeyInfo

Browse Source
This commit is contained in:
Ryan Lortie 2011-11-13 23:31:39 +01:00
parent f60e0e7242
commit d6c3c2f3c2
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gio/gsettings.c
View File

@ -858,6 +858,9 @@ g_settings_new_with_backend_and_path (const gchar *schema,
typedef struct typedef struct
{ {
GSettings *settings; GSettings *settings;
const gchar *schema_name;
const gchar *gettext_domain;
const gchar *key; const gchar *key;
guint is_flags : 1; guint is_flags : 1;
@ -899,6 +902,8 @@ g_settings_get_key_info (GSettingsKeyInfo *info,
iter = g_settings_schema_get_value (settings->priv->schema, key); iter = g_settings_schema_get_value (settings->priv->schema, key);
info->gettext_domain = g_settings_schema_get_gettext_domain (settings->priv->schema);
info->schema_name = settings->priv->schema_name;
info->default_value = g_variant_iter_next_value (iter); info->default_value = g_variant_iter_next_value (iter);
endian_fixup (&info->default_value); endian_fixup (&info->default_value);
info->type = g_variant_get_type (info->default_value); info->type = g_variant_get_type (info->default_value);
@ -1093,19 +1098,16 @@ g_settings_get_translated_default (GSettingsKeyInfo *info)
{ {
const gchar *translated; const gchar *translated;
GError *error = NULL; GError *error = NULL;
const gchar *domain;
GVariant *value; GVariant *value;
if (info->lc_char == '\0') if (info->lc_char == '\0')
/* translation not requested for this key */ /* translation not requested for this key */
return NULL; return NULL;
domain = g_settings_schema_get_gettext_domain (info->settings->priv->schema);
if (info->lc_char == 't') if (info->lc_char == 't')
translated = g_dcgettext (domain, info->unparsed, LC_TIME); translated = g_dcgettext (info->gettext_domain, info->unparsed, LC_TIME);
else else
translated = g_dgettext (domain, info->unparsed); translated = g_dgettext (info->gettext_domain, info->unparsed);
if (translated == info->unparsed) if (translated == info->unparsed)
/* the default value was not translated */ /* the default value was not translated */
@ -1118,7 +1120,7 @@ g_settings_get_translated_default (GSettingsKeyInfo *info)
{ {
g_warning ("Failed to parse translated string `%s' for " g_warning ("Failed to parse translated string `%s' for "
"key `%s' in schema `%s': %s", info->unparsed, info->key, "key `%s' in schema `%s': %s", info->unparsed, info->key,
info->settings->priv->schema_name, error->message); info->schema_name, error->message);
g_warning ("Using untranslated default instead."); g_warning ("Using untranslated default instead.");
g_error_free (error); g_error_free (error);
} }
@ -1127,7 +1129,7 @@ g_settings_get_translated_default (GSettingsKeyInfo *info)
{ {
g_warning ("Translated default `%s' for key `%s' in schema `%s' " g_warning ("Translated default `%s' for key `%s' in schema `%s' "
"is outside of valid range", info->unparsed, info->key, "is outside of valid range", info->unparsed, info->key,
info->settings->priv->schema_name); info->schema_name);
g_variant_unref (value); g_variant_unref (value);
value = NULL; value = NULL;
} }
@ -1367,7 +1369,7 @@ g_settings_set_enum (GSettings *settings,
{ {
g_critical ("g_settings_set_enum(): invalid enum value %d for key `%s' " g_critical ("g_settings_set_enum(): invalid enum value %d for key `%s' "
"in schema `%s'. Doing nothing.", value, info.key, "in schema `%s'. Doing nothing.", value, info.key,
info.settings->priv->schema_name); info.schema_name);
g_settings_free_key_info (&info); g_settings_free_key_info (&info);
return FALSE; return FALSE;
} }
@ -1479,7 +1481,7 @@ g_settings_set_flags (GSettings *settings,
{ {
g_critical ("g_settings_set_flags(): invalid flags value 0x%08x " g_critical ("g_settings_set_flags(): invalid flags value 0x%08x "
"for key `%s' in schema `%s'. Doing nothing.", "for key `%s' in schema `%s'. Doing nothing.",
value, info.key, info.settings->priv->schema_name); value, info.key, info.schema_name);
g_settings_free_key_info (&info); g_settings_free_key_info (&info);
return FALSE; return FALSE;
} }
@ -2551,7 +2553,7 @@ g_settings_binding_key_changed (GSettings *settings,
g_warning ("Translated default `%s' for key `%s' in schema `%s' " g_warning ("Translated default `%s' for key `%s' in schema `%s' "
"was rejected by the binding mapping function", "was rejected by the binding mapping function",
binding->info.unparsed, binding->info.key, binding->info.unparsed, binding->info.key,
binding->info.settings->priv->schema_name); binding->info.schema_name);
g_variant_unref (variant); g_variant_unref (variant);
variant = NULL; variant = NULL;
} }
@ -2564,7 +2566,7 @@ g_settings_binding_key_changed (GSettings *settings,
g_error ("The schema default value for key `%s' in schema `%s' " g_error ("The schema default value for key `%s' in schema `%s' "
"was rejected by the binding mapping function.", "was rejected by the binding mapping function.",
binding->info.key, binding->info.key,
binding->info.settings->priv->schema_name); binding->info.schema_name);
} }
g_object_set_property (binding->object, binding->property->name, &value); g_object_set_property (binding->object, binding->property->name, &value);
@ -2613,8 +2615,7 @@ g_settings_binding_property_changed (GObject *object,
"schema-specified range for key `%s' of `%s': %s", "schema-specified range for key `%s' of `%s': %s",
binding->property->name, binding->property->name,
g_type_name (binding->property->owner_type), g_type_name (binding->property->owner_type),
binding->info.key, binding->info.key, binding->info.schema_name,
binding->info.settings->priv->schema_name,
g_variant_print (variant, TRUE)); g_variant_print (variant, TRUE));
return; return;
} }