[gsettings-desktop-schemas] schemas: Use picture-uri instead of picture-filename
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gsettings-desktop-schemas] schemas: Use picture-uri instead of picture-filename
- Date: Wed, 9 Mar 2011 14:07:00 +0000 (UTC)
commit 70eb5100b894ff449d1a752a3eebd1bf1de9444d
Author: Bastien Nocera <hadess hadess net>
Date: Wed Mar 9 13:06:40 2011 +0000
schemas: Use picture-uri instead of picture-filename
picture-filename was of type string, which can only be used for
UTF-8 strings, and some filenames are not, dependending on the
locale used.
Instead we switch to using a URI, and picture-uri as the key name,
as URIs are UTF-8 compliant strings.
https://bugzilla.gnome.org/show_bug.cgi?id=633983
schemas/gsettings-desktop-schemas.convert | 2 +-
.../org.gnome.desktop.background.gschema.xml.in.in | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert
index 9a4cb72..afd8ad7 100644
--- a/schemas/gsettings-desktop-schemas.convert
+++ b/schemas/gsettings-desktop-schemas.convert
@@ -2,7 +2,7 @@
[org.gnome.desktop.background]
draw-background = /desktop/gnome/background/draw_background
picture-options = /desktop/gnome/background/picture_options
-picture-filename = /desktop/gnome/background/picture_filename
+picture-uri = /desktop/gnome/background/picture_filename
picture-opacity = /desktop/gnome/background/picture_opacity
primary-color = /desktop/gnome/background/primary_color
secondary-color = /desktop/gnome/background/secondary_color
diff --git a/schemas/org.gnome.desktop.background.gschema.xml.in.in b/schemas/org.gnome.desktop.background.gschema.xml.in.in
index 5fcf988..ce8a6b8 100644
--- a/schemas/org.gnome.desktop.background.gschema.xml.in.in
+++ b/schemas/org.gnome.desktop.background.gschema.xml.in.in
@@ -14,11 +14,12 @@
"stretched", "zoom", "spanned".
</_description>
</key>
- <key name="picture-filename" type="s">
- <default>'@datadir@/themes/Adwaita/backgrounds/stripes.jpg'</default>
- <_summary>Picture Filename</_summary>
+ <key name="picture-uri" type="s">
+ <default>'file://@datadir@/themes/Adwaita/backgrounds/stripes.jpg'</default>
+ <_summary>Picture URI</_summary>
<_description>
- File to use for the background image.
+ URI to use for the background image. Not that the backend only supports
+ local (file://) URIs.
</_description>
</key>
<key name="picture-opacity" type="i">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]