libgnunetchat

commit 1b04fcd97a64ec0689bb88dc0583539332474576
parent de7a481bd9424650fe5e91f1189733ad7d20ac89
Author: TheJackiMonster <thejackimonster@gmail.com>
Date:   Wed,  7 Dec 2022 12:42:42 +0100

Adjust code for GNUnet changes in release 0.19.0

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

Diffstat:
M
src/gnunet_chat_context.h
 | 
1
-
M
src/gnunet_chat_file.c
 | 
6
+++---
M
src/gnunet_chat_file.h
 | 
3
+--
M
src/gnunet_chat_group.h
 | 
1
-
M
src/gnunet_chat_handle.h
 | 
2
--
M
src/gnunet_chat_invitation.h
 | 
2
--
M
src/gnunet_chat_util.h
 | 
2
--

7 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/gnunet_chat_context.h b/src/gnunet_chat_context.h
@@ -28,7 +28,6 @@
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_configuration_lib.h>
-#include <gnunet/gnunet_container_lib.h>
 #include <gnunet/gnunet_gnsrecord_lib.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>
diff --git a/src/gnunet_chat_file.c b/src/gnunet_chat_file.c
@@ -45,7 +45,7 @@ file_create_from_message (struct GNUNET_CHAT_Handle *handle,
   GNUNET_memcpy(&(file->key), &(message->key), sizeof(file->key));
   GNUNET_memcpy(&(file->hash), &(message->hash), sizeof(file->hash));
 
-  file->meta = GNUNET_CONTAINER_meta_data_create();
+  file->meta = GNUNET_FS_meta_data_create();
 
   file->uri = GNUNET_FS_uri_parse(message->uri, NULL);
   file->download = NULL;
@@ -89,7 +89,7 @@ file_create_from_disk (struct GNUNET_CHAT_Handle *handle,
   GNUNET_memcpy(&(file->key), key, sizeof(file->key));
   GNUNET_memcpy(&(file->hash), hash, sizeof(file->hash));
 
-  file->meta = GNUNET_CONTAINER_meta_data_create();
+  file->meta = GNUNET_FS_meta_data_create();
 
   file->uri = NULL;
   file->download = NULL;
@@ -164,7 +164,7 @@ file_destroy (struct GNUNET_CHAT_File *file)
     GNUNET_FS_uri_destroy(file->uri);
 
   if (file->meta)
-    GNUNET_CONTAINER_meta_data_destroy(file->meta);
+    GNUNET_FS_meta_data_destroy(file->meta);
 
   if (file->name)
     GNUNET_free(file->name);
diff --git a/src/gnunet_chat_file.h b/src/gnunet_chat_file.h
@@ -27,7 +27,6 @@
 
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_crypto_lib.h>
 #include <gnunet/gnunet_fs_service.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>
@@ -81,7 +80,7 @@ struct GNUNET_CHAT_File
   struct GNUNET_HashCode hash;
   struct GNUNET_CRYPTO_SymmetricSessionKey key;
 
-  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_MetaData *meta;
 
   struct GNUNET_FS_Uri *uri;
   struct GNUNET_FS_DownloadContext *download;
diff --git a/src/gnunet_chat_group.h b/src/gnunet_chat_group.h
@@ -27,7 +27,6 @@
 
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_container_lib.h>
 #include <gnunet/gnunet_regex_service.h>
 #include <gnunet/gnunet_util_lib.h>
 
diff --git a/src/gnunet_chat_handle.h b/src/gnunet_chat_handle.h
@@ -28,14 +28,12 @@
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_config.h>
-#include <gnunet/gnunet_container_lib.h>
 #include <gnunet/gnunet_arm_service.h>
 #include <gnunet/gnunet_fs_service.h>
 #include <gnunet/gnunet_gns_service.h>
 #include <gnunet/gnunet_identity_service.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_namestore_service.h>
-#include <gnunet/gnunet_scheduler_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
 #include "gnunet_chat_lib.h"
diff --git a/src/gnunet_chat_invitation.h b/src/gnunet_chat_invitation.h
@@ -27,9 +27,7 @@
 
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_crypto_lib.h>
 #include <gnunet/gnunet_messenger_service.h>
-#include <gnunet/gnunet_peer_lib.h>
 #include <gnunet/gnunet_util_lib.h>
 
 struct GNUNET_CHAT_Context;
diff --git a/src/gnunet_chat_util.h b/src/gnunet_chat_util.h
@@ -27,8 +27,6 @@
 
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_crypto_lib.h>
-#include <gnunet/gnunet_disk_lib.h>
 #include <gnunet/gnunet_messenger_service.h>
 #include <gnunet/gnunet_util_lib.h>