diff options
author | Matthias Clasen <mclasen@redhat.com> | 2014-06-20 00:49:25 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2014-06-30 17:17:49 -0400 |
commit | 5a548106b0b724530f8ea4f236c9b543d432db01 (patch) | |
tree | 014f05257ecfcc75fcd1a5d1ff0bb3cdaac93fc4 | |
parent | e9ac1bb4767b7139658fc2f5548c65a7baabb46b (diff) | |
download | gtk+-5a548106b0b724530f8ea4f236c9b543d432db01.tar.gz |
Deprecate gtk_icon_theme_add_builtin_icon
Builtin icons are deprecated in favor of loading icons
from resource paths.
-rw-r--r-- | gtk/gtkicontheme.c | 6 | ||||
-rw-r--r-- | gtk/gtkicontheme.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index f715af8acb..8ecfa90fc9 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -3585,6 +3585,9 @@ 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, use + * gtk_icon_theme_add_resource_path() instead of builtin icons. */ GdkPixbuf * gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info) @@ -5000,6 +5003,9 @@ 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 e37a52dd9d..e57c95c3dd 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_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_14_FOR(gtk_icon_theme_add_resource_path) 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_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_3_14 GdkPixbuf * gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info); GDK_AVAILABLE_IN_3_12 gboolean gtk_icon_info_is_symbolic (GtkIconInfo *icon_info); |