Drop the FILLER tile type

It is not used anymore.

diff --git a/gtk/gtklistitemmanager.c b/gtk/gtklistitemmanager.c
index 8fc0476370bf7cfd367701d8236fe0e48ed95931..a8b12cef7fb11af41ffe8a3f24d5972f0790257e 100644 (file)
--- a/gtk/gtklistitemmanager.c
+++ b/gtk/gtklistitemmanager.c
@@ -198,7 +198,6 @@ gtk_list_item_manager_augment_node (GtkRbTree *tree,
       aug->has_footer = TRUE;
       break;
     case GTK_LIST_TILE_ITEM:
-    case GTK_LIST_TILE_FILLER:
     case GTK_LIST_TILE_REMOVED:
       aug->has_header = FALSE;
       aug->has_footer = FALSE;
@@ -633,7 +632,7 @@ static GtkListTile *
 gtk_list_tile_get_next_skip (GtkListTile *tile)
 {
   for (tile = gtk_rb_tree_node_get_next (tile);
-       tile && (tile->type == GTK_LIST_TILE_FILLER || tile->type == GTK_LIST_TILE_REMOVED);
+       tile && tile->type == GTK_LIST_TILE_REMOVED;
        tile = gtk_rb_tree_node_get_next (tile))
     { }
 
@@ -644,7 +643,7 @@ static GtkListTile *
 gtk_list_tile_get_previous_skip (GtkListTile *tile)
 {
   for (tile = gtk_rb_tree_node_get_previous (tile);
-       tile && (tile->type == GTK_LIST_TILE_FILLER || tile->type == GTK_LIST_TILE_REMOVED);
+       tile && tile->type == GTK_LIST_TILE_REMOVED;
        tile = gtk_rb_tree_node_get_previous (tile))
     { }
 
@@ -885,7 +884,6 @@ gtk_list_item_manager_remove_items (GtkListItemManager *self,
           gtk_list_tile_set_type (tile, GTK_LIST_TILE_REMOVED);
           break;
 
-        case GTK_LIST_TILE_FILLER:
         case GTK_LIST_TILE_REMOVED:
         default:
           g_assert_not_reached ();
@@ -928,7 +926,7 @@ gtk_list_item_manager_add_items (GtkListItemManager *self,
     {
       /* at end of list, pick the footer */
       for (tile = gtk_rb_tree_get_last (self->items);
-           tile && (tile->type == GTK_LIST_TILE_REMOVED || tile->type == GTK_LIST_TILE_FILLER);
+           tile && tile->type == GTK_LIST_TILE_REMOVED;
            tile = gtk_rb_tree_node_get_previous (tile))
         { }
 
@@ -1029,34 +1027,6 @@ gtk_list_tile_split (GtkListItemManager *self,
   return result;
 }
 
-/*
- * gtk_list_tile_append_filler:
- * @self: the listitemmanager
- * @previous: tile to append to
- *
- * Appends a filler tile.
- *
- * Filler tiles don't refer to any items or header and exist
- * just to take up space, so that finding items by position gets
- * easier.
- *
- * They ave a special garbage-collection behavior, see
- * gtk_list_tile_gc().
- *
- * Returns: The new filler tile
- **/
-GtkListTile *
-gtk_list_tile_append_filler (GtkListItemManager *self,
-                             GtkListTile        *previous)
-{
-  GtkListTile *result;
-
-  result = gtk_rb_tree_insert_after (self->items, previous);
-  result->type = GTK_LIST_TILE_FILLER;
-
-  return result;
-}
-
 /*
  * gtk_list_tile_gc:
  * @self: the listitemmanager
@@ -1083,13 +1053,6 @@ gtk_list_tile_gc (GtkListItemManager *self,
   if (tile == NULL)
     return NULL;
 
-  if (tile->type == GTK_LIST_TILE_FILLER)
-    {
-      next = gtk_rb_tree_node_get_next (tile);
-      gtk_rb_tree_remove (self->items, tile);
-      tile = next;
-    }
-
   while (tile)
     {
       next = gtk_rb_tree_node_get_next (tile);
@@ -1113,7 +1076,6 @@ gtk_list_tile_gc (GtkListItemManager *self,
         case GTK_LIST_TILE_FOOTER:
         case GTK_LIST_TILE_UNMATCHED_HEADER:
         case GTK_LIST_TILE_UNMATCHED_FOOTER:
-        case GTK_LIST_TILE_FILLER:
           break;
 
         case GTK_LIST_TILE_REMOVED:
@@ -1180,7 +1142,6 @@ gtk_list_item_manager_release_items (GtkListItemManager *self,
               deleted_section = TRUE;
               break;
 
-            case GTK_LIST_TILE_FILLER:
             case GTK_LIST_TILE_REMOVED:
             default:
               g_assert_not_reached ();
@@ -1414,7 +1375,6 @@ gtk_list_item_manager_ensure_items (GtkListItemManager *self,
               break;
 
             case GTK_LIST_TILE_UNMATCHED_FOOTER:
-            case GTK_LIST_TILE_FILLER:
             case GTK_LIST_TILE_REMOVED:
             default:
               g_assert_not_reached ();
@@ -1660,9 +1620,7 @@ gtk_list_item_manager_clear_model (GtkListItemManager *self)
   for (tile = gtk_list_tile_gc (self, gtk_list_item_manager_get_first (self));
        tile;
        tile = gtk_list_tile_gc (self, tile))
-    {
-      g_assert (tile->type == GTK_LIST_TILE_FILLER);
-    }
+    { }
   g_assert (gtk_rb_tree_get_root (self->items) == NULL);
 }
 
@@ -1775,7 +1733,6 @@ gtk_list_item_manager_set_has_sections (GtkListItemManager *self,
               footer = tile;
               break;
             case GTK_LIST_TILE_ITEM:
-            case GTK_LIST_TILE_FILLER:
             case GTK_LIST_TILE_REMOVED:
               break;
             default:

diff --git a/gtk/gtklistitemmanagerprivate.h b/gtk/gtklistitemmanagerprivate.h
index fb8991fb6948af1f13904a2814fa1a5a15b5527f..ea855f4cc56008cd804f405690d72f216db8c5b1 100644 (file)
--- a/gtk/gtklistitemmanagerprivate.h
+++ b/gtk/gtklistitemmanagerprivate.h
@@ -51,7 +51,6 @@ typedef enum
   GTK_LIST_TILE_FOOTER,
   GTK_LIST_TILE_UNMATCHED_HEADER,
   GTK_LIST_TILE_UNMATCHED_FOOTER,
-  GTK_LIST_TILE_FILLER,
   GTK_LIST_TILE_REMOVED,
 } GtkListTileType;
 
@@ -127,8 +126,6 @@ void                    gtk_list_tile_set_area_size             (GtkListItemMana
 GtkListTile *           gtk_list_tile_split                     (GtkListItemManager     *self,
                                                                  GtkListTile            *tile,
                                                                  guint                   n_items);
-GtkListTile *           gtk_list_tile_append_filler             (GtkListItemManager     *self,
-                                                                 GtkListTile            *previous);
 GtkListTile *           gtk_list_tile_gc                        (GtkListItemManager     *self,
                                                                  GtkListTile            *tile);
 

diff --git a/gtk/gtklistview.c b/gtk/gtklistview.c
index c3ac2f681fcd35abbbd136e7139eb6bee48bd060..28c47068145df57f7a873581a872d24751516dfa 100644 (file)
--- a/gtk/gtklistview.c
+++ b/gtk/gtklistview.c
@@ -235,7 +235,6 @@ gtk_list_view_update_factories_with (GtkListView        *self,
         case GTK_LIST_TILE_UNMATCHED_HEADER:
         case GTK_LIST_TILE_FOOTER:
         case GTK_LIST_TILE_UNMATCHED_FOOTER:
-        case GTK_LIST_TILE_FILLER:
         case GTK_LIST_TILE_REMOVED:
           g_assert (tile->widget == NULL);
           break;

diff --git a/testsuite/gtk/listitemmanager.c b/testsuite/gtk/listitemmanager.c
index d572f41404368e7c99b2ccbbddd6f0f39c8171a4..7f14a0f6d895a252487befddee7836bde4c24cb7 100644 (file)
--- a/testsuite/gtk/listitemmanager.c
+++ b/testsuite/gtk/listitemmanager.c
@@ -71,9 +71,6 @@ print_list_item_manager_tiles (GtkListItemManager *items)
             g_string_append_c (string, ')');
             break;
 
-          case GTK_LIST_TILE_FILLER:
-            g_string_append_c (string, '_');
-            break;
           case GTK_LIST_TILE_REMOVED:
             g_string_append_c (string, '.');
             break;
@@ -160,11 +157,6 @@ check_list_item_manager (GtkListItemManager  *items,
               n_items += tile->n_items;
             break;
 
-          case GTK_LIST_TILE_FILLER:
-            /* We don't add fillers */
-            g_assert_not_reached ();
-            break;
-
           case GTK_LIST_TILE_REMOVED:
             g_assert_cmpint (tile->n_items, ==, 0);
             g_assert_null (tile->widget);
@@ -245,7 +237,6 @@ check_list_item_manager (GtkListItemManager  *items,
               n_items += tile->n_items;
             break;
 
-          case GTK_LIST_TILE_FILLER:
           case GTK_LIST_TILE_REMOVED:
           default:
             g_assert_not_reached ();