[glib] gio: Fix build on Windows



commit 3dd65859a7610b6adfd247c9c6828ed6c614e97f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Sep 18 17:05:49 2012 +0800

    gio: Fix build on Windows
    
    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

 gio/gio.symbols      |    2 ++
 gio/glocalfileinfo.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/gio/gio.symbols b/gio/gio.symbols
index 536f0d1..ab207fa 100644
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -161,8 +161,10 @@ g_content_type_is_unknown
 g_content_type_get_description
 g_content_type_get_mime_type
 g_content_type_get_icon
+#ifdef G_OS_UNIX
 g_content_type_get_symbolic_icon
 g_content_type_get_generic_icon_name
+#endif
 g_content_type_can_be_executable
 g_content_type_from_mime_type
 g_content_type_guess
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index ec1b936..1bff319 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -1525,9 +1525,11 @@ get_icon (const char *path,
     }
   else
     {
+#ifdef G_OS_UNIX
       if (use_symbolic)
         icon = g_content_type_get_symbolic_icon (content_type);
       else
+#endif
         icon = g_content_type_get_icon (content_type);
 
       if (G_IS_THEMED_ICON (icon) && is_folder)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]