-keep gtk-style mime detection on GNU as a backup

1 files changed, 18 insertions, 1 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 9fa89481..786f0fe2 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -1034,7 +1034,7 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
     gchar *fn;
     char *data;
     gsize data_size;
-    const char *mime;
+    char *mime;
     GFile *f;
 
     fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER
@@ -1050,10 +1050,27 @@ file_information_update (void *cls, struct GNUNET_FS_FileInformation *fi,
     else
     {
       mime = get_mime_type (data, data_size);
+#if LINUX
+      if (NULL == mime)
+      {
+        /* fall back to Gtk mime-detection; this only works on GNU */
+        GFileInfo *finfo;
+        const char *gmime;
+        
+        finfo = g_file_query_info (f, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 
+                                   0, NULL, NULL);
+        gmime = g_file_info_get_attribute_string (finfo,
+                                                  G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
+        if (NULL != gmime)
+          mime = GNUNET_strdup (gmime);
+        g_object_unref (finfo);
+      }
+#endif
       GNUNET_CONTAINER_meta_data_insert (meta, "<user>",
                                          EXTRACTOR_METATYPE_THUMBNAIL,
                                          EXTRACTOR_METAFORMAT_BINARY, mime,
                                          data, data_size);
+      GNUNET_free_non_null (mime);
     }
     g_object_unref (f);
     g_free (fn);