diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2020-04-23 01:06:05 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-04-24 04:32:22 -0400 |
| commit | 69f0e4720d2168ba4fd398f43465a7c7f802c159 (patch) | |
| tree | 833a82b7d2d2aee31125d9d06759b5782ef63094 /pcr/gconf-gtk2/gsettings-data-convert-fix-invalid-schema-path.patch | |
| parent | 0f3427fb192c71fdf63338160d8b795daa110e6c (diff) | |
| download | abslibre-69f0e4720d2168ba4fd398f43465a7c7f802c159.tar.gz abslibre-69f0e4720d2168ba4fd398f43465a7c7f802c159.tar.bz2 abslibre-69f0e4720d2168ba4fd398f43465a7c7f802c159.zip | |
[gninjam][gconfmm][gconf-gtk2]: add packages
Diffstat (limited to 'pcr/gconf-gtk2/gsettings-data-convert-fix-invalid-schema-path.patch')
| -rw-r--r-- | pcr/gconf-gtk2/gsettings-data-convert-fix-invalid-schema-path.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/pcr/gconf-gtk2/gsettings-data-convert-fix-invalid-schema-path.patch b/pcr/gconf-gtk2/gsettings-data-convert-fix-invalid-schema-path.patch new file mode 100644 index 000000000..9a141d354 --- /dev/null +++ b/pcr/gconf-gtk2/gsettings-data-convert-fix-invalid-schema-path.patch @@ -0,0 +1,44 @@ +From 405f865c07261a95c8c9a09a84ab679c6dd0a330 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 24 Oct 2013 16:27:24 -0400 +Subject: gsettings-data-convert: Warn (and fix) invalid schema paths + +See https://bugzilla.gnome.org/show_bug.cgi?id=704802 + +https://bugzilla.gnome.org/show_bug.cgi?id=710836 +--- + gsettings/gsettings-data-convert.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c +index 9b2d1d0..160ed41 100644 +--- a/gsettings/gsettings-data-convert.c ++++ b/gsettings/gsettings-data-convert.c +@@ -182,7 +182,23 @@ handle_file (const gchar *filename) + } + + if (schema_path[1] != NULL) +- settings = g_settings_new_with_path (schema_path[0], schema_path[1]); ++ { ++ char *compat_path_alloced = NULL; ++ char *compat_path; ++ /* Work around broken .convert files: ++ https://bugzilla.gnome.org/show_bug.cgi?id=704802 ++ */ ++ if (!g_str_has_suffix (schema_path[1], "/")) ++ { ++ g_warning ("Schema file '%s' has missing trailing / in '%s'", ++ filename, schema_path[1]); ++ compat_path = compat_path_alloced = g_strconcat (schema_path[1], "/", NULL); ++ } ++ else ++ compat_path = schema_path[1]; ++ settings = g_settings_new_with_path (schema_path[0], compat_path); ++ g_free (compat_path_alloced); ++ } + else + settings = g_settings_new (schema_path[0]); + +-- +cgit v0.12 + |