[GNUnet-SVN] r13397 - gnunet-gtk/src

[gnunet]

Author: grothoff
Date: 2010-10-26 15:07:33 +0200 (Tue, 26 Oct 2010)
New Revision: 13397

Modified:
   gnunet-gtk/src/main_window_file_publish.c
Log:
use proper mime type for directories - better

Modified: gnunet-gtk/src/main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/main_window_file_publish.c   2010-10-26 13:05:44 UTC (rev 
13396)
+++ gnunet-gtk/src/main_window_file_publish.c   2010-10-26 13:07:33 UTC (rev 
13397)
@@ -658,12 +658,22 @@
        }
     }
   ksk_uri = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
-  /* FIXME: modify ksk_uri based on md_no_ksk */
+  /* FIXME: modify ksk_uri based on md_no_ksk
+     => need additional fs_uri API function! */
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts),
                                  iter);
   row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts),
                                              path);
   gtk_tree_path_free (path);
+  if (S_ISDIR (sbuf.st_mode))
+    {
+      GNUNET_CONTAINER_meta_data_delete (meta,
+                                        EXTRACTOR_METATYPE_MIMETYPE,
+                                        NULL, 0);
+      GNUNET_FS_meta_data_make_directory (meta);
+      /* FIXME: add application/gnunet-directory to 
+        ksk_uri! => need additional fs_uri API function! */
+    }
   fi = GNUNET_FS_file_information_create_from_file (GNUNET_GTK_get_fs_handle 
(),
                                                    row_reference,
                                                    filename,
@@ -849,10 +859,6 @@
                                  &publish_entry,
                                  adc);      
       GNUNET_CONTAINER_multihashmap_destroy (adc->metamap);
-      GNUNET_CONTAINER_meta_data_delete (pd->meta,
-                                        EXTRACTOR_METATYPE_MIMETYPE,
-                                        NULL, 0);
-      GNUNET_FS_meta_data_make_directory (pd->meta);
       adc->metamap = mhm;
       adc->metacounter = mcm;
       adc->parent = parent;
@@ -868,7 +874,7 @@
                                             
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);  
          GNUNET_CONTAINER_meta_data_iterate (pd->meta,
                                              &add_to_meta_counter,
-                                             mcm);
+                                             mcm);       
        }
       else
        {