luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unconditionally use g_content_type_get_symbolic_icon()

Browse Source 
... and g_content_type_get_generic_icon_name(). The new functions are
implemented for Win32 since commit dace477c, so we no longer need to
guard them with G_OS_UNIX.
This commit is contained in:
Kalev Lember 2012-11-28 23:25:52 +01:00
parent c9affa778e
commit ce586ba991
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gio.symbols
View File

@ -165,10 +165,8 @@ g_content_type_is_unknown
g_content_type_get_description g_content_type_get_description
g_content_type_get_mime_type g_content_type_get_mime_type
g_content_type_get_icon g_content_type_get_icon
#ifdef G_OS_UNIX
g_content_type_get_symbolic_icon g_content_type_get_symbolic_icon
g_content_type_get_generic_icon_name g_content_type_get_generic_icon_name
#endif
g_content_type_can_be_executable g_content_type_can_be_executable
g_content_type_from_mime_type g_content_type_from_mime_type
g_content_type_guess g_content_type_guess

2
gio/glocalfileinfo.c
View File

@ -1535,11 +1535,9 @@ get_icon (const char *path,
} }
else else
{ {
#ifdef G_OS_UNIX
if (use_symbolic) if (use_symbolic)
icon = g_content_type_get_symbolic_icon (content_type); icon = g_content_type_get_symbolic_icon (content_type);
else else
#endif
icon = g_content_type_get_icon (content_type); icon = g_content_type_get_icon (content_type);
if (G_IS_THEMED_ICON (icon) && is_folder) if (G_IS_THEMED_ICON (icon) && is_folder)