[GNUnet-SVN] [gnunet-ext] branch master updated: Added patch by AV from ML

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet-ext.

The following commit(s) were added to refs/heads/master by this push:
     new 394dd1a  Added patch by AV from ML
394dd1a is described below

commit 394dd1a50989a7096511a604ff0d8a0a7f8a5fe2
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sun Sep 1 13:26:01 2019 +0200

    Added patch by AV from ML
    
    Currently, gettext doesn't work for out-of-tree applications.  This is
    because GNUnet forcibly set the text domain to "GNUnet" (which
    apparently is also incorrect), so applications can't be localized unless
    their localizations are distributed in-tree by GNUnet itself.
    
    The attached patch tries to fix this by adding two more fields to
    GNUNET_OS_ProjectData: one field is the gettext domain of the
    application.  As the documentation says, if it's NULL gettext is
    disabled so that applications can use their preferred localization
    method without having gettext interfering; the other field is
    essentially the locale directory, so applications can specify a
    different path if they want to, instead of having GNUnet infer it for
    them.
    
    Because some GNUnet libraries also use gettext internally (the util lib
    is a prominent example), gettext has to be initialized before the
    application takes over.  I placed such initialization in
    `GNUNET_OS_init' and `GNUNET_OS_project_data_get' because those are two
    functions which are very likely to be called (especially the second one,
    since it's used in `GNUNET_PROGRAM_run2'.)  If there is a better place
    (or some places where this is not enough) I can change it and resubmit
    it for review.
    
    I also changed gnunet-ext to keep it consitent with the patch.  In
    particular, it adds a header which is required for a successful
    compilation, so you might want to at least make that change.
    
    Thank you,
    A.V.
    
    P.S. I'm still not subscribed to the list... yet.
---
 src/ext/gnunet-ext.c         | 6 ++++++
 src/ext/gnunet-service-ext.c | 4 ++++
 src/ext/test_ext_api.c       | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/src/ext/gnunet-ext.c b/src/ext/gnunet-ext.c
index f18e351..00195e0 100644
--- a/src/ext/gnunet-ext.c
+++ b/src/ext/gnunet-ext.c
@@ -34,6 +34,10 @@
 #define SOCKTYPE int
 #endif
 
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
 #include <gnunet/gettext.h>
 #include <gnunet/gnunet_util_lib.h>
 #include "gnunet_ext_service.h"
@@ -56,6 +60,8 @@ static const struct GNUNET_OS_ProjectData gnunetext_pd =
    .user_config_file = "~/.config/gnunet-ext.conf",
    .version = "1.0",
    .is_gnu = 1,
+   .gettext_domain = PACKAGE,
+   .gettext_path = NULL,
   };
 
 /**
diff --git a/src/ext/gnunet-service-ext.c b/src/ext/gnunet-service-ext.c
index aa43933..4ebcdf2 100644
--- a/src/ext/gnunet-service-ext.c
+++ b/src/ext/gnunet-service-ext.c
@@ -34,6 +34,10 @@
 #define SOCKTYPE int
 #endif
 
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
 #include <gnunet/gnunet_util_lib.h>
 #include "gnunet_protocols_ext.h"
 
diff --git a/src/ext/test_ext_api.c b/src/ext/test_ext_api.c
index e69dca0..6a95d04 100644
--- a/src/ext/test_ext_api.c
+++ b/src/ext/test_ext_api.c
@@ -32,6 +32,10 @@
 #define SOCKTYPE int
 #endif
 
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
 #include <gnunet/gnunet_util_lib.h>
 #include "gnunet_ext_service.h"
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.