Deprecate GtkNumerableIcon

It was a failed experiment, it is basically unused, and it complicates
code in GtkIconTheme that we want to rework.

6 files changed, 18 insertions, 18 deletions

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index a33797d824..c30ca465a7 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -322,6 +322,7 @@
       <xi:include href="xml/gtkactivatable.xml" />
       <xi:include href="xml/gtkimagemenuitem.xml" />
       <xi:include href="xml/gtkstock.xml" />
+      <xi:include href="xml/gtknumerableicon.xml" />
     </chapter>
 
   </part>
@@ -352,7 +353,6 @@
     <xi:include href="xml/gtkwidgetpath.xml" />
     <xi:include href="xml/gtkicontheme.xml" />
     <xi:include href="xml/gtkiconfactory.xml" />
-    <xi:include href="xml/gtknumerableicon.xml" />
   </part>
 
   <part id="migrating">
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 38a2492da8..e4653d0d5f 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -171,6 +171,7 @@ deprecated_h_sources = 			\
 	deprecated/gtkhsv.h		\
 	deprecated/gtkiconfactory.h	\
 	deprecated/gtkimagemenuitem.h	\
+	deprecated/gtknumerableicon.h	\
 	deprecated/gtkradioaction.h	\
 	deprecated/gtkrc.h		\
 	deprecated/gtkrecentaction.h	\
@@ -190,6 +191,7 @@ deprecated_h_sources = 			\
 
 deprecated_private_h_sources =			\
 	deprecated/gtkgradientprivate.h		\
+	deprecated/gtknumerableiconprivate.h	\
 	deprecated/gtksymboliccolorprivate.h
 
 gtk_public_h_sources = 		\
@@ -305,7 +307,6 @@ gtk_public_h_sources = 		\
 	gtkmodules.h		\
 	gtkmountoperation.h	\
 	gtknotebook.h		\
-	gtknumerableicon.h	\
 	gtkoffscreenwindow.h	\
 	gtkorientable.h		\
 	gtkoverlay.h		\
@@ -522,7 +523,6 @@ gtk_private_h_sources =		\
 	gtkmodifierstyle.h	\
 	gtkmodulesprivate.h	\
 	gtkmountoperationprivate.h \
-	gtknumerableiconprivate.h \
 	gtkorientableprivate.h	\
 	gtkpango.h		\
 	gtkpathbar.h		\
@@ -596,6 +596,7 @@ deprecated_c_sources = 			\
 	deprecated/gtkhsv.c		\
 	deprecated/gtkiconfactory.c	\
 	deprecated/gtkimagemenuitem.c	\
+	deprecated/gtknumerableicon.c	\
 	deprecated/gtkradioaction.c	\
 	deprecated/gtkrc.c		\
 	deprecated/gtkrecentaction.c	\
@@ -806,7 +807,6 @@ gtk_base_c_sources = 		\
 	gtkmodules.c		\
 	gtkmountoperation.c	\
 	gtknotebook.c		\
-	gtknumerableicon.c	\
 	gtkoffscreenwindow.c	\
 	gtkorientable.c		\
 	gtkoverlay.c		\
diff --git a/gtk/gtknumerableicon.c b/gtk/deprecated/gtknumerableicon.c
index 836e1a7104..836e1a7104 100644
--- a/gtk/gtknumerableicon.c
+++ b/gtk/deprecated/gtknumerableicon.c
diff --git a/gtk/gtknumerableicon.h b/gtk/deprecated/gtknumerableicon.h
index b05f4b4a22..2dd3687683 100644
--- a/gtk/gtknumerableicon.h
+++ b/gtk/deprecated/gtknumerableicon.h
@@ -56,43 +56,43 @@ struct _GtkNumerableIconClass {
   gpointer padding[16];
 };
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GType             gtk_numerable_icon_get_type                 (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GIcon *           gtk_numerable_icon_new                      (GIcon            *base_icon);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GIcon *           gtk_numerable_icon_new_with_style_context   (GIcon            *base_icon,
                                                                GtkStyleContext  *context);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GtkStyleContext * gtk_numerable_icon_get_style_context        (GtkNumerableIcon *self);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void              gtk_numerable_icon_set_style_context        (GtkNumerableIcon *self,
                                                                GtkStyleContext  *style);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 gint              gtk_numerable_icon_get_count                (GtkNumerableIcon *self);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void              gtk_numerable_icon_set_count                (GtkNumerableIcon *self,
                                                                gint count);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 const gchar *     gtk_numerable_icon_get_label                (GtkNumerableIcon *self);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void              gtk_numerable_icon_set_label                (GtkNumerableIcon *self,
                                                                const gchar      *label);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void              gtk_numerable_icon_set_background_gicon     (GtkNumerableIcon *self,
                                                                GIcon            *icon);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 GIcon *           gtk_numerable_icon_get_background_gicon     (GtkNumerableIcon *self);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 void              gtk_numerable_icon_set_background_icon_name (GtkNumerableIcon *self,
                                                                const gchar      *icon_name);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_14
 const gchar *     gtk_numerable_icon_get_background_icon_name (GtkNumerableIcon *self);
 
 G_END_DECLS
diff --git a/gtk/gtknumerableiconprivate.h b/gtk/deprecated/gtknumerableiconprivate.h
index cea6d6488f..cea6d6488f 100644
--- a/gtk/gtknumerableiconprivate.h
+++ b/gtk/deprecated/gtknumerableiconprivate.h
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 16357c1486..ae8f932d29 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -136,7 +136,6 @@
 #include <gtk/gtkmodules.h>
 #include <gtk/gtkmountoperation.h>
 #include <gtk/gtknotebook.h>
-#include <gtk/gtknumerableicon.h>
 #include <gtk/gtkoffscreenwindow.h>
 #include <gtk/gtkorientable.h>
 #include <gtk/gtkoverlay.h>
@@ -242,6 +241,7 @@
 #include <gtk/deprecated/gtkhseparator.h>
 #include <gtk/deprecated/gtkiconfactory.h>
 #include <gtk/deprecated/gtkimagemenuitem.h>
+#include <gtk/deprecated/gtknumerableicon.h>
 #include <gtk/deprecated/gtkradioaction.h>
 #include <gtk/deprecated/gtkrc.h>
 #include <gtk/deprecated/gtkrecentaction.h>