diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2004-08-30 07:37:39 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@src.gnome.org> | 2004-08-30 07:37:39 +0000 |
| commit | 1e98227e7ea654283032381dafe1d75e85df65c8 (patch) | |
| tree | 161a0dbf3b984fcbfcc63b0f86b9551e78ecf2e6 | |
| parent | f7e7979162fd89ed3c9ad0fdc40366929171968b (diff) | |
| download | gconf-1e98227e7ea654283032381dafe1d75e85df65c8.tar.gz | |
Fix problem with schemas install. Bug #151334.
2004-08-30 Mark McLoughlin <mark@skynet.ie>
Fix problem with schemas install. Bug #151334.
* gconf/gconftool.c: (process_locale_info): install the
global default in the C locale only.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gconf/gconftool.c | 5 |
2 files changed, 11 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2004-08-30 Mark McLoughlin <mark@skynet.ie> + Fix problem with schemas install. Bug #151334. + + * gconf/gconftool.c: (process_locale_info): install the + global default in the C locale only. + +2004-08-30 Mark McLoughlin <mark@skynet.ie> + Lots of debugging info from Mickey Stein <yekkim@pacbell.net> narrowed this one down in bug #150779. diff --git a/gconf/gconftool.c b/gconf/gconftool.c index 675f90ab..ae59751c 100644 --- a/gconf/gconftool.c +++ b/gconf/gconftool.c @@ -3275,7 +3275,9 @@ process_locale_info(xmlNodePtr node, SchemaInfo* info) gconf_schema_set_locale(schema, name); - xmlFree(name); + /* Only set the global default on the C locale */ + if (strcmp(name, "C") == 0 && info->global_default != NULL) + gconf_schema_set_default_value(schema, info->global_default); /* Fill in the global info */ if (info->type != GCONF_VALUE_INVALID) @@ -3293,6 +3295,7 @@ process_locale_info(xmlNodePtr node, SchemaInfo* info) if (info->owner != NULL) gconf_schema_set_owner(schema, info->owner); + xmlFree(name); /* Locale-specific info */ iter = node->xmlChildrenNode; |