[gnunet-gtk] branch master updated: -fix symbol renames that caused FTBFS

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new 9e8f18c4 -fix symbol renames that caused FTBFS
9e8f18c4 is described below

commit 9e8f18c435bdb4a75f98b8f1ba7c794899bfb0f3
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Thu Dec 7 01:27:44 2023 +0900

    -fix symbol renames that caused FTBFS
---
 src/fs/gnunet-fs-gtk.c                    |  2 +-
 src/fs/gnunet-fs-gtk.h                    |  2 +-
 src/fs/gnunet-fs-gtk_common.c             |  4 ++--
 src/fs/gnunet-fs-gtk_main-window-search.c |  8 ++++----
 src/fs/gnunet-fs-gtk_publish-dialog.c     | 16 ++++++++--------
 src/peerinfo/Makefile.am                  |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index c0e52797..44f83a84 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -660,7 +660,7 @@ monitor_zone_sync (void *cls)
  */
 static void
 monitor_zone_records (void *cls,
-                      const struct GNUNET_IDENTITY_PrivateKey *zone,
+                      const struct GNUNET_CRYPTO_PrivateKey *zone,
                       const char *label,
                       unsigned int rd_count,
                       const struct GNUNET_GNSRECORD_Data *rd)
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index 4a323459..46e585f5 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -133,7 +133,7 @@ struct PseuLookupContext
   /**
    * Public key of the namespace we are trying to save.
    */
-  struct GNUNET_IDENTITY_PublicKey pkey;
+  struct GNUNET_CRYPTO_PublicKey pkey;
 
   /**
    * Nickname we're saving under.
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index 9dccd9e7..66beb701 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -295,7 +295,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
   GtkComboBox *ns_cb;
   GtkEntry *ns_entry;
   struct GNUNET_CRYPTO_EcdsaPublicKey want;
-  struct GNUNET_IDENTITY_PublicKey pkey;
+  struct GNUNET_CRYPTO_PublicKey pkey;
 
   if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
   {
@@ -320,7 +320,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
       GNUNET_break (0);
       return;
     }
-    pkey.type = GNUNET_IDENTITY_TYPE_ECDSA;
+    pkey.type = GNUNET_PUBLIC_KEY_TYPE_ECDSA;
     pkey.ecdsa_key = want;
     {
       const char *ns_zkey;
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c 
b/src/fs/gnunet-fs-gtk_main-window-search.c
index ad688601..86e859f0 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -159,7 +159,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   gchar *mime_keyword;
   const char *nsid;
   struct GNUNET_FS_Uri *uri;
-  struct GNUNET_IDENTITY_PublicKey pub_sks_zone;
+  struct GNUNET_CRYPTO_PublicKey pub_sks_zone;
   struct SearchLookup *sl;
   char *emsg;
 
@@ -407,7 +407,7 @@ save_pseudonym_with_nick (struct PseuLookupContext *lctx, 
const char *nick)
   /* show the window */
   gtk_window_present (GTK_WINDOW (lctx->progress_dialog));
   memset (&rd, 0, sizeof (rd));
-  rd.data_size = GNUNET_IDENTITY_public_key_get_length (&lctx->pkey);
+  rd.data_size = GNUNET_CRYPTO_public_key_get_length (&lctx->pkey);
   rd.data = &lctx->pkey;
   rd.flags = GNUNET_GNSRECORD_RF_PRIVATE;
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
@@ -648,7 +648,7 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton *button, 
gpointer user_data)
   struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
   GtkComboBox *widget;
   const gchar *text;
-  struct GNUNET_IDENTITY_PublicKey pkey;
+  struct GNUNET_CRYPTO_PublicKey pkey;
   int ret;
   struct PseuLookupContext *lctx;
   guint anonymity_level;
@@ -724,7 +724,7 @@ main_window_search_namespace_combobox_changed_cb 
(GtkComboBox *widget,
 {
   GtkButton *button;
   const gchar *text;
-  struct GNUNET_IDENTITY_PublicKey pkey;
+  struct GNUNET_CRYPTO_PublicKey pkey;
   int ret;
 
   text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))));
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c 
b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 1a8e31fb..f801722f 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -2239,14 +2239,14 @@ insert_advertisement (void *cls,
                       void **client_info)
 {
   struct MainPublishingDialogContext *ctx = cls;
-  struct GNUNET_IDENTITY_PublicKey pub;
+  struct GNUNET_CRYPTO_PublicKey pub;
   struct GNUNET_FS_Uri *sks_uri;
   char *sks_uri_string;
 
   if (NULL == ctx->ns)
     return GNUNET_SYSERR;
   GNUNET_IDENTITY_ego_get_public_key (ctx->ns, &pub);
-  if (GNUNET_IDENTITY_TYPE_ECDSA != pub.type)
+  if (GNUNET_PUBLIC_KEY_TYPE_ECDSA != pub.type)
   {
     GNUNET_break (0); /* FIXME: EDDSA keys not yet
                          supported for file-sharing! */
@@ -2358,12 +2358,12 @@ 
GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton *button,
       clear_keywords_from_tm (ctx);
     do
     {
-      const struct GNUNET_IDENTITY_PrivateKey *pk;
+      const struct GNUNET_CRYPTO_PrivateKey *pk;
 
       if (NULL != ns)
       {
         pk = GNUNET_IDENTITY_ego_get_private_key (ns);
-        if (GNUNET_IDENTITY_TYPE_ECDSA != pk->type)
+        if (GNUNET_PUBLIC_KEY_TYPE_ECDSA != pk->type)
         {
           GNUNET_break (0); /* FIXME: EDDSA keys not yet supported by FS */
           gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctx->own_checkbox),
@@ -2774,10 +2774,10 @@ add_updateable_to_ts (void *cls,
   sc.seen = uc->seen;
   sc.update_called = GNUNET_NO;
   {
-    const struct GNUNET_IDENTITY_PrivateKey *pk;
+    const struct GNUNET_CRYPTO_PrivateKey *pk;
 
     pk = GNUNET_IDENTITY_ego_get_private_key (uc->ns);
-    if (GNUNET_IDENTITY_TYPE_ECDSA != pk->type)
+    if (GNUNET_PUBLIC_KEY_TYPE_ECDSA != pk->type)
     {
       GNUNET_break (0);
       return;
@@ -2882,10 +2882,10 @@ 
GNUNET_GTK_master_publish_dialog_ego_combobox_changed_cb (GtkComboBox *combo,
   uc.update_called = GNUNET_NO;
   uc.seen = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
   {
-    const struct GNUNET_IDENTITY_PrivateKey *pk;
+    const struct GNUNET_CRYPTO_PrivateKey *pk;
 
     pk = GNUNET_IDENTITY_ego_get_private_key (ego);
-    if (GNUNET_IDENTITY_TYPE_ECDSA != pk->type)
+    if (GNUNET_PUBLIC_KEY_TYPE_ECDSA != pk->type)
     {
       GNUNET_break (0);
       gtk_widget_set_sensitive (ctx->identifier_entry, FALSE);
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 47c311a5..b7e1bac6 100644
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -19,7 +19,7 @@ gnunet_peerinfo_gtk_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ \
   @GLADE_LIBS@ @GNUNET_LIBS@  @unique_LIBS@ \
-  -lgnunetutil -lgnunetpeerinfo -lgnunethello -lgnunettransport -lgnunetats 
-lgnunetcore -lgnunetfriends \
+  -lgnunetutil -lgnunetpeerinfo -lgnunettransport -lgnunetats -lgnunetcore 
-lgnunetfriends -lgnunethello \
   $(INTLLIBS)
 gnunet_peerinfo_gtk_LDFLAGS = \
   -export-dynamic

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.