aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-06-18 13:10:46 +0200
committerChristian Grothoff <christian@grothoff.org>2019-06-18 13:10:46 +0200
commit090c6e5df68ee529e578b4d56b44d82f422b36bc (patch)
tree51910b549e9f133aad83c0ba0ab577d86194fb66
parent2d11a355c04efd7f63f082847d8990ffe6b3283a (diff)
downloadgnunet-gtk-090c6e5df68ee529e578b4d56b44d82f422b36bc.tar.gz
gnunet-gtk-090c6e5df68ee529e578b4d56b44d82f422b36bc.zip
fix identity assertion
-rw-r--r--src/fs/gnunet-fs-gtk.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 76e4154a..aa87f262 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -681,6 +681,32 @@ handle_sks_zone_identity (void *cls,
681 681
682 682
683/** 683/**
684 * We must pass a non-NULL callback to the identity service,
685 * but we don't actually care about the information here
686 * (we will use GNUNET_IDENTITY_get() if and when we do care).
687 *
688 * @param cls closure
689 * @param ego ego handle
690 * @param ctx context for application to store data for this ego
691 * (during the lifetime of this process, initially NULL)
692 * @param name name assigned by the user for this ego,
693 * NULL if the user just deleted the ego and it
694 * must thus no longer be used
695 */
696static void
697non_null_cb (void *cls,
698 struct GNUNET_IDENTITY_Ego *ego,
699 void **ctx,
700 const char *name)
701{
702 (void) cls;
703 (void) ego;
704 (void) ctx;
705 (void) name;
706}
707
708
709/**
684 * Actual main function run right after GNUnet's scheduler 710 * Actual main function run right after GNUnet's scheduler
685 * is initialized. Initializes up GTK and Glade. 711 * is initialized. Initializes up GTK and Glade.
686 * 712 *
@@ -858,7 +884,7 @@ run (void *cls)
858 &main_context); 884 &main_context);
859 main_context.gns = GNUNET_GNS_connect (main_context.cfg); 885 main_context.gns = GNUNET_GNS_connect (main_context.cfg);
860 main_context.identity = 886 main_context.identity =
861 GNUNET_IDENTITY_connect (main_context.cfg, NULL, NULL); 887 GNUNET_IDENTITY_connect (main_context.cfg, &non_null_cb, NULL);
862 main_context.id_op = GNUNET_IDENTITY_get (main_context.identity, 888 main_context.id_op = GNUNET_IDENTITY_get (main_context.identity,
863 "fs-sks", 889 "fs-sks",
864 &handle_sks_zone_identity, 890 &handle_sks_zone_identity,