aboutsummaryrefslogtreecommitdiff
path: root/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs/gnunet-fs-gtk_publish-edit-dialog.c')
-rw-r--r--src/fs/gnunet-fs-gtk_publish-edit-dialog.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index aff28a5c..f54cecdc 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -236,7 +236,7 @@ struct EditPublicationDialogContext
236 /** 236 /**
237 * Briefly used temporary meta data set. 237 * Briefly used temporary meta data set.
238 */ 238 */
239 struct GNUNET_CONTAINER_MetaData *md; 239 struct GNUNET_FS_MetaData *md;
240 240
241 /** 241 /**
242 * Information about the file being published as seen by the FS-API. 242 * Information about the file being published as seen by the FS-API.
@@ -906,7 +906,7 @@ preserve_meta_items (void *cls,
906 } 906 }
907 if (GNUNET_YES == keep) 907 if (GNUNET_YES == keep)
908 GNUNET_break (GNUNET_OK == 908 GNUNET_break (GNUNET_OK ==
909 GNUNET_CONTAINER_meta_data_insert (ctx->md, 909 GNUNET_FS_meta_data_insert (ctx->md,
910 plugin_name, 910 plugin_name,
911 type, 911 type,
912 format, 912 format,
@@ -1002,7 +1002,7 @@ static int
1002file_information_update (void *cls, 1002file_information_update (void *cls,
1003 struct GNUNET_FS_FileInformation *fi, 1003 struct GNUNET_FS_FileInformation *fi,
1004 uint64_t length, 1004 uint64_t length,
1005 struct GNUNET_CONTAINER_MetaData *meta, 1005 struct GNUNET_FS_MetaData *meta,
1006 struct GNUNET_FS_Uri **uri, 1006 struct GNUNET_FS_Uri **uri,
1007 struct GNUNET_FS_BlockOptions *bo, 1007 struct GNUNET_FS_BlockOptions *bo,
1008 int *do_index, 1008 int *do_index,
@@ -1048,13 +1048,13 @@ file_information_update (void *cls,
1048 } 1048 }
1049 1049
1050 /* update meta data; first, we copy the unchanged values from the original meta data */ 1050 /* update meta data; first, we copy the unchanged values from the original meta data */
1051 ctx->md = GNUNET_CONTAINER_meta_data_create (); 1051 ctx->md = GNUNET_FS_meta_data_create ();
1052 GNUNET_CONTAINER_meta_data_iterate (meta, &preserve_meta_items, ctx); 1052 GNUNET_FS_meta_data_iterate (meta, &preserve_meta_items, ctx);
1053 /* clear original meta data */ 1053 /* clear original meta data */
1054 GNUNET_CONTAINER_meta_data_clear (meta); 1054 GNUNET_FS_meta_data_clear (meta);
1055 /* add all of the 'preserved' values */ 1055 /* add all of the 'preserved' values */
1056 GNUNET_CONTAINER_meta_data_merge (meta, ctx->md); 1056 GNUNET_FS_meta_data_merge (meta, ctx->md);
1057 GNUNET_CONTAINER_meta_data_destroy (ctx->md); 1057 GNUNET_FS_meta_data_destroy (ctx->md);
1058 ctx->md = NULL; 1058 ctx->md = NULL;
1059 /* now add all of the values from the model; adding will simply do 1059 /* now add all of the values from the model; adding will simply do
1060 nothing for values that are already in the set because they were preserved */ 1060 nothing for values that are already in the set because they were preserved */
@@ -1078,7 +1078,7 @@ file_information_update (void *cls,
1078 -1); 1078 -1);
1079 if (ntype > 0) 1079 if (ntype > 0)
1080 { 1080 {
1081 GNUNET_CONTAINER_meta_data_insert (meta, 1081 GNUNET_FS_meta_data_insert (meta,
1082 "<user>", 1082 "<user>",
1083 ntype, 1083 ntype,
1084 nformat, 1084 nformat,
@@ -1134,7 +1134,7 @@ file_information_update (void *cls,
1134 g_object_unref (finfo); 1134 g_object_unref (finfo);
1135 } 1135 }
1136#endif 1136#endif
1137 GNUNET_CONTAINER_meta_data_insert (meta, 1137 GNUNET_FS_meta_data_insert (meta,
1138 "<user>", 1138 "<user>",
1139 EXTRACTOR_METATYPE_THUMBNAIL, 1139 EXTRACTOR_METATYPE_THUMBNAIL,
1140 EXTRACTOR_METAFORMAT_BINARY, 1140 EXTRACTOR_METAFORMAT_BINARY,
@@ -1258,7 +1258,7 @@ static int
1258file_information_import (void *cls, 1258file_information_import (void *cls,
1259 struct GNUNET_FS_FileInformation *fi, 1259 struct GNUNET_FS_FileInformation *fi,
1260 uint64_t length, 1260 uint64_t length,
1261 struct GNUNET_CONTAINER_MetaData *meta, 1261 struct GNUNET_FS_MetaData *meta,
1262 struct GNUNET_FS_Uri **uri, 1262 struct GNUNET_FS_Uri **uri,
1263 struct GNUNET_FS_BlockOptions *bo, 1263 struct GNUNET_FS_BlockOptions *bo,
1264 int *do_index, 1264 int *do_index,
@@ -1287,7 +1287,7 @@ file_information_import (void *cls,
1287 /* import meta data */ 1287 /* import meta data */
1288 if (NULL != meta) 1288 if (NULL != meta)
1289 { 1289 {
1290 GNUNET_CONTAINER_meta_data_iterate (meta, 1290 GNUNET_FS_meta_data_iterate (meta,
1291 &GNUNET_FS_GTK_add_meta_data_to_list_store, 1291 &GNUNET_FS_GTK_add_meta_data_to_list_store,
1292 ctx->meta_liststore); 1292 ctx->meta_liststore);
1293 pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta); 1293 pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
@@ -1299,7 +1299,7 @@ file_information_import (void *cls,
1299 1299
1300 /* Also update window title based on filename */ 1300 /* Also update window title based on filename */
1301 gtk_window_set_title (ctx->edit_publication_window, _ ("<unnamed>")); 1301 gtk_window_set_title (ctx->edit_publication_window, _ ("<unnamed>"));
1302 GNUNET_CONTAINER_meta_data_iterate (meta, 1302 GNUNET_FS_meta_data_iterate (meta,
1303 &set_window_title_to_filename, 1303 &set_window_title_to_filename,
1304 ctx->edit_publication_window); 1304 ctx->edit_publication_window);
1305 return GNUNET_SYSERR; /* only visit top-level item */ 1305 return GNUNET_SYSERR; /* only visit top-level item */