qulogic/gplugin

Merged in feature/gi18n-fixes (pull request #54)
develop
2020-02-17, Gary Kramlich
835568a9ed82
Merged in feature/gi18n-fixes (pull request #54)

switch all of the library sources from using gi18n.h to gi18n-lib.h.

Approved-by: Richard Laager
Approved-by: Elliott Sales de Andrade
--- a/gplugin/gplugin-core.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-core.c Mon Feb 17 01:28:29 2020 +0000
@@ -16,7 +16,7 @@
*/
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <glib-object.h>
#include <gplugin/gplugin-core.h>
--- a/gplugin/gplugin-file-tree.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-file-tree.c Mon Feb 17 01:28:29 2020 +0000
@@ -17,7 +17,7 @@
#include "gplugin-file-tree.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
/******************************************************************************
* FileTreeEntry API
--- a/gplugin/gplugin-loader-tests.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-loader-tests.c Mon Feb 17 01:28:29 2020 +0000
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gplugin.h>
--- a/gplugin/gplugin-manager.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-manager.c Mon Feb 17 01:28:29 2020 +0000
@@ -19,7 +19,7 @@
#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gplugin/gplugin-manager.h>
#include <gplugin/gplugin-core.h>
--- a/gplugin/gplugin-native-loader.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-native-loader.c Mon Feb 17 01:28:29 2020 +0000
@@ -22,7 +22,7 @@
#include <gplugin/gplugin-native-plugin.h>
#include <gplugin/gplugin-native-private.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gmodule.h>
--- a/gplugin/gplugin-native-plugin.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-native-plugin.c Mon Feb 17 01:28:29 2020 +0000
@@ -24,7 +24,7 @@
#include <gplugin/gplugin-core.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
/**
* SECTION:gplugin-native-plugin
--- a/gplugin/gplugin-options.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-options.c Mon Feb 17 01:28:29 2020 +0000
@@ -16,7 +16,7 @@
*/
#include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <glib-object.h>
#include <gplugin/gplugin-options.h>
--- a/gplugin/gplugin-version.c Sat Feb 15 06:04:37 2020 +0000
+++ b/gplugin/gplugin-version.c Mon Feb 17 01:28:29 2020 +0000
@@ -30,7 +30,7 @@
#include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
/******************************************************************************
* Globals
--- a/lua/gplugin-lua-loader.c Sat Feb 15 06:04:37 2020 +0000
+++ b/lua/gplugin-lua-loader.c Mon Feb 17 01:28:29 2020 +0000
@@ -19,7 +19,7 @@
#include "gplugin-lua-plugin.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <lua.h>
#include <lauxlib.h>
--- a/perl/gplugin-perl-loader.c Sat Feb 15 06:04:37 2020 +0000
+++ b/perl/gplugin-perl-loader.c Mon Feb 17 01:28:29 2020 +0000
@@ -18,7 +18,7 @@
#include "gplugin-perl-loader.h"
#include "gplugin-perl-plugin.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
struct _GPluginPerlLoader {
GPluginLoader parent;
--- a/perl/gplugin-perl-plugin.c Sat Feb 15 06:04:37 2020 +0000
+++ b/perl/gplugin-perl-plugin.c Mon Feb 17 01:28:29 2020 +0000
@@ -20,12 +20,6 @@
#include <EXTERN.h>
#include <perl.h>
-/* perl define's _() to something completely different that we don't use. So
- * we undef it so that we can use it for gettext.
- */
-#undef _
-#include <glib/gi18n.h>
-
/******************************************************************************
* Typedefs
*****************************************************************************/
--- a/python/gplugin-python-loader.c Sat Feb 15 06:04:37 2020 +0000
+++ b/python/gplugin-python-loader.c Mon Feb 17 01:28:29 2020 +0000
@@ -24,7 +24,7 @@
#include "gplugin-python-plugin.h"
#include "gplugin-python-utils.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <pygobject.h>
--- a/tcc/gplugin-tcc-loader.c Sat Feb 15 06:04:37 2020 +0000
+++ b/tcc/gplugin-tcc-loader.c Mon Feb 17 01:28:29 2020 +0000
@@ -19,7 +19,7 @@
#include "gplugin-tcc-plugin.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <libtcc.h>