[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet-gtk] branch master updated: fit ftbfs
From: |
gnunet |
Subject: |
[gnunet-gtk] branch master updated: fit ftbfs |
Date: |
Sun, 30 Oct 2022 02:05:31 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 3116c181 fit ftbfs
3116c181 is described below
commit 3116c1819b35604d0c27f46b0e76be9952a86dc7
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Oct 30 09:05:24 2022 +0900
fit ftbfs
---
src/conversation/gnunet-conversation-gtk_import.c | 2 +-
src/fs/gnunet-fs-gtk.c | 24 ++++++++++++++++-------
src/fs/gnunet-fs-gtk.h | 2 +-
src/fs/gnunet-fs-gtk_main-window-search.c | 2 +-
src/namestore/gnunet-namestore-gtk.c | 10 ++++++----
5 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/conversation/gnunet-conversation-gtk_import.c
b/src/conversation/gnunet-conversation-gtk_import.c
index 9602ff7d..18ab0aeb 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -151,7 +151,7 @@ GSC_add_contact (const gchar *name, const gchar *address)
{
type = GNUNET_GNSRECORD_TYPE_PKEY;
value = &rvalue;
- value_size = GNUNET_IDENTITY_key_get_length (&rvalue);
+ value_size = GNUNET_IDENTITY_public_key_get_length (&rvalue);
}
else
{
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index c30f4a29..a1230c03 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -279,7 +279,7 @@ shutdown_task (void *cls)
}
if (NULL != main_context.id_op)
{
- GNUNET_IDENTITY_cancel (main_context.id_op);
+ GNUNET_IDENTITY_ego_lookup_cancel (main_context.id_op);
main_context.id_op = NULL;
}
if (NULL != main_context.identity)
@@ -647,9 +647,7 @@ monitor_zone_records (void *cls,
*/
static void
handle_sks_zone_identity (void *cls,
- struct GNUNET_IDENTITY_Ego *ego,
- void **ctx,
- const char *name)
+ struct GNUNET_IDENTITY_Ego *ego)
{
main_context.id_op = NULL;
@@ -722,6 +720,7 @@ run (void *cls)
unsigned long long window_width;
unsigned long long window_height;
int maximized;
+ char *default_ego_name;
ml = cls;
/* setup main context */
@@ -857,7 +856,17 @@ run (void *cls)
"MAX_PARALLEL_REQUESTS",
&req_parallel))
req_parallel = DEFAULT_MAX_PARALLEL_REQUESTS;
-
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (main_context.cfg,
+ "fs-sks",
+ "DEFAULT_IDENTITY",
+ &default_ego_name))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Please set DEFAULT_IDENTITY under [fs-sks]\n");
+ GNUNET_GTK_main_loop_quit (cls);
+ return;
+ }
/* initialize file-sharing */
fs = GNUNET_FS_start (main_context.cfg,
"gnunet-fs-gtk",
@@ -883,10 +892,11 @@ run (void *cls)
main_context.gns = GNUNET_GNS_connect (main_context.cfg);
main_context.identity =
GNUNET_IDENTITY_connect (main_context.cfg, &non_null_cb, NULL);
- main_context.id_op = GNUNET_IDENTITY_get (main_context.identity,
- "fs-sks",
+ main_context.id_op = GNUNET_IDENTITY_ego_lookup (main_context.cfg,
+ default_ego_name,
&handle_sks_zone_identity,
NULL);
+ GNUNET_free (default_ego_name);
#if HAVE_LIBUNIQUE
unique_app_watch_window (unique_app, GTK_WINDOW (main_context.main_window));
g_signal_connect (unique_app,
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index a14f81b9..5fb46ddf 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -248,7 +248,7 @@ struct GNUNET_GTK_MainWindowContext
/**
* Operation we use to determine namespace resolution domain.
*/
- struct GNUNET_IDENTITY_Operation *id_op;
+ struct GNUNET_IDENTITY_EgoLookup *id_op;
/**
* Our zone for SKS operations. Can be NULL.
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c
b/src/fs/gnunet-fs-gtk_main-window-search.c
index fed27001..ad688601 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -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_key_get_length (&lctx->pkey);
+ rd.data_size = GNUNET_IDENTITY_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;
diff --git a/src/namestore/gnunet-namestore-gtk.c
b/src/namestore/gnunet-namestore-gtk.c
index 025aa9c5..a9d42f91 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -2706,7 +2706,7 @@ fresh_label (const char *label)
static void
iop_create_cont (void *cls,
const struct GNUNET_IDENTITY_PrivateKey *priv,
- const char *emsg)
+ enum GNUNET_ErrorCode ec)
{
GtkEntry *entry;
@@ -2715,7 +2715,8 @@ iop_create_cont (void *cls,
iop = NULL;
entry = GTK_ENTRY (get_object ("gnunet_namestore_gtk_zone_entry"));
gtk_widget_set_sensitive (main_window, TRUE);
- gtk_label_set_markup (status_label, emsg);
+ gtk_label_set_markup (status_label, (GNUNET_EC_NONE == ec) ? NULL :
+ GNUNET_ErrorCode_get_hint (ec));
gtk_entry_grab_focus_without_selecting (entry);
}
@@ -2728,14 +2729,15 @@ iop_create_cont (void *cls,
* @param emsg error message, used in status bar
*/
static void
-iop_cont (void *cls, const char *emsg)
+iop_cont (void *cls, enum GNUNET_ErrorCode ec)
{
GtkEntry *entry;
iop = NULL;
entry = GTK_ENTRY (get_object ("gnunet_namestore_gtk_zone_entry"));
gtk_widget_set_sensitive (main_window, TRUE);
- gtk_label_set_markup (status_label, emsg);
+ gtk_label_set_markup (status_label, (GNUNET_EC_NONE == ec) ? NULL :
+ GNUNET_ErrorCode_get_hint (ec));
gtk_entry_grab_focus_without_selecting (entry);
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet-gtk] branch master updated: fit ftbfs,
gnunet <=