Commit 57172129 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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)
parent ec6f32e1
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>
Fix #152760, Christian Persch:
......
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>
Fix #152760, Christian Persch:
......
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>
Fix #152760, Christian Persch:
......
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>
Fix #152760, Christian Persch:
......
......@@ -516,7 +516,15 @@ make_list (const gchar *text,
}
}
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)
{
......
......@@ -1032,20 +1032,25 @@ selection_get_text_plain (GtkSelectionData *selection_data)
charset, "UTF-8",
NULL, NULL, &len, &error);
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",
charset, error->message);
g_error_free (error);
g_warning ("Error converting from text/plain;charset=utf-8 to UTF-8");
g_free (str);
return NULL;
}
result = normalize_to_lf (str, len);
g_free (str);
return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment