diff options
author | Christian Grothoff <christian@grothoff.org> | 2022-12-05 15:46:18 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2022-12-05 15:46:18 +0100 |
commit | 15e8173335e5162c1d6aa13aa8573fbfe9bde8f6 (patch) | |
tree | 0e6e814841a47df82fe8f888e962086261f5c06d | |
parent | 9abd2203e3650cadad2d957fcbaa77845d0e98b4 (diff) | |
download | anastasis-gtk-15e8173335e5162c1d6aa13aa8573fbfe9bde8f6.tar.gz anastasis-gtk-15e8173335e5162c1d6aa13aa8573fbfe9bde8f6.zip |
adapt anastasis-gtk to latest changes in GNUnet/gnunet-gtk
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"], | |||
210 | gnunet=1 | 210 | gnunet=1 |
211 | EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH" | 211 | EXT_LIB_PATH="-L${lookin}/lib $EXT_LIB_PATH" |
212 | ] | 212 | ] |
213 | ),,[#include <gnunet/platform.h>] | 213 | ) |
214 | ) | 214 | ) |
215 | ]) | 215 | ]) |
216 | 216 | ||
@@ -298,23 +298,20 @@ AC_ARG_WITH(anastasis, | |||
298 | [yes],[ | 298 | [yes],[ |
299 | AC_CHECK_HEADERS([anastasis/anastasis_service.h], | 299 | AC_CHECK_HEADERS([anastasis/anastasis_service.h], |
300 | AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config], | 300 | AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config], |
301 | [anastasis=1] | 301 | [anastasis=1])) |
302 | ),,[#include <gnunet/platform.h>]) | ||
303 | ],[ | 302 | ],[ |
304 | LDFLAGS="-L$with_anastasis/lib $LDFLAGS" | 303 | LDFLAGS="-L$with_anastasis/lib $LDFLAGS" |
305 | CPPFLAGS="-I$with_anastasis/include $CPPFLAGS" | 304 | CPPFLAGS="-I$with_anastasis/include $CPPFLAGS" |
306 | AC_CHECK_HEADERS([anastasis/anastasis_service.h], | 305 | AC_CHECK_HEADERS([anastasis/anastasis_service.h], |
307 | AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config], | 306 | AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config], |
308 | EXT_LIB_PATH="-L$with_anastasis/lib $EXT_LIB_PATH" | 307 | EXT_LIB_PATH="-L$with_anastasis/lib $EXT_LIB_PATH" |
309 | [anastasis=1] | 308 | [anastasis=1])) |
310 | ),,[#include <gnunet/platform.h>]) | ||
311 | ]) | 309 | ]) |
312 | ], | 310 | ], |
313 | [AC_MSG_RESULT([--with-anastasis not specified]) | 311 | [AC_MSG_RESULT([--with-anastasis not specified]) |
314 | AC_CHECK_HEADERS([anastasis/anastasis_service.h], | 312 | AC_CHECK_HEADERS([anastasis/anastasis_service.h], |
315 | AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config], | 313 | AC_CHECK_LIB([anastasisrest], [ANASTASIS_get_config], |
316 | [anastasis=1] | 314 | [anastasis=1]))]) |
317 | ),,[#include <gnunet/platform.h>])]) | ||
318 | 315 | ||
319 | 316 | ||
320 | AS_IF([test "$anastasis" != 1], | 317 | AS_IF([test "$anastasis" != 1], |
@@ -459,7 +456,7 @@ AC_ARG_ENABLE([logging], | |||
459 | AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise]) | 456 | AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise]) |
460 | 457 | ||
461 | AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h], [], | 458 | AC_CHECK_HEADERS([gnunet/gnunet_util_lib.h], [], |
462 | AC_MSG_ERROR([compiling anastasis-gtk requires libgnunetutil]), [#include <gnunet/platform.h>]) | 459 | AC_MSG_ERROR([compiling anastasis-gtk requires libgnunetutil])) |
463 | 460 | ||
464 | AC_CHECK_LIB(gladeui-1,glade_xml_node_new, [], | 461 | AC_CHECK_LIB(gladeui-1,glade_xml_node_new, [], |
465 | [ | 462 | [ |
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 += \ | |||
99 | $(HPDF_CFLAGS) | 99 | $(HPDF_CFLAGS) |
100 | endif | 100 | endif |
101 | 101 | ||
102 | EXTRA_DIST = \ | ||
103 | gettext.h | ||
102 | 104 | ||
103 | if HPDF_ENABLED | 105 | if HPDF_ENABLED |
104 | noinst_PROGRAMS = \ | 106 | 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 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Dennis Neufeld | 25 | * @author Dennis Neufeld |
26 | */ | 26 | */ |
27 | #include <gnunet/platform.h> | ||
28 | #include <gnunet/gnunet_util_lib.h> | 27 | #include <gnunet/gnunet_util_lib.h> |
29 | #include "anastasis-gtk_action.h" | 28 | #include "anastasis-gtk_action.h" |
30 | #include "anastasis-gtk_helper.h" | 29 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_attributes.h" | 28 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_helper.h" | 27 | #include "anastasis-gtk_helper.h" |
29 | #include "anastasis-gtk_action.h" | 28 | #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 @@ | |||
22 | * @brief Autocomplete logic for GtkEntry widgets | 22 | * @brief Autocomplete logic for GtkEntry widgets |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_attributes.h" | 26 | #include "anastasis-gtk_attributes.h" |
28 | #include "anastasis-gtk_dispatch.h" | 27 | #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 @@ | |||
22 | * @brief Generic state dispatcher | 22 | * @brief Generic state dispatcher |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include "anastasis-gtk_helper.h" | 25 | #include "anastasis-gtk_helper.h" |
27 | #include "anastasis-gtk_dispatch.h" | 26 | #include "anastasis-gtk_dispatch.h" |
28 | 27 | ||
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 @@ | |||
23 | * @brief Dialog to add a provider during recovery | 23 | * @brief Dialog to add a provider during recovery |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Dennis Neufeld | 25 | * @author Dennis Neufeld |
26 | */ | 26 | */ |
27 | #include <gnunet/platform.h> | ||
28 | #include <gnunet/gnunet_util_lib.h> | 27 | #include <gnunet/gnunet_util_lib.h> |
29 | #include "anastasis-gtk_action.h" | 28 | #include "anastasis-gtk_action.h" |
30 | #include "anastasis-gtk_helper.h" | 29 | #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 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Dennis Neufeld | 25 | * @author Dennis Neufeld |
26 | */ | 26 | */ |
27 | #include <gnunet/platform.h> | ||
28 | #include <gnunet/gnunet_util_lib.h> | 27 | #include <gnunet/gnunet_util_lib.h> |
29 | #include "anastasis-gtk_action.h" | 28 | #include "anastasis-gtk_action.h" |
30 | #include "anastasis-gtk_helper.h" | 29 | #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 @@ | |||
23 | * @brief Handle dialogs for code returned to challenge address (Email, SMS, POST) | 23 | * @brief Handle dialogs for code returned to challenge address (Email, SMS, POST) |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
22 | * @brief Handle dialog for IBAN challenge | 22 | * @brief Handle dialog for IBAN challenge |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk.h" | 26 | #include "anastasis-gtk.h" |
28 | #include "anastasis-gtk_action.h" | 27 | #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 @@ | |||
23 | * @brief Handle dialogs for secure question | 23 | * @brief Handle dialogs for secure question |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle dialogs for code returned to challenge address (TOTP) | 23 | * @brief Handle dialogs for code returned to challenge address (TOTP) |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
22 | * @brief Handle user clicking a 'clear' button in the enter secret dialog | 22 | * @brief Handle user clicking a 'clear' button in the enter secret dialog |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_action.h" | 26 | #include "anastasis-gtk_action.h" |
28 | #include "anastasis-gtk_helper.h" | 27 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_helper.h" | 27 | #include "anastasis-gtk_helper.h" |
29 | #include "anastasis-gtk_action.h" | 28 | #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 @@ | |||
22 | * @brief | 22 | * @brief |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_helper.h" | 26 | #include "anastasis-gtk_helper.h" |
28 | #include "anastasis-gtk_action.h" | 27 | #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 @@ | |||
22 | * @brief The user changed the name of the core secret. Update state. | 22 | * @brief The user changed the name of the core secret. Update state. |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_helper.h" | 26 | #include "anastasis-gtk_helper.h" |
28 | #include "anastasis-gtk_action.h" | 27 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_helper.h" | 27 | #include "anastasis-gtk_helper.h" |
29 | #include "anastasis-gtk_action.h" | 28 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
22 | * @brief | 22 | * @brief |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_helper.h" | 26 | #include "anastasis-gtk_helper.h" |
28 | #include "anastasis-gtk_action.h" | 27 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_helper.h" | 27 | #include "anastasis-gtk_helper.h" |
29 | #include "anastasis-gtk_action.h" | 28 | #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 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Dennis Neufeld | 25 | * @author Dennis Neufeld |
26 | */ | 26 | */ |
27 | #include <gnunet/platform.h> | ||
28 | #include <gnunet/gnunet_util_lib.h> | 27 | #include <gnunet/gnunet_util_lib.h> |
29 | #include "anastasis-gtk_action.h" | 28 | #include "anastasis-gtk_action.h" |
30 | #include "anastasis-gtk_helper.h" | 29 | #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 @@ | |||
26 | #include "anastasis_gtk_config.h" | 26 | #include "anastasis_gtk_config.h" |
27 | #define HAVE_USED_CONFIG_H 1 | 27 | #define HAVE_USED_CONFIG_H 1 |
28 | 28 | ||
29 | #include <gnunet/platform.h> | ||
30 | #include <gnunet/gnunet_util_lib.h> | 29 | #include <gnunet/gnunet_util_lib.h> |
31 | #include "anastasis-gtk_action.h" | 30 | #include "anastasis-gtk_action.h" |
32 | #include "anastasis-gtk_attributes.h" | 31 | #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 @@ | |||
23 | * @brief Handle dialogs for security email | 23 | * @brief Handle dialogs for security email |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle dialogs for security iban | 23 | * @brief Handle dialogs for security iban |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle dialogs for security post | 23 | * @brief Handle dialogs for security post |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle dialogs for security question | 23 | * @brief Handle dialogs for security question |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle dialogs for security sms | 23 | * @brief Handle dialogs for security sms |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle dialogs for TOTP (RFC 6238) | 23 | * @brief Handle dialogs for TOTP (RFC 6238) |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Implementation of the "print" button, if we cannot use it | 23 | * @brief Implementation of the "print" button, if we cannot use it |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_helper.h" | 27 | #include "anastasis-gtk_helper.h" |
29 | #include <jansson.h> | 28 | #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 @@ | |||
22 | * @brief | 22 | * @brief |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_action.h" | 26 | #include "anastasis-gtk_action.h" |
28 | #include "anastasis-gtk_helper.h" | 27 | #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 @@ | |||
23 | * @brief Handle double-click in policy review | 23 | * @brief Handle double-click in policy review |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle right-click context menu in policy review | 23 | * @brief Handle right-click context menu in policy review |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle right-click context menu in policy review | 23 | * @brief Handle right-click context menu in policy review |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
22 | * @brief | 22 | * @brief |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_helper.h" | 26 | #include "anastasis-gtk_helper.h" |
28 | #include "anastasis-gtk_action.h" | 27 | #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 @@ | |||
22 | * @brief | 22 | * @brief |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_helper.h" | 26 | #include "anastasis-gtk_helper.h" |
28 | #include "anastasis-gtk_action.h" | 27 | #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 @@ | |||
23 | * @brief Implementation of the "Save as" button for the user attributes | 23 | * @brief Implementation of the "Save as" button for the user attributes |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_attributes.h" | 27 | #include "anastasis-gtk_attributes.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Dennis Neufeld | 25 | * @author Dennis Neufeld |
26 | */ | 26 | */ |
27 | #include <gnunet/platform.h> | ||
28 | #include <gnunet/gnunet_util_lib.h> | 27 | #include <gnunet/gnunet_util_lib.h> |
29 | #include "anastasis-gtk_action.h" | 28 | #include "anastasis-gtk_action.h" |
30 | #include "anastasis-gtk_helper.h" | 29 | #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 @@ | |||
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | * @author Dennis Neufeld | 24 | * @author Dennis Neufeld |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_handle-expiration-change.h" | 28 | #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 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @author Dennis Neufeld | 25 | * @author Dennis Neufeld |
26 | */ | 26 | */ |
27 | #include <gnunet/platform.h> | 27 | #define _GNU_SOURCE |
28 | #include <stdio.h> | ||
28 | #include <gnunet/gnunet_util_lib.h> | 29 | #include <gnunet/gnunet_util_lib.h> |
29 | #include "anastasis-gtk_helper.h" | 30 | #include "anastasis-gtk_helper.h" |
30 | #include <jansson.h> | 31 | #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 @@ | |||
22 | * @brief | 22 | * @brief |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_attributes.h" | 26 | #include "anastasis-gtk_attributes.h" |
28 | #include "anastasis-gtk_dispatch.h" | 27 | #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 @@ | |||
23 | * @brief Handle request to interactively add new policy | 23 | * @brief Handle request to interactively add new policy |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle request to delete challenge | 23 | * @brief Handle request to delete challenge |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle request to delete policy | 23 | * @brief Handle request to delete policy |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
23 | * @brief Handle request to interactively edit policy | 23 | * @brief Handle request to interactively edit policy |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | ||
27 | #include <gnunet/gnunet_util_lib.h> | 26 | #include <gnunet/gnunet_util_lib.h> |
28 | #include "anastasis-gtk_action.h" | 27 | #include "anastasis-gtk_action.h" |
29 | #include "anastasis-gtk_helper.h" | 28 | #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 @@ | |||
22 | * @brief Functions dealing with the tree views used to show the user where we are in the process | 22 | * @brief Functions dealing with the tree views used to show the user where we are in the process |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | #include "anastasis-gtk_helper.h" | 26 | #include "anastasis-gtk_helper.h" |
28 | #include <gdk-pixbuf/gdk-pixbuf.h> | 27 | #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 @@ | |||
1 | /* Convenience header for conditional use of GNU <libintl.h>. | ||
2 | Copyright Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. | ||
3 | |||
4 | This program is free software; you can redistribute it and/or modify it | ||
5 | under the terms of the GNU Library General Public License as published | ||
6 | by the Free Software Foundation; either version 3, or (at your option) | ||
7 | any later version. | ||
8 | |||
9 | This program is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
12 | Library General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU Library General Public | ||
15 | License along with this program; if not, write to the Free Software | ||
16 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, | ||
17 | USA. */ | ||
18 | |||
19 | #ifndef _LIBGETTEXT_H | ||
20 | #define _LIBGETTEXT_H 1 | ||
21 | |||
22 | /* NLS can be disabled through the configure --disable-nls option. */ | ||
23 | #if ENABLE_NLS | ||
24 | |||
25 | /* Get declarations of GNU message catalog functions. */ | ||
26 | |||
27 | #include <libintl.h> | ||
28 | |||
29 | #else | ||
30 | |||
31 | /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which | ||
32 | chokes if dcgettext is defined as a macro. So include it now, to make | ||
33 | later inclusions of <locale.h> a NOP. We don't include <libintl.h> | ||
34 | as well because people using "gettext.h" will not include <libintl.h>, | ||
35 | and also including <libintl.h> would fail on SunOS 4, whereas <locale.h> | ||
36 | is GNUNET_OK. */ | ||
37 | #if defined(__sun) | ||
38 | #include <locale.h> | ||
39 | #endif | ||
40 | |||
41 | /* Disabled NLS. | ||
42 | The casts to 'const char *' serve the purpose of producing warnings | ||
43 | for invalid uses of the value returned from these functions. | ||
44 | On pre-ANSI systems without 'const', the config.h file is supposed to | ||
45 | contain "#define const". */ | ||
46 | #define gettext(Msgid) ((const char *) (Msgid)) | ||
47 | #define dgettext(Domainname, Msgid) ((const char *) (Msgid)) | ||
48 | #define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) | ||
49 | #define ngettext(Msgid1, Msgid2, N) \ | ||
50 | ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) | ||
51 | #define dngettext(Domainname, Msgid1, Msgid2, N) \ | ||
52 | ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) | ||
53 | #define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ | ||
54 | ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) | ||
55 | /* slight modification here to avoid warnings: generate GNUNET_NO code, | ||
56 | not even the cast... */ | ||
57 | #define textdomain(Domainname) | ||
58 | #define bindtextdomain(Domainname, Dirname) | ||
59 | #define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) | ||
60 | |||
61 | #endif | ||
62 | |||
63 | /* A pseudo function call that serves as a marker for the automated | ||
64 | extraction of messages, but does not call gettext(). The run-time | ||
65 | translation is done at a different place in the code. | ||
66 | The argument, String, should be a literal string. Concatenated strings | ||
67 | and other string expressions won't work. | ||
68 | The macro's expansion is not parenthesized, so that it is suitable as | ||
69 | initializer for static 'char[]' or 'const char[]' variables. */ | ||
70 | #define gettext_noop(String) String | ||
71 | |||
72 | #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 @@ | |||
22 | * @brief initialize GNUNET_OS for anastasis-gtk | 22 | * @brief initialize GNUNET_OS for anastasis-gtk |
23 | * @author Christian Grothoff | 23 | * @author Christian Grothoff |
24 | */ | 24 | */ |
25 | #include <gnunet/platform.h> | ||
26 | #include <gnunet/gnunet_util_lib.h> | 25 | #include <gnunet/gnunet_util_lib.h> |
27 | 26 | ||
28 | /** | 27 | /** |
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 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <gnunet/platform.h> | ||
28 | #include <setjmp.h> | 27 | #include <setjmp.h> |
29 | #include <hpdf.h> | 28 | #include <hpdf.h> |
30 | #include <gnunet/gnunet_util_lib.h> | 29 | #include <gnunet/gnunet_util_lib.h> |