callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two potential critical warnings. Bug #539470.

Browse Source 
2008-06-27  Carlos Garnacho  <carlos@imendio.com>

        * gtk/gtkrecentmanager.c (get_icon_for_mime_type): Fix two potential
        critical warnings. Bug #539470.

svn path=/trunk/; revision=20696
This commit is contained in:
Carlos Garnacho
2008-06-27 15:33:42 +00:00
committed by Carlos Garnacho
parent e27632cd6d
commit b3bb8c47b5
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-27 Carlos Garnacho <carlos@imendio.com>
* gtk/gtkrecentmanager.c (get_icon_for_mime_type): Fix two potential
critical warnings. Bug #539470.
2008-06-27 Emmanuele Bassi <ebassi@gnome.org> 2008-06-27 Emmanuele Bassi <ebassi@gnome.org>
Abstract some GdkWindow API into an interface that the backends Abstract some GdkWindow API into an interface that the backends

11
gtk/gtkrecentmanager.c
View File

@ -1889,15 +1889,22 @@ get_icon_for_mime_type (const char *mime_type,
icon_theme = gtk_icon_theme_get_default (); icon_theme = gtk_icon_theme_get_default ();
content_type = g_content_type_from_mime_type (mime_type); content_type = g_content_type_from_mime_type (mime_type);
if (!content_type)
return NULL;
icon = g_content_type_get_icon (content_type); icon = g_content_type_get_icon (content_type);
info = gtk_icon_theme_lookup_by_gicon (icon_theme, info = gtk_icon_theme_lookup_by_gicon (icon_theme,
icon, icon,
pixel_size, pixel_size,
GTK_ICON_LOOKUP_USE_BUILTIN); GTK_ICON_LOOKUP_USE_BUILTIN);
pixbuf = gtk_icon_info_load_icon (info, NULL);
g_free (content_type); g_free (content_type);
g_object_unref (icon); g_object_unref (icon);
if (!info)
return NULL;
pixbuf = gtk_icon_info_load_icon (info, NULL);
gtk_icon_info_free (info); gtk_icon_info_free (info);
return pixbuf; return pixbuf;