blob: 67ca6240bc8f569c9259c4e7a7e200801b328a9f [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 2acf40361eecd17c6981743dabd06e25a9934258 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
Brad Bishop316dfdd2018-06-25 12:45:53 -04004Subject: [PATCH 05/10] 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
Brad Bishop316dfdd2018-06-25 12:45:53 -040018index b8de090..130f89b 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050019--- a/gio/glib-compile-schemas.c
20+++ b/gio/glib-compile-schemas.c
Brad Bishop316dfdd2018-06-25 12:45:53 -040021@@ -1219,19 +1219,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
41--
Brad Bishop316dfdd2018-06-25 12:45:53 -0400422.14.1
Patrick Williamsc124f4f2015-09-15 14:41:29 -050043