image: Remove GtkIconSet API

1 files changed, 0 insertions, 43 deletions

diff --git a/gtk/gtkimagedefinition.c b/gtk/gtkimagedefinition.c
index 1d6e7d41c9..9a8f50b4b9 100644
--- a/gtk/gtkimagedefinition.c
+++ b/gtk/gtkimagedefinition.c
@@ -19,12 +19,9 @@
 
 #include "gtkimagedefinitionprivate.h"
 
-#include "deprecated/gtkiconfactory.h"
-
 typedef struct _GtkImageDefinitionEmpty GtkImageDefinitionEmpty;
 typedef struct _GtkImageDefinitionPixbuf GtkImageDefinitionPixbuf;
 typedef struct _GtkImageDefinitionStock GtkImageDefinitionStock;
-typedef struct _GtkImageDefinitionIconSet GtkImageDefinitionIconSet;
 typedef struct _GtkImageDefinitionAnimation GtkImageDefinitionAnimation;
 typedef struct _GtkImageDefinitionIconName GtkImageDefinitionIconName;
 typedef struct _GtkImageDefinitionGIcon GtkImageDefinitionGIcon;
@@ -50,13 +47,6 @@ struct _GtkImageDefinitionStock {
   char *id;
 };
 
-struct _GtkImageDefinitionIconSet {
-  GtkImageType type;
-  gint ref_count;
-
-  GtkIconSet *icon_set;
-};
-
 struct _GtkImageDefinitionAnimation {
   GtkImageType type;
   gint ref_count;
@@ -92,7 +82,6 @@ union _GtkImageDefinition
   GtkImageDefinitionEmpty empty;
   GtkImageDefinitionPixbuf pixbuf;
   GtkImageDefinitionStock stock;
-  GtkImageDefinitionIconSet icon_set;
   GtkImageDefinitionAnimation animation;
   GtkImageDefinitionIconName icon_name;
   GtkImageDefinitionGIcon gicon;
@@ -114,7 +103,6 @@ gtk_image_definition_alloc (GtkImageType type)
     sizeof (GtkImageDefinitionEmpty),
     sizeof (GtkImageDefinitionPixbuf),
     sizeof (GtkImageDefinitionStock),
-    sizeof (GtkImageDefinitionIconSet),
     sizeof (GtkImageDefinitionAnimation),
     sizeof (GtkImageDefinitionIconName),
     sizeof (GtkImageDefinitionGIcon),
@@ -148,22 +136,6 @@ gtk_image_definition_new_pixbuf (GdkPixbuf *pixbuf,
 }
 
 GtkImageDefinition *
-gtk_image_definition_new_icon_set (GtkIconSet *icon_set)
-{
-  GtkImageDefinition *def;
-
-  if (icon_set == NULL)
-    return NULL;
-
-  def = gtk_image_definition_alloc (GTK_IMAGE_ICON_SET);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  def->icon_set.icon_set = gtk_icon_set_ref (icon_set);
-G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return def;
-}
-
-GtkImageDefinition *
 gtk_image_definition_new_animation (GdkPixbufAnimation *animation,
                                     int                 scale)
 {
@@ -252,11 +224,6 @@ gtk_image_definition_unref (GtkImageDefinition *def)
     case GTK_IMAGE_SURFACE:
       cairo_surface_destroy (def->surface.surface);
       break;
-    case GTK_IMAGE_ICON_SET:
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-      gtk_icon_set_unref (def->icon_set.icon_set);
-G_GNUC_END_IGNORE_DEPRECATIONS;
-      break;
     case GTK_IMAGE_ICON_NAME:
       g_free (def->icon_name.icon_name);
       break;
@@ -283,7 +250,6 @@ gtk_image_definition_get_scale (const GtkImageDefinition *def)
       g_assert_not_reached ();
     case GTK_IMAGE_EMPTY:
     case GTK_IMAGE_SURFACE:
-    case GTK_IMAGE_ICON_SET:
     case GTK_IMAGE_ICON_NAME:
     case GTK_IMAGE_GICON:
       return 1;
@@ -303,15 +269,6 @@ gtk_image_definition_get_pixbuf (const GtkImageDefinition *def)
   return def->pixbuf.pixbuf;
 }
 
-GtkIconSet *
-gtk_image_definition_get_icon_set (const GtkImageDefinition *def)
-{
-  if (def->type != GTK_IMAGE_ICON_SET)
-    return NULL;
-
-  return def->icon_set.icon_set;
-}
-
 GdkPixbufAnimation *
 gtk_image_definition_get_animation (const GtkImageDefinition *def)
 {