luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 08:26:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash gsettings-schema-convert for GConf schemas that contain empty elements

Browse Source 
This can be observed in gnome-power-manager with one of the entries that
contains <long></long>
This commit is contained in:
Richard Hughes 2010-04-20 22:25:23 +01:00
parent f82839b8fe
commit 9717833e82
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gsettings-schema-convert
View File

@ -792,8 +792,10 @@ class GConfSchema:
self.short = self._get_value_with_locale(node, locale_node, 'short') self.short = self._get_value_with_locale(node, locale_node, 'short')
self.long = self._get_value_with_locale(node, locale_node, 'long') self.long = self._get_value_with_locale(node, locale_node, 'long')
self.short = self._oneline(self.short) if self.short:
self.long = self._oneline(self.long) self.short = self._oneline(self.short)
if self.long:
self.long = self._oneline(self.long)
# Fix the default to be parsable by GVariant # Fix the default to be parsable by GVariant
if self.type == 'string': if self.type == 'string':