i18n: Use glib's gettext support macros

po/POTFILES.in

@@ -8,7 +8,6 @@ src/core/bell.c
 src/core/core.c
 src/core/delete.c
 src/core/display.c
-src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
 src/core/prefs.c

src/core/bell.c

@@ -49,6 +49,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "bell.h"
 #include "screen-private.h"
 #include "prefs.h"

src/core/core.c

@@ -24,6 +24,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "core.h"
 #include "frame-private.h"
 #include "workspace.h"

src/core/delete.c

@@ -26,6 +26,8 @@
 #define _XOPEN_SOURCE /* for gethostname() and kill() */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "util.h"
 #include "window-private.h"
 #include "errors.h"

src/core/display.c

@@ -29,6 +29,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "display-private.h"
 #include "util.h"
 #include "main.h"

src/core/errors.c

@@ -50,4 +50,3 @@ meta_error_trap_pop_with_return  (MetaDisplay *display,
 {
   return gdk_x11_display_error_trap_pop (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));
 }
-

src/core/keybindings.c

@@ -27,6 +27,8 @@
 #define _XOPEN_SOURCE /* for putenv() */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "keybindings.h"
 #include "workspace.h"
 #include "errors.h"

src/core/main.c

@@ -45,6 +45,8 @@
 #define _XOPEN_SOURCE /* for putenv() and some signal-related functions */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "main.h"
 #include "util.h"
 #include "display-private.h"

src/core/prefs.c

@@ -24,6 +24,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "prefs.h"
 #include "ui.h"
 #include "util.h"

src/core/screen.c

@@ -27,6 +27,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "screen-private.h"
 #include "util.h"
 #include "errors.h"

src/core/session.c

@@ -24,6 +24,7 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
 
 #include "session.h"
 #include <X11/Xatom.h>

src/core/util.c

@@ -26,6 +26,8 @@
 #define _POSIX_C_SOURCE 200112L /* for fdopen() */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "util.h"
 #include "main.h"
 

src/core/window-props.c

@@ -39,6 +39,8 @@
 #define _XOPEN_SOURCE /* for gethostname() */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "window-props.h"
 #include "errors.h"
 #include "xprops.h"

src/core/window.c

@@ -25,6 +25,8 @@
  */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "window-private.h"
 #include "edge-resistance.h"
 #include "util.h"

src/core/xprops.c

@@ -80,6 +80,8 @@ from The Open Group.
 */
 
 #include <config.h>
+#include <glib/gi18n-lib.h>
+
 #include "xprops.h"
 #include "errors.h"
 #include "util.h"

src/include/util.h

@@ -90,10 +90,6 @@ void meta_print_backtrace (void);
 
 const char* meta_gravity_to_string (int gravity);
 
-#include <libintl.h>
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) x
-
 char* meta_g_utf8_strndup (const gchar *src, gsize n);
 
 GPid meta_show_dialog (const char *type,

src/tools/marco-message.c

@@ -20,15 +20,12 @@
  */
 
 #include <config.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <libintl.h>
-#define _(x) dgettext (GETTEXT_PACKAGE, x)
-#define N_(x) x
-
 static void
 send_restart (void)
 {

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"

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"

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>

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>

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>

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.

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"