-also user gnunet-original filename here more consistently

3 files changed, 4 insertions, 1 deletions

diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index c2ec01c04..b1051c8b6 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -315,7 +315,8 @@ GNUNET_CONTAINER_meta_data_insert (struct GNUNET_CONTAINER_MetaData *md,
   i->data = GNUNET_malloc (data_len);
   memcpy (i->data, data, data_len);
   /* change OS native dir separators to unix '/' and others to '_' */
-  if (type == EXTRACTOR_METATYPE_FILENAME)
+  if ( (type == EXTRACTOR_METATYPE_FILENAME) ||
+       (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) )
   {
     p = i->data;
     while ((*p != '\0') && (p < i->data + data_len))
diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c
index 356a83b6b..782a405fc 100644
--- a/src/util/pseudonym.c
+++ b/src/util/pseudonym.c
@@ -319,6 +319,7 @@ GNUNET_PSEUDONYM_id_to_name (const struct GNUNET_CONFIGURATION_Handle *cfg,
       name =
           GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
                                                          EXTRACTOR_METATYPE_TITLE,
+                                                         EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                                          EXTRACTOR_METATYPE_FILENAME,
                                                          EXTRACTOR_METATYPE_DESCRIPTION,
                                                          EXTRACTOR_METATYPE_SUBJECT,
diff --git a/src/util/strings.c b/src/util/strings.c
index 1a884bc75..8000a93fb 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -607,6 +607,7 @@ GNUNET_STRINGS_absolute_time_to_string (struct GNUNET_TIME_Absolute t)
   return ret;
 }
 
+
 /**
  * "man basename"
  * Returns a pointer to a part of filename (allocates nothing)!