diff --git a/ChangeLog b/ChangeLog index 37d78c5640..ea9889e608 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-11-03 Sven Neumann + + * plug-ins/common/lcms.c: use gimp_any_to_utf8(). + 2006-11-03 Sven Neumann * app/dialogs/fade-dialog.c (fade_dialog_new): use "Fade" instead diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c index 71b2763db8..3fa9e830f6 100644 --- a/plug-ins/common/lcms.c +++ b/plug-ins/common/lcms.c @@ -338,34 +338,19 @@ run (const gchar *name, static gchar * lcms_icc_profile_get_name (cmsHPROFILE profile) { - const gchar *str = cmsTakeProductName (profile); - - if (! g_utf8_validate (str, -1, NULL)) - return g_strdup (_("(invalid UTF-8 string)")); - - return g_strdup (str); + return gimp_any_to_utf8 (cmsTakeProductName (profile), -1, NULL); } static gchar * lcms_icc_profile_get_desc (cmsHPROFILE profile) { - const gchar *str = cmsTakeProductDesc (profile); - - if (! g_utf8_validate (str, -1, NULL)) - return g_strdup (_("(invalid UTF-8 string)")); - - return g_strdup (str); + return gimp_any_to_utf8 (cmsTakeProductDesc (profile), -1, NULL); } static gchar * lcms_icc_profile_get_info (cmsHPROFILE profile) { - const gchar *str = cmsTakeProductInfo (profile); - - if (! g_utf8_validate (str, -1, NULL)) - return g_strdup (_("(invalid UTF-8 string)")); - - return g_strdup (str); + return gimp_any_to_utf8 (cmsTakeProductInfo (profile), -1, NULL); } static gboolean