diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch index 41a190eddf..67ca6240bc 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 | 1 | From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 12 Jun 2015 17:08:46 +0300 | 3 | Date: Fri, 12 Jun 2015 17:08:46 +0300 |
4 | Subject: [PATCH] Remove the warning about deprecated paths in schemas | 4 | Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas |
5 | 5 | ||
6 | Some schemas in gsettings-desktop-schemas (such as proxy and locale) | 6 | Some schemas in gsettings-desktop-schemas (such as proxy and locale) |
7 | are still using deprecated paths, as of 3.16.1. This causes warning | 7 | are still using deprecated paths, as of 3.16.1. This causes warning |
@@ -11,26 +11,33 @@ Upstream-Status: Inappropriate | |||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | 12 | ||
13 | --- | 13 | --- |
14 | gio/glib-compile-schemas.c | 6 ------ | 14 | gio/glib-compile-schemas.c | 13 ------------- |
15 | 1 file changed, 6 deletions(-) | 15 | 1 file changed, 13 deletions(-) |
16 | 16 | ||
17 | diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c | 17 | diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c |
18 | index e42949b..ec79d7c 100644 | 18 | index b8de090..130f89b 100644 |
19 | --- a/gio/glib-compile-schemas.c | 19 | --- a/gio/glib-compile-schemas.c |
20 | +++ b/gio/glib-compile-schemas.c | 20 | +++ b/gio/glib-compile-schemas.c |
21 | @@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, | 21 | @@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, |
22 | return; | 22 | return; |
23 | } | 23 | } |
24 | 24 | ||
25 | - if (path && (g_str_has_prefix (path, "/apps/") || | 25 | - if (path && (g_str_has_prefix (path, "/apps/") || |
26 | - g_str_has_prefix (path, "/desktop/") || | 26 | - g_str_has_prefix (path, "/desktop/") || |
27 | - g_str_has_prefix (path, "/system/"))) | 27 | - g_str_has_prefix (path, "/system/"))) |
28 | - g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " | 28 | - { |
29 | - "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); | 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 | - } | ||
30 | - | 37 | - |
31 | state->schema_state = schema_state_new (path, gettext_domain, | 38 | state->schema_state = schema_state_new (path, gettext_domain, |
32 | extends, extends_name, list_of); | 39 | extends, extends_name, list_of); |
33 | 40 | ||
34 | -- | 41 | -- |
35 | 2.1.4 | 42 | 2.14.1 |
36 | 43 | ||