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

Add non-aborting g_settings_schema_source_lookup()

Browse Source 
And rewrite g_settings_schema_new() in terms of it
This commit is contained in:
Ryan Lortie 2011-11-15 07:47:56 +00:00
parent bf5626ddc2
commit 2633f2903e
1 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gio/gsettingsschema.c
View File

@ -139,6 +139,48 @@ initialise_schema_sources (void)
} }
} }
GSettingsSchemaSource *
g_settings_schema_source_get_default (void)
{
initialise_schema_sources ();
return schema_sources;
}
GSettingsSchema *
g_settings_schema_source_lookup (GSettingsSchemaSource *source,
const gchar *schema_name,
gboolean recursive)
{
GSettingsSchema *schema;
GvdbTable *table;
g_return_val_if_fail (source != NULL, NULL);
g_return_val_if_fail (schema_name != NULL, NULL);
table = gvdb_table_get_table (source->table, schema_name);
if (table == NULL && recursive)
for (source = source->parent; source; source = source->parent)
if ((table = gvdb_table_get_table (source->table, schema_name)))
break;
if (table == NULL)
return NULL;
schema = g_slice_new0 (GSettingsSchema);
schema->ref_count = 1;
schema->name = g_strdup (schema_name);
schema->table = table;
schema->path = g_settings_schema_get_string (schema, ".path");
schema->gettext_domain = g_settings_schema_get_string (schema, ".gettext-domain");
if (schema->gettext_domain)
bind_textdomain_codeset (schema->gettext_domain, "UTF-8");
return schema;
}
static gboolean static gboolean
steal_item (gpointer key, steal_item (gpointer key,
gpointer value, gpointer value,
@ -312,31 +354,17 @@ g_settings_schema_new (const gchar *name)
{ {
GSettingsSchemaSource *source; GSettingsSchemaSource *source;
GSettingsSchema *schema; GSettingsSchema *schema;
GvdbTable *table = NULL;
g_return_val_if_fail (name != NULL, NULL); source = g_settings_schema_source_get_default ();
initialise_schema_sources (); if (source == NULL)
g_error ("No GSettings schemas are installed on the system");
for (source = schema_sources; source; source = source->parent) schema = g_settings_schema_source_lookup (source, name, TRUE);
if ((table = gvdb_table_get_table (source->table, name)))
break;
if (table == NULL) if (schema == NULL)
g_error ("Settings schema '%s' is not installed\n", name); g_error ("Settings schema '%s' is not installed\n", name);
schema = g_slice_new0 (GSettingsSchema);
schema->ref_count = 1;
schema->name = g_strdup (name);
schema->table = table;
schema->path =
g_settings_schema_get_string (schema, ".path");
schema->gettext_domain =
g_settings_schema_get_string (schema, ".gettext-domain");
if (schema->gettext_domain)
bind_textdomain_codeset (schema->gettext_domain, "UTF-8");
return schema; return schema;
} }