AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Check column types on the new model, and check them all. (#159389, Olivier

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

	* gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the
	new model, and check them all.  (#159389, Olivier Andrieu)
This commit is contained in:
Matthias Clasen 2004-11-26 05:51:32 +00:00 committed by Matthias Clasen
parent 54c6743787
commit 5b29d3d55e
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com> 2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the
new model, and check them all. (#159389, Olivier Andrieu)
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display): * 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) Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com> 2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the
new model, and check them all. (#159389, Olivier Andrieu)
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display): * 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) Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)

3
ChangeLog.pre-2-6
View File

@ -1,5 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com> 2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the
new model, and check them all. (#159389, Olivier Andrieu)
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display): * 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) Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)

3
ChangeLog.pre-2-8
View File

@ -1,5 +1,8 @@
2004-11-26 Matthias Clasen <mclasen@redhat.com> 2004-11-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (gtk_icon_view_set_model): Check column types on the
new model, and check them all. (#159389, Olivier Andrieu)
* gdk/x11/gdkselection-x11.c (gdk_text_property_to_utf8_list_for_display): * 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) Don't crash if Xlib fails to return UTF-8. (#159373, Kristian Høgsberg)

22
gtk/gtkiconview.c
View File

@ -2955,24 +2955,32 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
if (model) if (model)
{ {
GType pixbuf_column_type, text_column_type; GType column_type;
g_return_if_fail (gtk_tree_model_get_flags (model) & GTK_TREE_MODEL_LIST_ONLY); g_return_if_fail (gtk_tree_model_get_flags (model) & GTK_TREE_MODEL_LIST_ONLY);
if (icon_view->priv->pixbuf_column != -1) if (icon_view->priv->pixbuf_column != -1)
{ {
pixbuf_column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column_type = gtk_tree_model_get_column_type (model,
icon_view->priv->pixbuf_column); icon_view->priv->pixbuf_column);
g_return_if_fail (pixbuf_column_type == GDK_TYPE_PIXBUF); g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
} }
if (icon_view->priv->text_column != -1) if (icon_view->priv->text_column != -1)
{ {
text_column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column_type = gtk_tree_model_get_column_type (model,
icon_view->priv->pixbuf_column); icon_view->priv->text_column);
g_return_if_fail (text_column_type == G_TYPE_STRING); g_return_if_fail (column_type == G_TYPE_STRING);
}
if (icon_view->priv->markup_column != -1)
{
column_type = gtk_tree_model_get_column_type (model,
icon_view->priv->markup_column);
g_return_if_fail (column_type == G_TYPE_STRING);
} }
} }