aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-12-05 15:46:18 +0100
committerChristian Grothoff <christian@grothoff.org>2022-12-05 15:46:18 +0100
commit15e8173335e5162c1d6aa13aa8573fbfe9bde8f6 (patch)
tree0e6e814841a47df82fe8f888e962086261f5c06d
parent9abd2203e3650cadad2d957fcbaa77845d0e98b4 (diff)
downloadanastasis-gtk-15e8173335e5162c1d6aa13aa8573fbfe9bde8f6.tar.gz
anastasis-gtk-15e8173335e5162c1d6aa13aa8573fbfe9bde8f6.tar.bz2
anastasis-gtk-15e8173335e5162c1d6aa13aa8573fbfe9bde8f6.zip
adapt anastasis-gtk to latest changes in GNUnet/gnunet-gtk
-rw-r--r--configure.ac13
-rw-r--r--src/anastasis/Makefile.am2
-rw-r--r--src/anastasis/anastasis-gtk.c1
-rw-r--r--src/anastasis/anastasis-gtk_action.c1
-rw-r--r--src/anastasis/anastasis-gtk_attributes.c1
-rw-r--r--src/anastasis/anastasis-gtk_autocomplete.c1
-rw-r--r--src/anastasis/anastasis-gtk_dispatch.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-add-provider.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-backup-button-clicked.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-challenge-code.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-challenge-iban.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-challenge-question.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-challenge-totp.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-clear-secret-clicked.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-continent-selected.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-core-secret-changed.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-core-secret-name-changed.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-country-activated.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-country-unselected.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-expiration-change.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-identity-changed.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-method-email.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-method-iban.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-method-post.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-method-question.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-method-sms.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-method-totp.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-noprint.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-payqr-selection-changed.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-policy-activate.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-policy-button.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-policy-meta.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-policy-selection-changed.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-policy-version-changed.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-print.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-recovery-button-clicked.c1
-rw-r--r--src/anastasis/anastasis-gtk_handle-secret-buttons.c1
-rw-r--r--src/anastasis/anastasis-gtk_helper.c3
-rw-r--r--src/anastasis/anastasis-gtk_io.c1
-rw-r--r--src/anastasis/anastasis-gtk_pe-add-policy.c1
-rw-r--r--src/anastasis/anastasis-gtk_pe-delete-challenge.c1
-rw-r--r--src/anastasis/anastasis-gtk_pe-delete-policy.c1
-rw-r--r--src/anastasis/anastasis-gtk_pe-edit-policy.c1
-rw-r--r--src/anastasis/anastasis-gtk_progress.c1
-rw-r--r--src/anastasis/gettext.h72
-rw-r--r--src/anastasis/os_installation.c1
-rw-r--r--src/anastasis/print.c1
51 files changed, 81 insertions, 56 deletions
diff --git a/configure.ac b/configure.ac
index cd9beb1..02131f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,7 @@ AS_IF([test "x$gnunet" = "x0" -a ! "x$lookin" = "x"],
gnunet=1
EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH"
]
- ),,[#include <gnunet/platform.h>]
+ )
)
])
@@ -298,23 +298,20 @@ AC_ARG_WITH(anastasis,
[yes],[
AC_CHECK_HEADERS([anastasis/anastasis_service.h],
AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config],
- [anastasis=1]
- ),,[#include <gnunet/platform.h>])
+ [anastasis=1]))
],[
LDFLAGS="-L$with_anastasis/lib $LDFLAGS"
CPPFLAGS="-I$with_anastasis/include $CPPFLAGS"
AC_CHECK_HEADERS([anastasis/anastasis_service.h],
AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config],
EXT_LIB_PATH="-L$with_anastasis/lib $EXT_LIB_PATH"
- [anastasis=1]
- ),,[#include <gnunet/platform.h>])
+ [anastasis=1]))
])
],
[AC_MSG_RESULT([--with-anastasis not specified])
AC_CHECK_HEADERS([anastasis/anastasis_service.h],
AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config],
- [anastasis=1]
- ),,[#include <gnunet/platform.h>])])
+ [anastasis=1]))])
AS_IF([test "$anastasis" != 1],
@@ -459,7 +456,7 @@ AC_ARG_ENABLE([logging],
AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise])
AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h], [],
- AC_MSG_ERROR([compiling anastasis-gtk requires libgnunetutil]), [#include <gnunet/platform.h>])
+ AC_MSG_ERROR([compiling anastasis-gtk requires libgnunetutil]))
AC_CHECK_LIB(gladeui-1,glade_xml_node_new, [],
[
diff --git a/src/anastasis/Makefile.am b/src/anastasis/Makefile.am
index 5497721..1439063 100644
--- a/src/anastasis/Makefile.am
+++ b/src/anastasis/Makefile.am
@@ -99,6 +99,8 @@ anastasis_gtk_CFLAGS += \
$(HPDF_CFLAGS)
endif
+EXTRA_DIST = \
+ gettext.h
if HPDF_ENABLED
noinst_PROGRAMS = \
diff --git a/src/anastasis/anastasis-gtk.c b/src/anastasis/anastasis-gtk.c
index ac7b3e2..d7f12b5 100644
--- a/src/anastasis/anastasis-gtk.c
+++ b/src/anastasis/anastasis-gtk.c
@@ -24,7 +24,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_action.c b/src/anastasis/anastasis-gtk_action.c
index a30f60d..b18361c 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_attributes.h"
diff --git a/src/anastasis/anastasis-gtk_attributes.c b/src/anastasis/anastasis-gtk_attributes.c
index 4222a2b..b761ca7 100644
--- a/src/anastasis/anastasis-gtk_attributes.c
+++ b/src/anastasis/anastasis-gtk_attributes.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_autocomplete.c b/src/anastasis/anastasis-gtk_autocomplete.c
index 8c522d1..69ed302 100644
--- a/src/anastasis/anastasis-gtk_autocomplete.c
+++ b/src/anastasis/anastasis-gtk_autocomplete.c
@@ -22,7 +22,6 @@
* @brief Autocomplete logic for GtkEntry widgets
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_attributes.h"
#include "anastasis-gtk_dispatch.h"
diff --git a/src/anastasis/anastasis-gtk_dispatch.c b/src/anastasis/anastasis-gtk_dispatch.c
index 67ff210..e27b888 100644
--- a/src/anastasis/anastasis-gtk_dispatch.c
+++ b/src/anastasis/anastasis-gtk_dispatch.c
@@ -22,7 +22,6 @@
* @brief Generic state dispatcher
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_dispatch.h"
diff --git a/src/anastasis/anastasis-gtk_handle-add-provider.c b/src/anastasis/anastasis-gtk_handle-add-provider.c
index 74cc09d..3815eb6 100644
--- a/src/anastasis/anastasis-gtk_handle-add-provider.c
+++ b/src/anastasis/anastasis-gtk_handle-add-provider.c
@@ -23,7 +23,6 @@
* @brief Dialog to add a provider during recovery
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c b/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c
index d25733e..c98fcb2 100644
--- a/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c b/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c
index 3e55413..70b7274 100644
--- a/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c
@@ -24,7 +24,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-backup-button-clicked.c b/src/anastasis/anastasis-gtk_handle-backup-button-clicked.c
index 487d6d5..3790293 100644
--- a/src/anastasis/anastasis-gtk_handle-backup-button-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-backup-button-clicked.c
@@ -24,7 +24,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-challenge-code.c b/src/anastasis/anastasis-gtk_handle-challenge-code.c
index 6aeeb6f..7234f36 100644
--- a/src/anastasis/anastasis-gtk_handle-challenge-code.c
+++ b/src/anastasis/anastasis-gtk_handle-challenge-code.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for code returned to challenge address (Email, SMS, POST)
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-challenge-iban.c b/src/anastasis/anastasis-gtk_handle-challenge-iban.c
index 64e6d46..4080544 100644
--- a/src/anastasis/anastasis-gtk_handle-challenge-iban.c
+++ b/src/anastasis/anastasis-gtk_handle-challenge-iban.c
@@ -22,7 +22,6 @@
* @brief Handle dialog for IBAN challenge
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-challenge-question.c b/src/anastasis/anastasis-gtk_handle-challenge-question.c
index d11f469..5e54d0e 100644
--- a/src/anastasis/anastasis-gtk_handle-challenge-question.c
+++ b/src/anastasis/anastasis-gtk_handle-challenge-question.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for secure question
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-challenge-totp.c b/src/anastasis/anastasis-gtk_handle-challenge-totp.c
index 61b8220..42b50c3 100644
--- a/src/anastasis/anastasis-gtk_handle-challenge-totp.c
+++ b/src/anastasis/anastasis-gtk_handle-challenge-totp.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for code returned to challenge address (TOTP)
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-clear-secret-clicked.c b/src/anastasis/anastasis-gtk_handle-clear-secret-clicked.c
index 5857d8a..017400e 100644
--- a/src/anastasis/anastasis-gtk_handle-clear-secret-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-clear-secret-clicked.c
@@ -22,7 +22,6 @@
* @brief Handle user clicking a 'clear' button in the enter secret dialog
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-continent-selected.c b/src/anastasis/anastasis-gtk_handle-continent-selected.c
index 599826f..dedecc4 100644
--- a/src/anastasis/anastasis-gtk_handle-continent-selected.c
+++ b/src/anastasis/anastasis-gtk_handle-continent-selected.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-core-secret-changed.c b/src/anastasis/anastasis-gtk_handle-core-secret-changed.c
index 906ef29..500e566 100644
--- a/src/anastasis/anastasis-gtk_handle-core-secret-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-core-secret-changed.c
@@ -22,7 +22,6 @@
* @brief
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-core-secret-name-changed.c b/src/anastasis/anastasis-gtk_handle-core-secret-name-changed.c
index 6be6b6b..723b188 100644
--- a/src/anastasis/anastasis-gtk_handle-core-secret-name-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-core-secret-name-changed.c
@@ -22,7 +22,6 @@
* @brief The user changed the name of the core secret. Update state.
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-country-activated.c b/src/anastasis/anastasis-gtk_handle-country-activated.c
index afb65f3..de8d57b 100644
--- a/src/anastasis/anastasis-gtk_handle-country-activated.c
+++ b/src/anastasis/anastasis-gtk_handle-country-activated.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-country-unselected.c b/src/anastasis/anastasis-gtk_handle-country-unselected.c
index 9341b6f..c9e6b36 100644
--- a/src/anastasis/anastasis-gtk_handle-country-unselected.c
+++ b/src/anastasis/anastasis-gtk_handle-country-unselected.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-expiration-change.c b/src/anastasis/anastasis-gtk_handle-expiration-change.c
index a713eee..42fabe4 100644
--- a/src/anastasis/anastasis-gtk_handle-expiration-change.c
+++ b/src/anastasis/anastasis-gtk_handle-expiration-change.c
@@ -22,7 +22,6 @@
* @brief
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-identity-changed.c b/src/anastasis/anastasis-gtk_handle-identity-changed.c
index 701ed8e..3678c65 100644
--- a/src/anastasis/anastasis-gtk_handle-identity-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-identity-changed.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c b/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
index a7bb1c0..ddf4702 100644
--- a/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
@@ -24,7 +24,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
index a4b6a64..9e1bc19 100644
--- a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
@@ -26,7 +26,6 @@
#include "anastasis_gtk_config.h"
#define HAVE_USED_CONFIG_H 1
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_attributes.h"
diff --git a/src/anastasis/anastasis-gtk_handle-method-email.c b/src/anastasis/anastasis-gtk_handle-method-email.c
index 36e4d4d..77f9180 100644
--- a/src/anastasis/anastasis-gtk_handle-method-email.c
+++ b/src/anastasis/anastasis-gtk_handle-method-email.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for security email
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-method-iban.c b/src/anastasis/anastasis-gtk_handle-method-iban.c
index f0487e1..e79f9ee 100644
--- a/src/anastasis/anastasis-gtk_handle-method-iban.c
+++ b/src/anastasis/anastasis-gtk_handle-method-iban.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for security iban
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-method-post.c b/src/anastasis/anastasis-gtk_handle-method-post.c
index 5ad954c..3379469 100644
--- a/src/anastasis/anastasis-gtk_handle-method-post.c
+++ b/src/anastasis/anastasis-gtk_handle-method-post.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for security post
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-method-question.c b/src/anastasis/anastasis-gtk_handle-method-question.c
index ea327aa..6acf9c6 100644
--- a/src/anastasis/anastasis-gtk_handle-method-question.c
+++ b/src/anastasis/anastasis-gtk_handle-method-question.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for security question
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-method-sms.c b/src/anastasis/anastasis-gtk_handle-method-sms.c
index 74ffa08..5fe3879 100644
--- a/src/anastasis/anastasis-gtk_handle-method-sms.c
+++ b/src/anastasis/anastasis-gtk_handle-method-sms.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for security sms
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-method-totp.c b/src/anastasis/anastasis-gtk_handle-method-totp.c
index 2b5f090..49aff75 100644
--- a/src/anastasis/anastasis-gtk_handle-method-totp.c
+++ b/src/anastasis/anastasis-gtk_handle-method-totp.c
@@ -23,7 +23,6 @@
* @brief Handle dialogs for TOTP (RFC 6238)
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-noprint.c b/src/anastasis/anastasis-gtk_handle-noprint.c
index ef9e081..3aff9c9 100644
--- a/src/anastasis/anastasis-gtk_handle-noprint.c
+++ b/src/anastasis/anastasis-gtk_handle-noprint.c
@@ -23,7 +23,6 @@
* @brief Implementation of the "print" button, if we cannot use it
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include <jansson.h>
diff --git a/src/anastasis/anastasis-gtk_handle-payqr-selection-changed.c b/src/anastasis/anastasis-gtk_handle-payqr-selection-changed.c
index 8ecea63..8b1081f 100644
--- a/src/anastasis/anastasis-gtk_handle-payqr-selection-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-payqr-selection-changed.c
@@ -22,7 +22,6 @@
* @brief
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-policy-activate.c b/src/anastasis/anastasis-gtk_handle-policy-activate.c
index 006dea1..c8f2754 100644
--- a/src/anastasis/anastasis-gtk_handle-policy-activate.c
+++ b/src/anastasis/anastasis-gtk_handle-policy-activate.c
@@ -23,7 +23,6 @@
* @brief Handle double-click in policy review
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-policy-button.c b/src/anastasis/anastasis-gtk_handle-policy-button.c
index 1d29a8a..0459ff6 100644
--- a/src/anastasis/anastasis-gtk_handle-policy-button.c
+++ b/src/anastasis/anastasis-gtk_handle-policy-button.c
@@ -23,7 +23,6 @@
* @brief Handle right-click context menu in policy review
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-policy-meta.c b/src/anastasis/anastasis-gtk_handle-policy-meta.c
index 5ec16ed..0f02cf5 100644
--- a/src/anastasis/anastasis-gtk_handle-policy-meta.c
+++ b/src/anastasis/anastasis-gtk_handle-policy-meta.c
@@ -23,7 +23,6 @@
* @brief Handle right-click context menu in policy review
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-policy-selection-changed.c b/src/anastasis/anastasis-gtk_handle-policy-selection-changed.c
index 4bc044d..06bba74 100644
--- a/src/anastasis/anastasis-gtk_handle-policy-selection-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-policy-selection-changed.c
@@ -22,7 +22,6 @@
* @brief
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-policy-version-changed.c b/src/anastasis/anastasis-gtk_handle-policy-version-changed.c
index 63a50c4..3866b36 100644
--- a/src/anastasis/anastasis-gtk_handle-policy-version-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-policy-version-changed.c
@@ -22,7 +22,6 @@
* @brief
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include "anastasis-gtk_action.h"
diff --git a/src/anastasis/anastasis-gtk_handle-print.c b/src/anastasis/anastasis-gtk_handle-print.c
index c235ce2..c64af21 100644
--- a/src/anastasis/anastasis-gtk_handle-print.c
+++ b/src/anastasis/anastasis-gtk_handle-print.c
@@ -23,7 +23,6 @@
* @brief Implementation of the "Save as" button for the user attributes
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_attributes.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-recovery-button-clicked.c b/src/anastasis/anastasis-gtk_handle-recovery-button-clicked.c
index 1a05f02..1e492fd 100644
--- a/src/anastasis/anastasis-gtk_handle-recovery-button-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-recovery-button-clicked.c
@@ -24,7 +24,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_handle-secret-buttons.c b/src/anastasis/anastasis-gtk_handle-secret-buttons.c
index 5193be6..738040c 100644
--- a/src/anastasis/anastasis-gtk_handle-secret-buttons.c
+++ b/src/anastasis/anastasis-gtk_handle-secret-buttons.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_handle-expiration-change.h"
diff --git a/src/anastasis/anastasis-gtk_helper.c b/src/anastasis/anastasis-gtk_helper.c
index b8621ea..284c784 100644
--- a/src/anastasis/anastasis-gtk_helper.c
+++ b/src/anastasis/anastasis-gtk_helper.c
@@ -24,7 +24,8 @@
* @author Christian Grothoff
* @author Dennis Neufeld
*/
-#include <gnunet/platform.h>
+#define _GNU_SOURCE
+#include <stdio.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include <jansson.h>
diff --git a/src/anastasis/anastasis-gtk_io.c b/src/anastasis/anastasis-gtk_io.c
index 95f702e..0d7c24a 100644
--- a/src/anastasis/anastasis-gtk_io.c
+++ b/src/anastasis/anastasis-gtk_io.c
@@ -22,7 +22,6 @@
* @brief
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_attributes.h"
#include "anastasis-gtk_dispatch.h"
diff --git a/src/anastasis/anastasis-gtk_pe-add-policy.c b/src/anastasis/anastasis-gtk_pe-add-policy.c
index dfb19f4..bbad540 100644
--- a/src/anastasis/anastasis-gtk_pe-add-policy.c
+++ b/src/anastasis/anastasis-gtk_pe-add-policy.c
@@ -23,7 +23,6 @@
* @brief Handle request to interactively add new policy
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_pe-delete-challenge.c b/src/anastasis/anastasis-gtk_pe-delete-challenge.c
index 3f2c39d..b4fb8be 100644
--- a/src/anastasis/anastasis-gtk_pe-delete-challenge.c
+++ b/src/anastasis/anastasis-gtk_pe-delete-challenge.c
@@ -23,7 +23,6 @@
* @brief Handle request to delete challenge
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_pe-delete-policy.c b/src/anastasis/anastasis-gtk_pe-delete-policy.c
index 3be8fb9..2e68bc3 100644
--- a/src/anastasis/anastasis-gtk_pe-delete-policy.c
+++ b/src/anastasis/anastasis-gtk_pe-delete-policy.c
@@ -23,7 +23,6 @@
* @brief Handle request to delete policy
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_pe-edit-policy.c b/src/anastasis/anastasis-gtk_pe-edit-policy.c
index 2647680..b04888f 100644
--- a/src/anastasis/anastasis-gtk_pe-edit-policy.c
+++ b/src/anastasis/anastasis-gtk_pe-edit-policy.c
@@ -23,7 +23,6 @@
* @brief Handle request to interactively edit policy
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_action.h"
#include "anastasis-gtk_helper.h"
diff --git a/src/anastasis/anastasis-gtk_progress.c b/src/anastasis/anastasis-gtk_progress.c
index 714a75d..d3863bd 100644
--- a/src/anastasis/anastasis-gtk_progress.c
+++ b/src/anastasis/anastasis-gtk_progress.c
@@ -22,7 +22,6 @@
* @brief Functions dealing with the tree views used to show the user where we are in the process
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
#include "anastasis-gtk_helper.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/src/anastasis/gettext.h b/src/anastasis/gettext.h
new file mode 100644
index 0000000..6e98f19
--- /dev/null
+++ b/src/anastasis/gettext.h
@@ -0,0 +1,72 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+ Copyright Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA. */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option. */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions. */
+
+#include <libintl.h>
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+ chokes if dcgettext is defined as a macro. So include it now, to make
+ later inclusions of <locale.h> a NOP. We don't include <libintl.h>
+ as well because people using "gettext.h" will not include <libintl.h>,
+ and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+ is GNUNET_OK. */
+#if defined(__sun)
+#include <locale.h>
+#endif
+
+/* Disabled NLS.
+ The casts to 'const char *' serve the purpose of producing warnings
+ for invalid uses of the value returned from these functions.
+ On pre-ANSI systems without 'const', the config.h file is supposed to
+ contain "#define const". */
+#define gettext(Msgid) ((const char *) (Msgid))
+#define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+#define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+#define ngettext(Msgid1, Msgid2, N) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+#define dngettext(Domainname, Msgid1, Msgid2, N) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+#define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+/* slight modification here to avoid warnings: generate GNUNET_NO code,
+ not even the cast... */
+#define textdomain(Domainname)
+#define bindtextdomain(Domainname, Dirname)
+#define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+ extraction of messages, but does not call gettext(). The run-time
+ translation is done at a different place in the code.
+ The argument, String, should be a literal string. Concatenated strings
+ and other string expressions won't work.
+ The macro's expansion is not parenthesized, so that it is suitable as
+ initializer for static 'char[]' or 'const char[]' variables. */
+#define gettext_noop(String) String
+
+#endif /* _LIBGETTEXT_H */
diff --git a/src/anastasis/os_installation.c b/src/anastasis/os_installation.c
index 6a1f94c..0116ab7 100644
--- a/src/anastasis/os_installation.c
+++ b/src/anastasis/os_installation.c
@@ -22,7 +22,6 @@
* @brief initialize GNUNET_OS for anastasis-gtk
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
/**
diff --git a/src/anastasis/print.c b/src/anastasis/print.c
index c640c71..77a1c60 100644
--- a/src/anastasis/print.c
+++ b/src/anastasis/print.c
@@ -24,7 +24,6 @@
* @author Christian Grothoff
*/
-#include <gnunet/platform.h>
#include <setjmp.h>
#include <hpdf.h>
#include <gnunet/gnunet_util_lib.h>