7 files changed, 29 insertions, 48 deletions

diff --git a/INSTALL b/INSTALL
index 8865734f..e82fd21d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX 'make' updates targets which have the same time stamps as their
+   HP-UX 'make' updates targets which have the same timestamps as their
 prerequisites, which makes it generally unusable when shipped generated
 files such as 'configure' are involved.  Use GNU 'make' instead.
 
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 48bc9344..902508bd 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,6 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software
 # Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 46fd1bf5..2bc1edfb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -77,10 +77,8 @@ src/statistics/gnunet-statistics-gtk.c
 src/statistics/gtk_statistics.c
 src/statistics/gtk_statistics_demo.c
 src/statistics/statistics.c
-contrib/gnunet_conversation_gtk_about_window.glade
 contrib/gnunet_conversation_gtk_enter_label.glade
 contrib/gnunet_conversation_gtk_main_window.glade
-contrib/gnunet_fs_gtk_about_window.glade
 contrib/gnunet_fs_gtk_download_as_dialog.glade
 contrib/gnunet_fs_gtk_edit_publication.glade
 contrib/gnunet_fs_gtk_enter_nick_dialog.glade
@@ -97,7 +95,6 @@ contrib/gnunet_fs_gtk_search_tab.glade
 contrib/gnunet_fs_gtk_unindex.glade
 contrib/gnunet_gtk.glade
 contrib/gnunet_gtk_status_bar_menu.glade
-contrib/gnunet_identity_gtk_about_window.glade
 contrib/gnunet_identity_gtk_advertise_dialog.glade
 contrib/gnunet_identity_gtk_main_window.glade
 contrib/gnunet_namestore_edit_aaaa.glade
@@ -116,16 +113,12 @@ contrib/gnunet_namestore_edit_srv.glade
 contrib/gnunet_namestore_edit_tlsa.glade
 contrib/gnunet_namestore_edit_txt.glade
 contrib/gnunet_namestore_edit_vpn.glade
-contrib/gnunet_namestore_gtk_about_window.glade
 contrib/gnunet_namestore_gtk_main_window.glade
 contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
 contrib/gnunet_peerinfo_gtk_about_dialog.glade
-contrib/gnunet_peerinfo_gtk_about_window.glade
 contrib/gnunet_peerinfo_gtk_main_window.glade
 contrib/gnunet_setup_about_dialog.glade
-contrib/gnunet_setup_about_window.glade
 contrib/gnunet_setup_calendar_dialog.glade
 contrib/gnunet_setup_main_window.glade
 contrib/gnunet_statistics_gtk_about_dialog.glade
-contrib/gnunet_statistics_gtk_about_window.glade
 contrib/gnunet_statistics_gtk_main_window.glade
diff --git a/src/conversation/gnunet-conversation-gtk_import.c b/src/conversation/gnunet-conversation-gtk_import.c
index cc16d386..9602ff7d 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -99,17 +99,14 @@ static int private_record;
  * operation.
  *
  * @param cls NULL
- * @param success #GNUNET_SYSERR on failure (including timeout/queue
- * drop/failure to validate) #GNUNET_NO if content was already there #GNUNET_YES
- * (or other positive value) on success
- * @param emsg NULL on success, otherwise an error message
+ * @param ec the error code
  */
 static void
-add_contact_continuation (void *cls, int32_t success, const char *emsg)
+add_contact_continuation (void *cls, enum GNUNET_ErrorCode ec)
 {
-  if (GNUNET_YES != success)
+  if (GNUNET_EC_NONE != ec)
     GCG_log (_ ("Adding contact failed: %s\n"),
-             (GNUNET_NO == success) ? _ ("record exists") : emsg);
+             GNUNET_ErrorCode_get_hint (ec));
   add_contact_qe = NULL;
 }
 
@@ -195,18 +192,16 @@ GSC_add_contact (const gchar *name, const gchar *address)
  * add operation.  Finish 'add phone' operation.
  *
  * @param cls closure
- * @param success #GNUNET_SYSERR on failure (including timeout/queue
- * drop/failure to validate) #GNUNET_NO if content was already there or not
- * found #GNUNET_YES (or other positive value) on success
- * @param emsg NULL on success, otherwise an error message
+ * @param ec the errro code
  */
 static void
-add_phone_continuation (void *cls, int32_t success, const char *emsg)
+add_phone_continuation (void *cls, enum GNUNET_ErrorCode ec)
 {
   add_phone_qe = NULL;
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
-    GCG_log (_ ("Failed to publish my PHONE record: %s\n"), emsg);
+    GCG_log (_ ("Failed to publish my PHONE record: %s\n"),
+             GNUNET_ErrorCode_get_hint (ec));
     GNUNET_free (phone_label);
     phone_label = NULL;
   }
@@ -354,17 +349,15 @@ finish_shutdown ()
  * with 'add phone' operation if one is pending.
  *
  * @param cls closure
- * @param success #GNUNET_SYSERR on failure (including timeout/queue
- * drop/failure to validate) #GNUNET_NO if content was already there or not
- * found #GNUNET_YES (or other positive value) on success
- * @param emsg NULL on success, otherwise an error message
+ * @param ec the error code
  */
 static void
-remove_phone_continuation (void *cls, int32_t success, const char *emsg)
+remove_phone_continuation (void *cls, enum GNUNET_ErrorCode ec)
 {
   remove_phone_qe = NULL;
-  if (GNUNET_SYSERR == success)
-    GCG_log (_ ("Failed to remove PHONE record: %s\n"), emsg);
+  if (GNUNET_EC_NONE != ec)
+    GCG_log (_ ("Failed to remove PHONE record: %s\n"),
+             GNUNET_ErrorCode_get_hint (ec));
   if (GNUNET_YES == add_waiting)
     add_phone ();
   if (GNUNET_YES == in_shutdown)
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 438a9517..fed27001 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -364,22 +364,19 @@ abort_pseu_lookup (struct PseuLookupContext *lctx)
  * operation.
  *
  * @param cls closure
- * @param success #GNUNET_SYSERR on failure (including timeout/queue
- * drop/failure to validate) #GNUNET_NO if content was already there or not
- * found #GNUNET_YES (or other positive value) on success
- * @param emsg NULL on success, otherwise an error message
+ * @param success the error code
  */
 static void
-store_continuation (void *cls, int32_t success, const char *emsg)
+store_continuation (void *cls, enum GNUNET_ErrorCode success)
 {
   struct PseuLookupContext *lctx = cls;
 
   lctx->qe = NULL;
-  if (NULL != emsg)
+  if (GNUNET_EC_NONE != success)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _ ("Failed to save record: %s\n"),
-                emsg);
+                GNUNET_ErrorCode_get_hint (success));
     beep ();
   }
   abort_pseu_lookup (lctx);
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index ad5aa099..025aa9c5 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -764,26 +764,26 @@ check_record_permitted (unsigned int rd_count,
  * Function called upon completion of an operation.
  *
  * @param cls the `struct OperationContext` of the operation that completed
- * @param success #GNUNET_OK if the operation succeeded
- * @param emsg error message if the operation failed
+ * @param ec the error code
  */
 static void
-operation_done_cont (void *cls, int32_t success, const char *emsg)
+operation_done_cont (void *cls, enum GNUNET_ErrorCode ec)
 {
   struct OperationContext *oc = cls;
   GtkWidget *dialog;
 
   oc->qe = NULL;
   GNUNET_CONTAINER_DLL_remove (oc_head, oc_tail, oc);
-  if (GNUNET_SYSERR == success)
+  if (GNUNET_EC_NONE != ec)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Operation failed: `%s'\n"), emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _ ("Operation failed: `%s'\n"),
+                GNUNET_ErrorCode_get_hint (ec));
     dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_MESSAGE_ERROR,
                                      GTK_BUTTONS_CLOSE,
                                      _ ("Operation failed: `%s'\n"),
-                                     emsg);
+                                     GNUNET_ErrorCode_get_hint (ec));
     g_signal_connect_swapped (dialog,
                               "response",
                               G_CALLBACK (gtk_widget_destroy),
diff --git a/src/statistics/gtk_statistics.c b/src/statistics/gtk_statistics.c
index 3a7aba8e..e9e4360c 100644
--- a/src/statistics/gtk_statistics.c
+++ b/src/statistics/gtk_statistics.c
@@ -178,9 +178,7 @@ gtk_statistics_init (GtkStatistics *statistics)
 {
   GtkStatisticsPrivate *priv;
 
-  statistics->priv = G_TYPE_INSTANCE_GET_PRIVATE (statistics,
-                                                  GTK_TYPE_STATISTICS,
-                                                  GtkStatisticsPrivate);
+  statistics->priv = gtk_statistics_get_instance_private (statistics);
   priv = statistics->priv;
 #if GTK_MAJOR_VERSION < 3
   g_signal_connect (statistics,