AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Deprecate gtk_icon_theme_add_builtin_icon"

Browse Source 
This reverts commit 923eeda2d3.
This commit is contained in:
Matthias Clasen 2014-06-20 08:46:24 -04:00
parent 923eeda2d3
commit a31e8369f8
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkicontheme.c
View File

@ -3542,8 +3542,6 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
* The returned image must not be modified. * The returned image must not be modified.
* *
* Since: 2.4 * Since: 2.4
*
* Deprecated: 3.14: This function is deprecated.
*/ */
GdkPixbuf * GdkPixbuf *
gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info) 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(). * via gdk_pixbuf_new_from_inline().
* *
* Since: 2.4 * Since: 2.4
*
* Deprecated: 3.14: Use gtk_icon_theme_add_resource_path() to add
* application-specific icons to the icon theme.
*/ */
void void
gtk_icon_theme_add_builtin_icon (const gchar *icon_name, gtk_icon_theme_add_builtin_icon (const gchar *icon_name,

4
gtk/gtkicontheme.h
View File

@ -270,7 +270,7 @@ char * gtk_icon_theme_get_example_icon_name (GtkIconTheme
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gboolean gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme); 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, void gtk_icon_theme_add_builtin_icon (const gchar *icon_name,
gint size, gint size,
GdkPixbuf *pixbuf); GdkPixbuf *pixbuf);
@ -292,7 +292,7 @@ GDK_AVAILABLE_IN_3_10
gint gtk_icon_info_get_base_scale (GtkIconInfo *icon_info); gint gtk_icon_info_get_base_scale (GtkIconInfo *icon_info);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
const gchar * gtk_icon_info_get_filename (GtkIconInfo *icon_info); 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); GdkPixbuf * gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info);
GDK_AVAILABLE_IN_3_12 GDK_AVAILABLE_IN_3_12
gboolean gtk_icon_info_is_symbolic (GtkIconInfo *icon_info); gboolean gtk_icon_info_is_symbolic (GtkIconInfo *icon_info);