filechooserwidget: Finish port to GtkColumnViewCell

Some missing updates from f5dea9a3c217c49f44eedb18822be080d2451dc0

3 files changed, 33 insertions, 44 deletions

diff --git a/gtk/gtkfilechoosercell.c b/gtk/gtkfilechoosercell.c
index 3787b7f8b4..ee97002d6c 100644
--- a/gtk/gtkfilechoosercell.c
+++ b/gtk/gtkfilechoosercell.c
@@ -23,22 +23,21 @@
 
 #include "gtkprivate.h"
 #include "gtkbinlayout.h"
+#include "gtkcolumnviewcell.h"
 #include "gtkdragsource.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturelongpress.h"
 #include "gtkicontheme.h"
-#include "gtklistitem.h"
 #include "gtkselectionmodel.h"
 #include "gtkfilechooserutils.h"
 #include "gtkfilechooserwidgetprivate.h"
-#include "gtklistitem.h"
 
 struct _GtkFileChooserCell
 {
   GtkWidget parent_instance;
 
   GFileInfo *item;
-  GtkListItem *list_item;
+  GtkColumnViewCell *list_item;
 
   gboolean show_time;
 };
@@ -79,7 +78,7 @@ popup_menu (GtkFileChooserCell *self,
 
   if (self->list_item)
     gtk_widget_activate_action (widget, "item.popup-file-list-menu",
-                                "(udd)", gtk_list_item_get_position (self->list_item), p.x, p.y);
+                                "(udd)", gtk_column_view_cell_get_position (self->list_item), p.x, p.y);
 }
 
 static void
@@ -125,7 +124,7 @@ drag_prepare_cb (GtkDragSource *source,
   impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (GTK_WIDGET (self),
                                                            GTK_TYPE_FILE_CHOOSER_WIDGET));
 
-  if (self->list_item && !gtk_list_item_get_selected (self->list_item))
+  if (self->list_item && !gtk_column_view_cell_get_selected (self->list_item))
     {
       gtk_widget_activate_action (GTK_WIDGET (self), "listitem.select", "(bb)", FALSE, FALSE);
     }
@@ -206,13 +205,6 @@ get_selectable (GtkFileChooserCell *self)
 }
 
 static void
-update_list_item (GtkFileChooserCell *self)
-{
-  if (self->list_item)
-    gtk_list_item_set_selectable (self->list_item, get_selectable (self));
-}
-
-static void
 gtk_file_chooser_cell_set_property (GObject      *object,
                                     guint         prop_id,
                                     const GValue *value,
@@ -230,7 +222,6 @@ gtk_file_chooser_cell_set_property (GObject      *object,
       else
         gtk_widget_add_css_class (GTK_WIDGET (self), "dim-label");
 
-      update_list_item (self);
       break;
 
     case PROP_SHOW_TIME:
@@ -239,8 +230,6 @@ gtk_file_chooser_cell_set_property (GObject      *object,
 
     case PROP_LIST_ITEM:
       self->list_item = g_value_get_object (value);
-
-      update_list_item (self);
       break;
 
     default:
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index cc7136f156..ab368fc926 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -27,6 +27,7 @@
 #include "gtkbutton.h"
 #include "gtkdropdown.h"
 #include "gtkcolumnview.h"
+#include "gtkcolumnviewcell.h"
 #include "gtkcolumnviewcolumn.h"
 #include "gtkcolumnviewrow.h"
 #include "gtkcssnumbervalueprivate.h"
@@ -44,7 +45,6 @@
 #include "gtkgesturelongpress.h"
 #include "gtkgrid.h"
 #include "gtklabel.h"
-#include "gtklistitem.h"
 #include "gtkmarshalers.h"
 #include "gtkalertdialog.h"
 #include "gtkmountoperation.h"
@@ -1946,8 +1946,8 @@ files_list_restrict_key_presses (GtkEventControllerKey *controller,
 }
 
 static char *
-column_view_get_file_date (GtkListItem *item,
-                           GFileInfo   *info)
+column_view_get_file_date (GtkColumnViewCell *cell,
+                           GFileInfo        *info)
 {
   GtkFileChooserWidget *impl;
   glong time;
@@ -1955,7 +1955,7 @@ column_view_get_file_date (GtkListItem *item,
   if (!info)
     return NULL;
 
-  impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (gtk_list_item_get_child (item),
+  impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (gtk_column_view_cell_get_child (cell),
                                                            GTK_TYPE_FILE_CHOOSER_WIDGET));
   if (!impl)
     return NULL;
@@ -1972,8 +1972,8 @@ column_view_get_file_date (GtkListItem *item,
 }
 
 static char *
-column_view_get_file_display_name (GtkListItem *item,
-                                   GFileInfo   *info)
+column_view_get_file_display_name (GtkColumnViewCell *cell,
+                                   GFileInfo        *info)
 {
   if (info)
     return g_strdup (g_file_info_get_display_name (info));
@@ -1982,8 +1982,8 @@ column_view_get_file_display_name (GtkListItem *item,
 }
 
 static char *
-column_view_get_file_time (GtkListItem *item,
-                           GFileInfo   *info)
+column_view_get_file_time (GtkColumnViewCell *cell,
+                           GFileInfo        *info)
 {
   GtkFileChooserWidget *impl;
   glong time;
@@ -1991,7 +1991,7 @@ column_view_get_file_time (GtkListItem *item,
   if (!info)
     return NULL;
 
-  impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (gtk_list_item_get_child (item),
+  impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (gtk_column_view_cell_get_child (cell),
                                                            GTK_TYPE_FILE_CHOOSER_WIDGET));
   if (!impl)
     return NULL;
@@ -2008,8 +2008,8 @@ column_view_get_file_time (GtkListItem *item,
 }
 
 static char *
-column_view_get_file_type (GtkListItem *item,
-                           GFileInfo   *info)
+column_view_get_file_type (GtkColumnViewCell *cell,
+                           GFileInfo        *info)
 {
   GtkFileChooserWidget *impl;
 
@@ -2097,12 +2097,12 @@ file_chooser_get_location (GtkFileChooserWidget *impl,
 }
 
 static char *
-column_view_get_location (GtkListItem *list_item,
-                          GFileInfo   *info)
+column_view_get_location (GtkColumnViewCell *cell,
+                          GFileInfo         *info)
 {
   GtkFileChooserWidget *impl;
 
-  impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (gtk_list_item_get_child (list_item),
+  impl = GTK_FILE_CHOOSER_WIDGET (gtk_widget_get_ancestor (gtk_column_view_cell_get_child (cell),
                                                            GTK_TYPE_FILE_CHOOSER_WIDGET));
   if (!impl)
     return NULL;
@@ -2111,8 +2111,8 @@ column_view_get_location (GtkListItem *list_item,
 }
 
 static char *
-column_view_get_size (GtkListItem *item,
-                      GFileInfo   *info)
+column_view_get_size (GtkColumnViewCell *cell,
+                      GFileInfo         *info)
 {
   if (info && !_gtk_file_info_consider_as_directory (info))
     return g_format_size (g_file_info_get_size (info));
@@ -2121,8 +2121,8 @@ column_view_get_size (GtkListItem *item,
 }
 
 static char *
-column_view_get_tooltip_text (GtkListItem *list_item,
-                              GFileInfo   *info)
+column_view_get_tooltip_text (GtkColumnViewCell *cell,
+                              GFileInfo         *info)
 {
   GFile *file;
 
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 71a0d1d258..c3f193973b 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -330,25 +330,25 @@
                                                     <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkListItem">
+  <template class="GtkColumnViewCell">
     <property name="child">
       <object class="GtkFileChooserCell">
         <binding name="item">
-          <lookup name="item">GtkListItem</lookup>
+          <lookup name="item">GtkColumnViewCell</lookup>
         </binding>
-        <property name="list-item">GtkListItem</property>
+        <property name="list-item">GtkColumnViewCell</property>
         <child>
           <object class="GtkLabel">
             <property name="hexpand">1</property>
             <property name="xalign">0</property>
             <binding name="label">
               <closure type="gchararray" function="column_view_get_file_type">
-                <lookup name="item">GtkListItem</lookup>
+                <lookup name="item">GtkColumnViewCell</lookup>
               </closure>
             </binding>
             <binding name="tooltip-text">
               <closure type="gchararray" function="column_view_get_tooltip_text">
-                <lookup name="item">GtkListItem</lookup>
+                <lookup name="item">GtkColumnViewCell</lookup>
               </closure>
             </binding>
           </object>
@@ -680,19 +680,19 @@
         <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkListItem">
+  <template class="GtkColumnViewCell">
     <property name="child">
       <object class="GtkFileChooserCell">
         <binding name="item">
-          <lookup name="item">GtkListItem</lookup>
+          <lookup name="item">GtkColumnViewCell</lookup>
         </binding>
-        <property name="list-item">GtkListItem</property>
+        <property name="list-item">GtkColumnViewCell</property>
         <child>
           <object class="GtkBox">
             <property name="orientation">vertical</property>
             <binding name="tooltip-text">
               <closure type="gchararray" function="column_view_get_tooltip_text">
-                <lookup name="item">GtkListItem</lookup>
+                <lookup name="item">GtkColumnViewCell</lookup>
               </closure>
             </binding>
             <child>
@@ -701,7 +701,7 @@
                 <property name="margin-start">6</property>
                 <property name="margin-end">6</property>
                 <binding name="file-info">
-                  <lookup name="item">GtkListItem</lookup>
+                  <lookup name="item">GtkColumnViewCell</lookup>
                 </binding>
               </object>
             </child>
@@ -717,7 +717,7 @@
                 </attributes>
                 <binding name="label">
                   <closure type="gchararray" function="column_view_get_file_display_name">
-                    <lookup name="item">GtkListItem</lookup>
+                    <lookup name="item">GtkColumnViewCell</lookup>
                   </closure>
                 </binding>
               </object>