From 098aa5639cc13e5a8cda38e81b05058ca8ff5463 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 15 Mar 2011 11:28:03 -0400 Subject: [PATCH] Document which files glib-compile-schemas looks at Otherwise, your vendor override files are silently ignored... --- docs/reference/gio/glib-compile-schemas.xml | 2 ++ gio/gsettings.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/docs/reference/gio/glib-compile-schemas.xml b/docs/reference/gio/glib-compile-schemas.xml index 9ac5c3e..9055355 100644 --- a/docs/reference/gio/glib-compile-schemas.xml +++ b/docs/reference/gio/glib-compile-schemas.xml @@ -40,6 +40,8 @@ In addition to schema files, glib-compile-schemas reads 'vendor override' files, which are key files that can override default values for keys in the schemas. The group names in the key files are the schema id, and the values are written in serialized GVariant form. +Vendor ovrride files must have the filename extension +.gschema.override. Options diff --git a/gio/gsettings.c b/gio/gsettings.c index ec37814..9c8f32b 100644 --- a/gio/gsettings.c +++ b/gio/gsettings.c @@ -96,6 +96,8 @@ * described by the following DTD: * |[FIXME: MISSING XINCLUDE CONTENT]| * + * glib-compile-schemas expects schema files to have the extension .gschema.xml + * * At runtime, schemas are identified by their id (as specified * in the id attribute of the * schema element). The @@ -200,6 +202,10 @@ * key2=1.5 * * + * + * glib-compile-schemas expects schema files to have the extension + * .gschema.override + * * * * -- 2.7.4