From 59af132947e9f295f6b8f65453e6060346bba455 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Mon, 8 Jul 2013 16:25:18 +0000 Subject: [PATCH] replace deprecated gtk_icon_info_free() calls with g_object_unref() in GTK+ >= 3.8.0 --- gtk/icons.c | 4 ++++ gtk/tr-icon.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gtk/icons.c b/gtk/icons.c index 52314baea..0a1664da3 100644 --- a/gtk/icons.c +++ b/gtk/icons.c @@ -142,7 +142,11 @@ get_themed_icon_pixbuf (GThemedIcon * icon, g_clear_error (&error); } +#if GTK_CHECK_VERSION(3,8,0) + g_object_unref (icon_info); +#else gtk_icon_info_free (icon_info); +#endif g_strfreev (icon_names); return pixbuf; diff --git a/gtk/tr-icon.c b/gtk/tr-icon.c index d826ab3ed..7750bceb8 100644 --- a/gtk/tr-icon.c +++ b/gtk/tr-icon.c @@ -132,7 +132,11 @@ getIconName (void) { GtkIconInfo * icon_info = gtk_icon_theme_lookup_icon (theme, TRAY_ICON, 48, GTK_ICON_LOOKUP_USE_BUILTIN); const gboolean icon_is_builtin = gtk_icon_info_get_filename (icon_info) == NULL; - gtk_icon_info_free (icon_info); +#if GTK_CHECK_VERSION(3,8,0) + g_object_unref (icon_info); +#else + gtk_icon_info_free (icon_info); +#endif icon_name = icon_is_builtin ? ICON_NAME : TRAY_ICON; }