luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-03 19:30:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio: Fix build on Windows

Browse Source 
The newly-introduced functions, g_content_type_get_symbolic_icon() and
g_content_type_get_generic_icon_name() don't seem to be for Windows, at
least for now.  So filter them out from gio.symbols on Windows.

Also, glocalfileinfo.c calls g_content_type_get_symbolic_icon() in
get_icon(), so only build that code when on Unix, for the time being.

https://bugzilla.gnome.org/show_bug.cgi?id=684278
This commit is contained in:
Chun-wei Fan 2012-09-18 17:05:49 +08:00
parent 18143b7aef
commit 3dd65859a7
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gio.symbols
View File

@ -161,8 +161,10 @@ 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

@ -1525,9 +1525,11 @@ 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)