diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2022-12-07 12:42:42 +0100 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2022-12-07 12:42:42 +0100 |
commit | 1b04fcd97a64ec0689bb88dc0583539332474576 (patch) | |
tree | 5c3f6b1eabd52fda86ebdead6ba236e0a7448dde | |
parent | de7a481bd9424650fe5e91f1189733ad7d20ac89 (diff) | |
download | libgnunetchat-1b04fcd97a64ec0689bb88dc0583539332474576.tar.gz libgnunetchat-1b04fcd97a64ec0689bb88dc0583539332474576.zip |
Adjust code for GNUnet changes in release 0.19.0v0.1.2
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
-rw-r--r-- | src/gnunet_chat_context.h | 1 | ||||
-rw-r--r-- | src/gnunet_chat_file.c | 6 | ||||
-rw-r--r-- | src/gnunet_chat_file.h | 3 | ||||
-rw-r--r-- | src/gnunet_chat_group.h | 1 | ||||
-rw-r--r-- | src/gnunet_chat_handle.h | 2 | ||||
-rw-r--r-- | src/gnunet_chat_invitation.h | 2 | ||||
-rw-r--r-- | 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 index 66e777a..3b6e1bb 100644 --- a/src/gnunet_chat_context.h +++ b/src/gnunet_chat_context.h | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <gnunet/platform.h> | 28 | #include <gnunet/platform.h> |
29 | #include <gnunet/gnunet_common.h> | 29 | #include <gnunet/gnunet_common.h> |
30 | #include <gnunet/gnunet_configuration_lib.h> | 30 | #include <gnunet/gnunet_configuration_lib.h> |
31 | #include <gnunet/gnunet_container_lib.h> | ||
32 | #include <gnunet/gnunet_gnsrecord_lib.h> | 31 | #include <gnunet/gnunet_gnsrecord_lib.h> |
33 | #include <gnunet/gnunet_messenger_service.h> | 32 | #include <gnunet/gnunet_messenger_service.h> |
34 | #include <gnunet/gnunet_util_lib.h> | 33 | #include <gnunet/gnunet_util_lib.h> |
diff --git a/src/gnunet_chat_file.c b/src/gnunet_chat_file.c index e661d7e..279e369 100644 --- 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, | |||
45 | GNUNET_memcpy(&(file->key), &(message->key), sizeof(file->key)); | 45 | GNUNET_memcpy(&(file->key), &(message->key), sizeof(file->key)); |
46 | GNUNET_memcpy(&(file->hash), &(message->hash), sizeof(file->hash)); | 46 | GNUNET_memcpy(&(file->hash), &(message->hash), sizeof(file->hash)); |
47 | 47 | ||
48 | file->meta = GNUNET_CONTAINER_meta_data_create(); | 48 | file->meta = GNUNET_FS_meta_data_create(); |
49 | 49 | ||
50 | file->uri = GNUNET_FS_uri_parse(message->uri, NULL); | 50 | file->uri = GNUNET_FS_uri_parse(message->uri, NULL); |
51 | file->download = NULL; | 51 | file->download = NULL; |
@@ -89,7 +89,7 @@ file_create_from_disk (struct GNUNET_CHAT_Handle *handle, | |||
89 | GNUNET_memcpy(&(file->key), key, sizeof(file->key)); | 89 | GNUNET_memcpy(&(file->key), key, sizeof(file->key)); |
90 | GNUNET_memcpy(&(file->hash), hash, sizeof(file->hash)); | 90 | GNUNET_memcpy(&(file->hash), hash, sizeof(file->hash)); |
91 | 91 | ||
92 | file->meta = GNUNET_CONTAINER_meta_data_create(); | 92 | file->meta = GNUNET_FS_meta_data_create(); |
93 | 93 | ||
94 | file->uri = NULL; | 94 | file->uri = NULL; |
95 | file->download = NULL; | 95 | file->download = NULL; |
@@ -164,7 +164,7 @@ file_destroy (struct GNUNET_CHAT_File *file) | |||
164 | GNUNET_FS_uri_destroy(file->uri); | 164 | GNUNET_FS_uri_destroy(file->uri); |
165 | 165 | ||
166 | if (file->meta) | 166 | if (file->meta) |
167 | GNUNET_CONTAINER_meta_data_destroy(file->meta); | 167 | GNUNET_FS_meta_data_destroy(file->meta); |
168 | 168 | ||
169 | if (file->name) | 169 | if (file->name) |
170 | GNUNET_free(file->name); | 170 | GNUNET_free(file->name); |
diff --git a/src/gnunet_chat_file.h b/src/gnunet_chat_file.h index 5208f18..4a6bcd3 100644 --- a/src/gnunet_chat_file.h +++ b/src/gnunet_chat_file.h | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #include <gnunet/platform.h> | 28 | #include <gnunet/platform.h> |
29 | #include <gnunet/gnunet_common.h> | 29 | #include <gnunet/gnunet_common.h> |
30 | #include <gnunet/gnunet_crypto_lib.h> | ||
31 | #include <gnunet/gnunet_fs_service.h> | 30 | #include <gnunet/gnunet_fs_service.h> |
32 | #include <gnunet/gnunet_messenger_service.h> | 31 | #include <gnunet/gnunet_messenger_service.h> |
33 | #include <gnunet/gnunet_util_lib.h> | 32 | #include <gnunet/gnunet_util_lib.h> |
@@ -81,7 +80,7 @@ struct GNUNET_CHAT_File | |||
81 | struct GNUNET_HashCode hash; | 80 | struct GNUNET_HashCode hash; |
82 | struct GNUNET_CRYPTO_SymmetricSessionKey key; | 81 | struct GNUNET_CRYPTO_SymmetricSessionKey key; |
83 | 82 | ||
84 | struct GNUNET_CONTAINER_MetaData *meta; | 83 | struct GNUNET_FS_MetaData *meta; |
85 | 84 | ||
86 | struct GNUNET_FS_Uri *uri; | 85 | struct GNUNET_FS_Uri *uri; |
87 | struct GNUNET_FS_DownloadContext *download; | 86 | struct GNUNET_FS_DownloadContext *download; |
diff --git a/src/gnunet_chat_group.h b/src/gnunet_chat_group.h index af576a0..e3f7b6d 100644 --- a/src/gnunet_chat_group.h +++ b/src/gnunet_chat_group.h | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #include <gnunet/platform.h> | 28 | #include <gnunet/platform.h> |
29 | #include <gnunet/gnunet_common.h> | 29 | #include <gnunet/gnunet_common.h> |
30 | #include <gnunet/gnunet_container_lib.h> | ||
31 | #include <gnunet/gnunet_regex_service.h> | 30 | #include <gnunet/gnunet_regex_service.h> |
32 | #include <gnunet/gnunet_util_lib.h> | 31 | #include <gnunet/gnunet_util_lib.h> |
33 | 32 | ||
diff --git a/src/gnunet_chat_handle.h b/src/gnunet_chat_handle.h index 804b8ad..100140b 100644 --- a/src/gnunet_chat_handle.h +++ b/src/gnunet_chat_handle.h | |||
@@ -28,14 +28,12 @@ | |||
28 | #include <gnunet/platform.h> | 28 | #include <gnunet/platform.h> |
29 | #include <gnunet/gnunet_common.h> | 29 | #include <gnunet/gnunet_common.h> |
30 | #include <gnunet/gnunet_config.h> | 30 | #include <gnunet/gnunet_config.h> |
31 | #include <gnunet/gnunet_container_lib.h> | ||
32 | #include <gnunet/gnunet_arm_service.h> | 31 | #include <gnunet/gnunet_arm_service.h> |
33 | #include <gnunet/gnunet_fs_service.h> | 32 | #include <gnunet/gnunet_fs_service.h> |
34 | #include <gnunet/gnunet_gns_service.h> | 33 | #include <gnunet/gnunet_gns_service.h> |
35 | #include <gnunet/gnunet_identity_service.h> | 34 | #include <gnunet/gnunet_identity_service.h> |
36 | #include <gnunet/gnunet_messenger_service.h> | 35 | #include <gnunet/gnunet_messenger_service.h> |
37 | #include <gnunet/gnunet_namestore_service.h> | 36 | #include <gnunet/gnunet_namestore_service.h> |
38 | #include <gnunet/gnunet_scheduler_lib.h> | ||
39 | #include <gnunet/gnunet_util_lib.h> | 37 | #include <gnunet/gnunet_util_lib.h> |
40 | 38 | ||
41 | #include "gnunet_chat_lib.h" | 39 | #include "gnunet_chat_lib.h" |
diff --git a/src/gnunet_chat_invitation.h b/src/gnunet_chat_invitation.h index a0d76de..ff5ebc7 100644 --- a/src/gnunet_chat_invitation.h +++ b/src/gnunet_chat_invitation.h | |||
@@ -27,9 +27,7 @@ | |||
27 | 27 | ||
28 | #include <gnunet/platform.h> | 28 | #include <gnunet/platform.h> |
29 | #include <gnunet/gnunet_common.h> | 29 | #include <gnunet/gnunet_common.h> |
30 | #include <gnunet/gnunet_crypto_lib.h> | ||
31 | #include <gnunet/gnunet_messenger_service.h> | 30 | #include <gnunet/gnunet_messenger_service.h> |
32 | #include <gnunet/gnunet_peer_lib.h> | ||
33 | #include <gnunet/gnunet_util_lib.h> | 31 | #include <gnunet/gnunet_util_lib.h> |
34 | 32 | ||
35 | struct GNUNET_CHAT_Context; | 33 | struct GNUNET_CHAT_Context; |
diff --git a/src/gnunet_chat_util.h b/src/gnunet_chat_util.h index 9229586..80cd81b 100644 --- a/src/gnunet_chat_util.h +++ b/src/gnunet_chat_util.h | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | #include <gnunet/platform.h> | 28 | #include <gnunet/platform.h> |
29 | #include <gnunet/gnunet_common.h> | 29 | #include <gnunet/gnunet_common.h> |
30 | #include <gnunet/gnunet_crypto_lib.h> | ||
31 | #include <gnunet/gnunet_disk_lib.h> | ||
32 | #include <gnunet/gnunet_messenger_service.h> | 30 | #include <gnunet/gnunet_messenger_service.h> |
33 | #include <gnunet/gnunet_util_lib.h> | 31 | #include <gnunet/gnunet_util_lib.h> |
34 | 32 | ||