]> granicus.if.org Git - transmission/commitdiff
replace deprecated gtk_icon_info_free() calls with g_object_unref() in GTK+ >= 3.8.0
authorJordan Lee <jordan@transmissionbt.com>
Mon, 8 Jul 2013 16:25:18 +0000 (16:25 +0000)
committerJordan Lee <jordan@transmissionbt.com>
Mon, 8 Jul 2013 16:25:18 +0000 (16:25 +0000)
gtk/icons.c
gtk/tr-icon.c

index 52314baea866de81f7bf146b53cf3051caa6fcdd..0a1664da3b442de902297330e44a35a40c308543 100644 (file)
@@ -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;
index d826ab3eda179f0f2abf50931e798716675668b7..7750bceb812a426550578b700c7aa5c93374aa50 100644 (file)
@@ -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;
     }