Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)

Browse Source 
2004-11-26  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display):
	Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)
This commit is contained in:
Matthias Clasen
2004-11-26 05:45:37 +00:00
committed by Matthias Clasen
parent d33afa53b0
commit 0e43b2afcf
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display):
Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)
2004-11-20 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
@@ -78,6 +83,7 @@
in unfocused selected cells. Also avoid creating two PangoLayouts
per render call. (#154615, #154611, Billy Biggs)
>>>>>>> 1.5367.2.315
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c:

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display):
Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)
2004-11-20 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
@@ -78,6 +83,7 @@
in unfocused selected cells. Also avoid creating two PangoLayouts
per render call. (#154615, #154611, Billy Biggs)
>>>>>>> 1.5367.2.315
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c:

6
ChangeLog.pre-2-6
View File

@@ -1,3 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display):
Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)
2004-11-20 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
@@ -78,6 +83,7 @@
in unfocused selected cells. Also avoid creating two PangoLayouts
per render call. (#154615, #154611, Billy Biggs)
>>>>>>> 1.5367.2.315
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c:

6
ChangeLog.pre-2-8
View File

@@ -1,3 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display):
Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)
2004-11-20 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
@@ -78,6 +83,7 @@
in unfocused selected cells. Also avoid creating two PangoLayouts
per render call. (#154615, #154611, Billy Biggs)
>>>>>>> 1.5367.2.315
2004-11-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c:

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

@@ -642,14 +642,20 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay *display,
else
{
if (list)
(*list)[count++] = g_strdup (local_list[i]);
{
if (g_utf8_validate (local_list[i], -1, NULL))
(*list)[count++] = g_strdup (local_list[i]);
else
g_warning ("Error converting selection");
}
}
}
if (local_count)
gdk_free_text_list (local_list);
(*list)[count] = NULL;
if (list)
(*list)[count] = NULL;
return count;
}