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

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

Browse Source 
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:29:02 +00:00
committed by Matthias Clasen
parent de18baa285
commit 7207dfbc0b
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +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)
* gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when
the timeout is done. (#322291, Jean-Yves Lefort)

3
ChangeLog.pre-2-10
View File

@@ -1,5 +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)
* gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when
the timeout is done. (#322291, Jean-Yves Lefort)

10
gtk/gtkiconview.c
View File

@@ -4719,10 +4719,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);
@@ -4789,10 +4792,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);