X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgsettingsschema.c;h=85cad60cb4dd0c50bd9ec2b3b3fcf7682ad357e4;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=517198b69fcd4168f30c8a8307d3620c5afb33cf;hpb=3fb44c4c713847059aac22c4c71074e14d11aceb;p=platform%2Fupstream%2Fglib.git diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c index 517198b..85cad60 100644 --- a/gio/gsettingsschema.c +++ b/gio/gsettingsschema.c @@ -673,8 +673,9 @@ parse_into_text_tables (const gchar *directory, GMarkupParseContext *context; context = g_markup_parse_context_new (&parser, G_MARKUP_TREAT_CDATA_AS_TEXT, &info, NULL); + /* Ignore errors here, this is best effort only. */ if (g_markup_parse_context_parse (context, contents, size, NULL)) - g_markup_parse_context_end_parse (context, NULL); + (void) g_markup_parse_context_end_parse (context, NULL); g_markup_parse_context_free (context); /* Clean up dangling stuff in case there was an error. */ @@ -1291,7 +1292,7 @@ g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key) if (value == NULL) { g_warning ("Failed to parse translated string '%s' for " - "key '%s' in schema '%s': %s", key->unparsed, key->name, + "key '%s' in schema '%s': %s", translated, key->name, g_settings_schema_get_id (key->schema), error->message); g_warning ("Using untranslated default instead."); g_error_free (error);