From ae35354c264ec14eb924019998fec1fcfa13c03d Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sun, 27 Jul 2014 15:54:44 +0300 Subject: [PATCH] Update the settings editor to match xfconf Xfconf now accepts additional characters for a channel's property name, this patch extends that support to the settings editor. --- xfce4-settings-editor/xfce-settings-prop-dialog.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xfce4-settings-editor/xfce-settings-prop-dialog.c b/xfce4-settings-editor/xfce-settings-prop-dialog.c index c69e423..093e5f2 100644 --- a/xfce4-settings-editor/xfce-settings-prop-dialog.c +++ b/xfce4-settings-editor/xfce-settings-prop-dialog.c @@ -402,16 +402,18 @@ xfconf_property_is_valid (const gchar *property, { if (!(*p >= 'A' && *p <= 'Z') && !(*p >= 'a' && *p <= 'z') && !(*p >= '0' && *p <= '9') - && *p != '_' && *p != '-' && *p != '/' - && !(*p == '<' || *p == '>')) + && *p != '_' && *p != '-' && *p != '/' && *p != '{' && *p != '}' + && !(*p == '<' || *p == '>') && *p != '|' && *p != ',' + && *p != '[' && *p != ']' && *p != '.' && *p != ':') { if (error != NULL) { g_set_error (error, XFCONF_ERROR, XFCONF_ERROR_INVALID_PROPERTY, _("Property names can only include the ASCII " - "characters A-Z, a-z, 0-9, '_', '-', '<' " - "and '>', as well as '/' as a separator")); + "characters A-Z, a-z, 0-9, '_', '-', ':', '.', " + "',', '[', ']', '{', '}', '<' and '>', as well " + "as '/' as a separator")); } return FALSE; } -- 2.0.2