Correctly handle the cell list and indices into it. (#321856)

2005-11-28  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
	handle the cell list and indices into it.  (#321856)
This commit is contained in:
Matthias Clasen 2005-11-28 15:32:44 +00:00 committed by Matthias Clasen
parent 4ae9ec1361
commit 4edf06d016
3 changed files with 18 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2005-11-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
handle the cell list and indices into it. (#321856)
2005-11-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when

View File

@ -1,3 +1,8 @@
2005-11-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
handle the cell list and indices into it. (#321856)
2005-11-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when

View File

@ -4714,10 +4714,13 @@ update_text_cell (GtkIconView *icon_view)
{
if (icon_view->priv->text_cell != -1)
{
if (icon_view->priv->pixbuf_cell > icon_view->priv->text_cell)
icon_view->priv->pixbuf_cell--;
info = g_list_nth_data (icon_view->priv->cell_list,
icon_view->priv->text_cell);
g_list_remove (icon_view->priv->cell_list, info);
icon_view->priv->cell_list = g_list_remove (icon_view->priv->cell_list, info);
free_cell_info (info);
@ -4784,10 +4787,13 @@ update_pixbuf_cell (GtkIconView *icon_view)
{
if (icon_view->priv->pixbuf_cell != -1)
{
if (icon_view->priv->text_cell > icon_view->priv->pixbuf_cell)
icon_view->priv->text_cell--;
info = g_list_nth_data (icon_view->priv->cell_list,
icon_view->priv->pixbuf_cell);
g_list_remove (icon_view->priv->cell_list, info);
icon_view->priv->cell_list = g_list_remove (icon_view->priv->cell_list, info);
free_cell_info (info);