}
icon_view->priv->last_single_clicked = NULL;
+ icon_view->priv->pressed_button = -1;
}
if (dirty)
if (icon_view->priv->hadjustment != hadj)
{
icon_view->priv->hadjustment = hadj;
- g_object_ref (icon_view->priv->hadjustment);
- gtk_object_sink (GTK_OBJECT (icon_view->priv->hadjustment));
+ g_object_ref_sink (icon_view->priv->hadjustment);
g_signal_connect (icon_view->priv->hadjustment, "value_changed",
G_CALLBACK (gtk_icon_view_adjustment_changed),
if (icon_view->priv->vadjustment != vadj)
{
icon_view->priv->vadjustment = vadj;
- g_object_ref (icon_view->priv->vadjustment);
- gtk_object_sink (GTK_OBJECT (icon_view->priv->vadjustment));
+ g_object_ref_sink (icon_view->priv->vadjustment);
g_signal_connect (icon_view->priv->vadjustment, "value_changed",
G_CALLBACK (gtk_icon_view_adjustment_changed),
GtkIconViewCellInfo *pixbuf_info;
gint pixbuf_width, wrap_width;
- if (icon_view->priv->item_width < 0 &&
- icon_view->priv->text_cell != -1 &&
+ if (icon_view->priv->text_cell != -1 &&
icon_view->priv->pixbuf_cell != -1)
{
text_info = g_list_nth_data (icon_view->priv->cell_list,
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_icon_view_get_cell_info (icon_view, renderer));
- g_object_ref (renderer);
- gtk_object_sink (GTK_OBJECT (renderer));
+ g_object_ref_sink (renderer);
info = g_new0 (GtkIconViewCellInfo, 1);
info->cell = renderer;
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (!gtk_icon_view_get_cell_info (icon_view, renderer));
- g_object_ref (renderer);
- gtk_object_sink (GTK_OBJECT (renderer));
+ g_object_ref_sink (renderer);
info = g_new0 (GtkIconViewCellInfo, 1);
info->cell = renderer;
{
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);
{
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);