From 8cb3a02a26c03e57d064bd03319e34b6930ac3f5 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Wed, 17 Feb 2021 11:05:40 +0100
Subject: i18n: Use glib's gettext support macros

---
 src/ui/frames.c         | 2 ++
 src/ui/menu.c           | 4 +++-
 src/ui/metaaccellabel.c | 2 ++
 src/ui/resizepopup.c    | 2 ++
 src/ui/theme-parser.c   | 2 ++
 src/ui/theme-viewer.c   | 6 ++----
 src/ui/theme.c          | 2 ++
 7 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/frames.c b/src/ui/frames.c
index 5f938dff..4b2d597d 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -24,6 +24,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include <math.h>
 #include <string.h>
 #include "boxes.h"
diff --git a/src/ui/menu.c b/src/ui/menu.c
index ac5fb2c1..df40f1b6 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -21,8 +21,10 @@
  * 02110-1301, USA.
  */
 
-#include <gdk/gdkx.h>
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
+#include <gdk/gdkx.h>
 #include <stdio.h>
 #include <string.h>
 #include "menu.h"
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
index f6903d44..28867702 100644
--- a/src/ui/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
@@ -32,6 +32,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "metaaccellabel.h"
 #include <gtk/gtk.h>
 #include <string.h>
diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
index 0464636d..1e57756d 100644
--- a/src/ui/resizepopup.c
+++ b/src/ui/resizepopup.c
@@ -22,6 +22,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "resizepopup.h"
 #include "util.h"
 #include <gtk/gtk.h>
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index a200876c..a8557a69 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -22,6 +22,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "theme-parser.h"
 #include "util.h"
 #include <string.h>
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 35fcdda3..e301e9b6 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -22,6 +22,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
+
 #include "util.h"
 #include "theme.h"
 #include "theme-parser.h"
@@ -31,10 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libintl.h>
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) x
-
 /* We need to compute all different button arrangements
  * in terms of button location. We don't care about
  * different arrangements in terms of button function.
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 3a623f9e..bd51673e 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -53,6 +53,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "prefs.h"
 #include "theme.h"
 #include "theme-parser.h"
-- 
cgit v1.2.1