filesystem: Drop surface-based APIs

These are no longer used.

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 8a2fc3b0aff6ccb257e2c5a367ad7c85251e9e46..21f12d7b72fea2258a8941d22c4daa03f777a9ad 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -702,49 +702,6 @@ _gtk_file_system_volume_get_root (GtkFileSystemVolume *volume)
   return file;
 }
 
-static cairo_surface_t *
-get_surface_from_gicon (GIcon      *icon,
-                       GtkWidget  *widget,
-                       gint        icon_size,
-                       GError    **error)
-{
-  GtkStyleContext *context;
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  GdkPixbuf *pixbuf;
-  cairo_surface_t *surface;
-
-  context = gtk_widget_get_style_context (widget);
-  icon_theme = gtk_css_icon_theme_value_get_icon_theme
-    (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_THEME));
-
-  icon_info = gtk_icon_theme_lookup_by_gicon_for_scale (icon_theme,
-                                                        icon,
-                                                        icon_size,
-                                                        gtk_widget_get_scale_factor (widget),
-                                                        GTK_ICON_LOOKUP_USE_BUILTIN);
-
-  if (!icon_info)
-    return NULL;
-
-  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info,
-                                                    context,
-                                                    NULL,
-                                                    error);
-
-  g_object_unref (icon_info);
-
-  if (pixbuf == NULL)
-    return NULL;
-
-  surface = gdk_cairo_surface_create_from_pixbuf (pixbuf,
-                                                  gtk_widget_get_scale_factor (widget),
-                                                 gtk_widget_get_window (widget));
-  g_object_unref (pixbuf);
-
-  return surface;
-}
-
 GIcon *
 _gtk_file_system_volume_get_icon (GtkFileSystemVolume *volume)
 {
@@ -762,27 +719,6 @@ _gtk_file_system_volume_get_icon (GtkFileSystemVolume *volume)
   return icon;
 }
 
-cairo_surface_t *
-_gtk_file_system_volume_render_icon (GtkFileSystemVolume  *volume,
-                                    GtkWidget            *widget,
-                                    gint                  icon_size,
-                                    GError              **error)
-{
-  GIcon *icon = NULL;
-  cairo_surface_t *surface;
-
-  icon = _gtk_file_system_volume_get_icon (volume);
-
-  if (!icon)
-    return NULL;
-
-  surface = get_surface_from_gicon (icon, widget, icon_size, error);
-
-  g_object_unref (icon);
-
-  return surface;
-}
-
 GIcon *
 _gtk_file_system_volume_get_symbolic_icon (GtkFileSystemVolume *volume)
 {
@@ -826,60 +762,6 @@ _gtk_file_system_volume_unref (GtkFileSystemVolume *volume)
 }
 
 /* GFileInfo helper functions */
-static cairo_surface_t *
-_gtk_file_info_render_icon_internal (GFileInfo *info,
-                                    GtkWidget *widget,
-                                    gint       icon_size,
-                                     gboolean   symbolic)
-{
-  GIcon *icon;
-  GdkPixbuf *pixbuf;
-  const gchar *thumbnail_path;
-  cairo_surface_t *surface = NULL;
-  int scale;
-
-  thumbnail_path = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH);
-
-  if (thumbnail_path)
-    {
-      scale = gtk_widget_get_scale_factor (widget);
-      pixbuf = gdk_pixbuf_new_from_file_at_size (thumbnail_path,
-                                                icon_size*scale, icon_size*scale,
-                                                NULL);
-
-      if (pixbuf != NULL)
-        {
-          surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale,
-                                                          gtk_widget_get_window (widget));
-          g_object_unref (pixbuf);
-        }
-    }
-
-  if (!surface)
-    {
-      if (symbolic)
-        icon = g_file_info_get_symbolic_icon (info);
-      else
-        icon = g_file_info_get_icon (info);
-
-      if (icon)
-       surface = get_surface_from_gicon (icon, widget, icon_size, NULL);
-
-      if (!surface)
-       {
-          /* Use general fallback for all files without icon */
-          if (symbolic)
-           icon = g_themed_icon_new ("text-x-generic-symbolic");
-          else
-           icon = g_themed_icon_new ("text-x-generic");
-         surface = get_surface_from_gicon (icon, widget, icon_size, NULL);
-         g_object_unref (icon);
-       }
-    }
-
-  return surface;
-}
-
 GIcon *
 _gtk_file_info_get_icon (GFileInfo *info,
                         int        icon_size,
@@ -910,14 +792,6 @@ _gtk_file_info_get_icon (GFileInfo *info,
   return icon;
 }
 
-cairo_surface_t *
-_gtk_file_info_render_icon (GFileInfo *info,
-                           GtkWidget *widget,
-                           gint       icon_size)
-{
-  return _gtk_file_info_render_icon_internal (info, widget, icon_size, FALSE);
-}
-
 gboolean
 _gtk_file_info_consider_as_directory (GFileInfo *info)
 {

diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index 0a3db1aae6fd4f8b952ed8164a0f70c2199f6324..c734dfcede5d402d6be7a76c2a1ebd12780161b3 100644 (file)
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -95,18 +95,11 @@ gboolean              _gtk_file_system_volume_is_mounted       (GtkFileSystemVol
 GFile *               _gtk_file_system_volume_get_root         (GtkFileSystemVolume *volume);
 GIcon *               _gtk_file_system_volume_get_symbolic_icon (GtkFileSystemVolume *volume);
 GIcon *               _gtk_file_system_volume_get_icon          (GtkFileSystemVolume *volume);
-cairo_surface_t *     _gtk_file_system_volume_render_icon      (GtkFileSystemVolume  *volume,
-                                                               GtkWidget            *widget,
-                                                               gint                  icon_size,
-                                                               GError              **error);
 
 GtkFileSystemVolume  *_gtk_file_system_volume_ref              (GtkFileSystemVolume *volume);
 void                  _gtk_file_system_volume_unref            (GtkFileSystemVolume *volume);
 
 /* GFileInfo helper functions */
-cairo_surface_t *     _gtk_file_info_render_icon (GFileInfo *info,
-                                                 GtkWidget *widget,
-                                                 gint       icon_size);
 GIcon *               _gtk_file_info_get_icon    (GFileInfo *info,
                                                   int        icon_size,
                                                   int        scale);