[Xfce4-commits] <garcon:master> UTF-8 validate the name, generic name and comment when set.

[Nick Schermer]

Updating branch refs/heads/master
         to f41a2d03030871f77bbb205a8c0ed625bb52aa86 (commit)
       from e213da4bb6d3345b87792b1d50263cc3b0606702 (commit)

commit f41a2d03030871f77bbb205a8c0ed625bb52aa86
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Aug 29 18:29:08 2009 +0200

    UTF-8 validate the name, generic name and comment when set.

 garcon/garcon-menu-item.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index d019b6d..5f5a2d2 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -1017,6 +1017,7 @@ garcon_menu_item_set_name (GarconMenuItem *item,
                            const gchar    *name)
 {
   g_return_if_fail (GARCON_IS_MENU_ITEM (item));
+  g_return_if_fail (name == NULL || g_utf8_validate (name, -1, NULL));
 
   /* Abort if old and new name are equal */
   if (_garcon_str_is_equal (item->priv->name, name))
@@ -1046,6 +1047,7 @@ garcon_menu_item_set_generic_name (GarconMenuItem *item,
                                    const gchar    *generic_name)
 {
   g_return_if_fail (GARCON_IS_MENU_ITEM (item));
+  g_return_if_fail (generic_name == NULL || g_utf8_validate (generic_name, -1, NULL));
 
   /* Abort if old and new generic name are equal */
   if (_garcon_str_is_equal (item->priv->generic_name, generic_name))
@@ -1075,6 +1077,7 @@ garcon_menu_item_set_comment (GarconMenuItem *item,
                               const gchar    *comment)
 {
   g_return_if_fail (GARCON_IS_MENU_ITEM (item));
+  g_return_if_fail (comment == NULL || g_utf8_validate (comment, -1, NULL));
 
   /* Abort if old and new comment are equal */
   if (_garcon_str_is_equal (item->priv->comment, comment))