blob: 6fd93526ced24870dd6e400c0d2f500b259b68cd [file] [log] [blame]
Andrew Geissler4b740dc2020-05-05 08:54:39 -05001From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001
Patrick Williamsc124f4f2015-09-15 14:41:29 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 Jun 2015 17:08:46 +0300
Andrew Geissler4b740dc2020-05-05 08:54:39 -05004Subject: [PATCH] Remove the warning about deprecated paths in schemas
Patrick Williamsc124f4f2015-09-15 14:41:29 -05005
6Some schemas in gsettings-desktop-schemas (such as proxy and locale)
7are still using deprecated paths, as of 3.16.1. This causes warning
8messages, and meta/lib/oe/rootfs.py complaints about them.
9
10Upstream-Status: Inappropriate
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
Brad Bishop316dfdd2018-06-25 12:45:53 -040014 gio/glib-compile-schemas.c | 13 -------------
15 1 file changed, 13 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050016
17diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
Andrew Geissler4b740dc2020-05-05 08:54:39 -050018index 7888120..7acbd5b 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050019--- a/gio/glib-compile-schemas.c
20+++ b/gio/glib-compile-schemas.c
Andrew Geissler4b740dc2020-05-05 08:54:39 -050021@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,
Patrick Williamsc124f4f2015-09-15 14:41:29 -050022 return;
23 }
24
25- if (path && (g_str_has_prefix (path, "/apps/") ||
26- g_str_has_prefix (path, "/desktop/") ||
27- g_str_has_prefix (path, "/system/")))
Brad Bishop316dfdd2018-06-25 12:45:53 -040028- {
29- gchar *message = NULL;
30- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. "
31- "Paths starting with "
32- "“/apps/”, “/desktop/” or “/system/” are deprecated."),
33- id, path);
34- g_printerr ("%s\n", message);
35- g_free (message);
36- }
Patrick Williamsc124f4f2015-09-15 14:41:29 -050037-
38 state->schema_state = schema_state_new (path, gettext_domain,
39 extends, extends_name, list_of);
40