mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 05:01:09 +00:00
Warn if a UTF8_STRING or text/plain;charset=utf-8 roperty contains invalid
Thu Sep 16 23:20:05 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtkselection.c (selection_get_text_plain): * gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING or text/plain;charset=utf-8 roperty contains invalid UTF-8. (#152845, Owen Taylor)
This commit is contained in:
parent
ec6f32e14a
commit
5717212948
@ -1,3 +1,10 @@
|
|||||||
|
Thu Sep 16 23:20:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkselection.c (selection_get_text_plain):
|
||||||
|
* gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
|
||||||
|
or text/plain;charset=utf-8 roperty contains invalid
|
||||||
|
UTF-8. (#152845, Owen Taylor)
|
||||||
|
|
||||||
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
Fix #152760, Christian Persch:
|
Fix #152760, Christian Persch:
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
Thu Sep 16 23:20:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkselection.c (selection_get_text_plain):
|
||||||
|
* gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
|
||||||
|
or text/plain;charset=utf-8 roperty contains invalid
|
||||||
|
UTF-8. (#152845, Owen Taylor)
|
||||||
|
|
||||||
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
Fix #152760, Christian Persch:
|
Fix #152760, Christian Persch:
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
Thu Sep 16 23:20:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkselection.c (selection_get_text_plain):
|
||||||
|
* gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
|
||||||
|
or text/plain;charset=utf-8 roperty contains invalid
|
||||||
|
UTF-8. (#152845, Owen Taylor)
|
||||||
|
|
||||||
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
Fix #152760, Christian Persch:
|
Fix #152760, Christian Persch:
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
Thu Sep 16 23:20:05 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkselection.c (selection_get_text_plain):
|
||||||
|
* gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
|
||||||
|
or text/plain;charset=utf-8 roperty contains invalid
|
||||||
|
UTF-8. (#152845, Owen Taylor)
|
||||||
|
|
||||||
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
2004-09-16 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
Fix #152760, Christian Persch:
|
Fix #152760, Christian Persch:
|
||||||
|
@ -516,7 +516,15 @@ make_list (const gchar *text,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
str = g_strndup (p, q - p);
|
{
|
||||||
|
str = g_strndup (p, q - p);
|
||||||
|
if (!g_utf8_validate (str, -1, NULL))
|
||||||
|
{
|
||||||
|
g_warning ("Error converting selection from UTF8_STRING");
|
||||||
|
g_free (str);
|
||||||
|
str = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (str)
|
if (str)
|
||||||
{
|
{
|
||||||
|
@ -1032,20 +1032,25 @@ selection_get_text_plain (GtkSelectionData *selection_data)
|
|||||||
charset, "UTF-8",
|
charset, "UTF-8",
|
||||||
NULL, NULL, &len, &error);
|
NULL, NULL, &len, &error);
|
||||||
g_free (tmp);
|
g_free (tmp);
|
||||||
}
|
|
||||||
|
|
||||||
if (!str)
|
if (!str)
|
||||||
|
{
|
||||||
|
g_warning ("Error converting from %s to UTF-8: %s",
|
||||||
|
charset, error->message);
|
||||||
|
g_error_free (error);
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (!g_utf8_validate (str, -1, NULL))
|
||||||
{
|
{
|
||||||
g_warning ("Error converting from %s to UTF-8: %s",
|
g_warning ("Error converting from text/plain;charset=utf-8 to UTF-8");
|
||||||
charset, error->message);
|
g_free (str);
|
||||||
g_error_free (error);
|
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
result = normalize_to_lf (str, len);
|
result = normalize_to_lf (str, len);
|
||||||
|
|
||||||
g_free (str);
|
g_free (str);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
Loading…
Reference in New Issue
Block a user