diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-06-20 08:46:24 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-06-20 08:46:24 -0400 |
| commit | a31e8369f8deca6cb753be6d81e59caababcb043 (patch) | |
| tree | 456713b80821d2a61a9d1a489f5d77d664ca01d6 | |
| parent | 923eeda2d3cae13d02b0a9d2e5774b12eed999e0 (diff) | |
| download | gtk+-a31e8369f8deca6cb753be6d81e59caababcb043.tar.gz | |
Revert "Deprecate gtk_icon_theme_add_builtin_icon"
This reverts commit 923eeda2d3cae13d02b0a9d2e5774b12eed999e0.
| -rw-r--r-- | gtk/gtkicontheme.c | 5 | ||||
| -rw-r--r-- | gtk/gtkicontheme.h | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 203c1674a2..c23b300dc3 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -3542,8 +3542,6 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info) * The returned image must not be modified. * * Since: 2.4 - * - * Deprecated: 3.14: This function is deprecated. */ GdkPixbuf * gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info) @@ -4991,9 +4989,6 @@ gtk_icon_info_get_display_name (GtkIconInfo *icon_info) * via gdk_pixbuf_new_from_inline(). * * Since: 2.4 - * - * Deprecated: 3.14: Use gtk_icon_theme_add_resource_path() to add - * application-specific icons to the icon theme. */ void gtk_icon_theme_add_builtin_icon (const gchar *icon_name, diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h index e697731252..e37a52dd9d 100644 --- a/gtk/gtkicontheme.h +++ b/gtk/gtkicontheme.h @@ -270,7 +270,7 @@ char * gtk_icon_theme_get_example_icon_name (GtkIconTheme GDK_AVAILABLE_IN_ALL gboolean gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme); -GDK_DEPRECATED_IN_3_14_FOR(gtk_icon_theme_add_builtin_icon) +GDK_AVAILABLE_IN_ALL void gtk_icon_theme_add_builtin_icon (const gchar *icon_name, gint size, GdkPixbuf *pixbuf); @@ -292,7 +292,7 @@ GDK_AVAILABLE_IN_3_10 gint gtk_icon_info_get_base_scale (GtkIconInfo *icon_info); GDK_AVAILABLE_IN_ALL const gchar * gtk_icon_info_get_filename (GtkIconInfo *icon_info); -GDK_DEPRECATED_IN_3_14 +GDK_AVAILABLE_IN_ALL GdkPixbuf * gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info); GDK_AVAILABLE_IN_3_12 gboolean gtk_icon_info_is_symbolic (GtkIconInfo *icon_info); |