callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warn if a UTF8_STRING or text/plain;charset=utf-8 roperty contains invalid

Browse Source 
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:
Matthias Clasen
2004-09-17 03:23:32 +00:00
committed by Matthias Clasen
parent ec6f32e14a
commit 5717212948
6 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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>
Fix #152760, Christian Persch:

7
ChangeLog.pre-2-10
View File

@ -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>
Fix #152760, Christian Persch:

7
ChangeLog.pre-2-6
View File

@ -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>
Fix #152760, Christian Persch:

7
ChangeLog.pre-2-8
View File

@ -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>
Fix #152760, Christian Persch:

8
gdk/x11/gdkselection-x11.c
View File

@ -516,7 +516,15 @@ make_list (const gchar *text,
}
}
else
{
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)
{

9
gtk/gtkselection.c
View File

@ -1032,7 +1032,6 @@ selection_get_text_plain (GtkSelectionData *selection_data)
charset, "UTF-8",
NULL, NULL, &len, &error);
g_free (tmp);
}
if (!str)
{
@ -1042,10 +1041,16 @@ selection_get_text_plain (GtkSelectionData *selection_data)
return NULL;
}
}
else if (!g_utf8_validate (str, -1, NULL))
{
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;