Drop gdkintl.h

This header was merely including gi18n-lib.h.
Just do that directly.

gdk/broadway/gdkbroadway-server.c

@@ -34,7 +34,7 @@
 #ifdef G_OS_WIN32
 #include <windows.h>
 #endif
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 typedef struct BroadwayInput BroadwayInput;
 

gdk/gdk.c

@@ -32,7 +32,7 @@
 #include "gdkdebugprivate.h"
 #include "gdkdisplay.h"
 #include "gdkglcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 #include <glib/gprintf.h>
 

gdk/gdkapplaunchcontext.c

@@ -22,7 +22,7 @@
 
 #include "gdkapplaunchcontextprivate.h"
 #include "gdkdisplay.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 
 /**

gdk/gdkclipboard.c

@@ -26,7 +26,7 @@
 #include "gdkcontentproviderprivate.h"
 #include "gdkcontentserializer.h"
 #include "gdkdisplay.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkpipeiostreamprivate.h"
 #include "gdktexture.h"
 #include "gdkprivate.h"

gdk/gdkcontentprovider.c

@@ -22,7 +22,7 @@
 
 #include "gdkclipboard.h"
 #include "gdkcontentformats.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 
 /**

gdk/gdkcontentproviderimpl.c

@@ -24,7 +24,7 @@
 
 #include "gdkcontentformats.h"
 #include "gdkcontentserializer.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkcontentproviderimpl.h"
 
 #include "gdkprivate.h"

gdk/gdkcursor.c

@@ -30,7 +30,7 @@
 #include "gdkcursor.h"
 #include "gdkcursorprivate.h"
 #include "gdktexture.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <math.h>
 #include <errno.h>

gdk/gdkdevice.c

@@ -22,7 +22,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevicetool.h"
 #include "gdkdisplayprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkkeysprivate.h"
 
 /**

gdk/gdkdevicetool.c

@@ -21,7 +21,7 @@
 
 #include "gdkdevicetoolprivate.h"
 #include "gdkenumtypes.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkDeviceTool:

gdk/gdkdisplay.c

@@ -24,7 +24,7 @@
 #include "gdkdisplay.h"
 #include "gdkdisplayprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 
 #include "gdkapplaunchcontext.h"

gdk/gdkdisplaymanager.c

@@ -28,7 +28,7 @@
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdkkeysprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"

gdk/gdkdrag.c

@@ -42,7 +42,7 @@
 #include "gdkdragprivate.h"
 #include "gdkdisplay.h"
 #include "gdksurface.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkcontentformats.h"
 #include "gdkcontentprovider.h"
 #include "gdkcontentserializer.h"

gdk/gdkdragsurface.c

@@ -21,7 +21,7 @@
 
 #include "gdkprivate.h"
 #include "gdkdragsurfaceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkDragSurface:

gdk/gdkdrawcontext.c

@@ -23,7 +23,7 @@
 #include "gdkdrawcontextprivate.h"
 
 #include "gdkdebugprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprofilerprivate.h"
 #include "gdksurfaceprivate.h"
 

gdk/gdkdrop.c

@@ -49,7 +49,7 @@
 #include "gdkdragprivate.h"
 #include "gdkenumtypes.h"
 #include "gdkeventsprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkpipeiostreamprivate.h"
 #include "gdksurface.h"
 

gdk/gdkevents.c

@@ -28,7 +28,7 @@
 #include "gdkdragprivate.h"
 #include "gdkdropprivate.h"
 #include "gdkeventsprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"
 #include "gdkprivate.h"

gdk/gdkglcontext.c

@@ -78,7 +78,7 @@
 
 #include "gdkdebugprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"

gdk/gdkintl.h

@@ -1,30 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GDKINTL_H__
-#define __GDKINTL_H__
-
-#include <glib/gi18n-lib.h>
-
-#endif

gdk/gdkpango.c

@@ -19,7 +19,7 @@
 
 #include "gdkpango.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <math.h>
 #include <pango/pangocairo.h>

gdk/gdkpopup.c

@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include "gdkprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkpopupprivate.h"
 
 /**

gdk/gdkseat.c

@@ -25,7 +25,7 @@
 #include "gdkdevicetoolprivate.h"
 #include "gdkseatprivate.h"
 #include "gdkdeviceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkSeat:

gdk/gdksurface.c

@@ -37,7 +37,7 @@
 #include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
 #include "gdkglcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmarshalers.h"
 #include "gdkpopupprivate.h"
 #include "gdkrectangle.h"

gdk/gdktexture.c

@@ -39,7 +39,7 @@
 
 #include "gdktextureprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemorytextureprivate.h"
 #include "gdkpaintable.h"
 #include "gdksnapshot.h"

gdk/gdktoplevel.c

@@ -23,7 +23,7 @@
 
 #include "gdkdisplay.h"
 #include "gdkenumtypes.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate.h"
 
 #include <graphene-gobject.h>

gdk/gdkvulkancontext.c

@@ -25,7 +25,7 @@
 #include "gdkvulkancontextprivate.h"
 
 #include "gdkdisplayprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkVulkanContext:

gdk/loaders/gdkjpeg.c

@@ -21,7 +21,7 @@
 
 #include "gdkjpegprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdktexture.h"
 #include "gdkmemorytextureprivate.h"
 

gdk/loaders/gdkpng.c

@@ -19,7 +19,7 @@
 
 #include "gdkpngprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"

gdk/loaders/gdktiff.c

@@ -19,7 +19,7 @@
 
 #include "gdktiffprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"

gdk/macos/gdkmacosdrag.c

@@ -28,7 +28,7 @@
 
 #include "gdk/gdkdeviceprivate.h"
 #include "gdk/gdkeventsprivate.h"
-#include "gdk/gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdk/gdkseatprivate.h"
 #include "gdk/gdkprivate.h"
 

gdk/wayland/gdkapplaunchcontext-wayland.c

@@ -26,7 +26,7 @@
 #include "gdkwayland.h"
 #include "gdkprivate-wayland.h"
 #include "gdkapplaunchcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 typedef struct {
   gchar *token;

gdk/wayland/gdkclipboard-wayland.c

@@ -21,7 +21,7 @@
 #include "gdkclipboard-wayland.h"
 
 #include "gdkcontentformats.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-wayland.h"
 #include "gdkprivate.h"
 

gdk/wayland/gdkdrag-wayland.c

@@ -22,7 +22,7 @@
 #include "gdkprivate-wayland.h"
 #include "gdkcontentformats.h"
 #include "gdkdisplay-wayland.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkseat-wayland.h"
 
 #include "gdkdeviceprivate.h"

gdk/wayland/gdkdrop-wayland.c

@@ -22,7 +22,7 @@
 #include "gdkprivate-wayland.h"
 #include "gdkcontentformats.h"
 #include "gdkdisplay-wayland.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkseat-wayland.h"
 
 #include "gdkdeviceprivate.h"

gdk/wayland/gdkglcontext-wayland.c

@@ -35,7 +35,7 @@
 #include "gdksurfaceprivate.h"
 #include "gdkprofilerprivate.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 /**
  * GdkWaylandGLContext:

gdk/wayland/gdkprimary-wayland.c

@@ -21,7 +21,7 @@
 
 #include "gdkclipboardprivate.h"
 #include "gdkcontentformats.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-wayland.h"
 #include "gdkprivate.h"
 

gdk/win32/gdkclipboard-win32.c

@@ -21,7 +21,7 @@
 #include "gdkclipboard-win32.h"
 
 #include "gdkdebugprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-win32.h"
 #include "gdkhdataoutputstream-win32.h"
 #include "gdk/gdkprivate.h"

gdk/win32/gdkclipdrop-win32.c

@@ -286,7 +286,7 @@ Otherwise it's similar to how the clipboard works. Only the DnD server
 
 #include "gdk/gdkdebugprivate.h"
 #include "gdk/gdkdragprivate.h"
-#include "gdk/gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdk/gdkprivate.h"
 
 #define HIDA_GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0])

gdk/win32/gdkcursor-win32.c

@@ -22,7 +22,7 @@
 #include "gdkcursor.h"
 #include "gdkwin32.h"
 #include "gdktextureprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include "gdkdisplay-win32.h"
 

gdk/win32/gdkdrag-win32.c

@@ -214,7 +214,7 @@
 #include <shlobj.h>
 #include <shlguid.h>
 #include <objidl.h>
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <gdk/gdk.h>
 #include <glib/gstdio.h>

gdk/win32/gdkdrop-win32.c

@@ -56,7 +56,7 @@
 #include <shlobj.h>
 #include <shlguid.h>
 #include <objidl.h>
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <gdk/gdk.h>
 #include <glib/gstdio.h>

gdk/win32/gdkglcontext-win32-egl.c

@@ -35,7 +35,7 @@
 
 #include "gdkglcontext.h"
 #include "gdksurface.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo.h>
 #include <epoxy/egl.h>

gdk/win32/gdkglcontext-win32-wgl.c

@@ -35,7 +35,7 @@
 
 #include "gdkglcontext.h"
 #include "gdkprofilerprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdksurface.h"
 
 #include <cairo.h>

gdk/win32/gdkglcontext-win32.c

@@ -35,7 +35,7 @@
 
 #include "gdkglcontext.h"
 #include "gdksurface.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo.h>
 #include <epoxy/wgl.h>

gdk/win32/gdkhdataoutputstream-win32.c

@@ -27,7 +27,7 @@
 
 #include "gdkclipboard-win32.h"
 #include "gdkdisplay-win32.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkwin32display.h"
 #include "gdkwin32surface.h"
 

gdk/win32/gdkmain-win32.c

@@ -34,7 +34,7 @@
 #include "gdk.h"
 #include "gdkdebugprivate.h"
 #include "gdkkeysyms.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-win32.h"
 #include "gdkinput-dmanipulation.h"
 #include "gdkwin32.h"

gdk/x11/gdkapplaunchcontext-x11.c

@@ -22,7 +22,7 @@
 
 #include "gdkx11applaunchcontext.h"
 #include "gdkapplaunchcontextprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkprivate.h"

gdk/x11/gdkclipboard-x11.c

@@ -20,7 +20,7 @@
 #include "gdkclipboardprivate.h"
 #include "gdkclipboard-x11.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkdisplay-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkselectioninputstream-x11.h"

gdk/x11/gdkdevice-xi2.c

@@ -21,7 +21,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdevice-xi2-private.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkasync.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"

gdk/x11/gdkdevicemanager-xi2.c

@@ -28,7 +28,7 @@
 #include "gdkkeys-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkkeysyms.h"
 #include "gdkseatdefaultprivate.h"
 

gdk/x11/gdkdrag-x11.c

@@ -36,7 +36,7 @@
 #include "gdkdragprivate.h"
 #include "gdkeventsprivate.h"
 #include "gdksurfaceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkseatprivate.h"

gdk/x11/gdkdrop-x11.c

@@ -33,7 +33,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdisplay-x11.h"
 #include "gdkdragprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkselectioninputstream-x11.h"

gdk/x11/gdkglcontext-egl.c

@@ -22,7 +22,7 @@
 #include <X11/Xatom.h>
 
 #include "gdkprofilerprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo-xlib.h>
 

gdk/x11/gdkglcontext-glx.c

@@ -23,7 +23,7 @@
 #include <X11/Xatom.h>
 
 #include "gdkprofilerprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo-xlib.h>
 

gdk/x11/gdkglcontext-x11.c

@@ -31,7 +31,7 @@
 #include "gdkx11property.h"
 #include <X11/Xatom.h>
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 
 #include <cairo-xlib.h>
 

gdk/x11/gdkmain-x11.c

@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "gdkdeviceprivate.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkasync.h"
 #include "gdkdisplay-x11.h"
 #include "gdkprivate-x11.h"

gdk/x11/gdkselectioninputstream-x11.c

@@ -24,7 +24,7 @@
 #include "gdkselectioninputstream-x11.h"
 
 #include "gdkdisplay-x11.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkx11display.h"
 #include "gdkx11property.h"
 #include "gdkx11surface.h"

gdk/x11/gdkselectionoutputstream-x11.c

@@ -25,7 +25,7 @@
 
 #include "gdkclipboard-x11.h"
 #include "gdkdisplay-x11.h"
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdktextlistconverter-x11.h"
 #include "gdkx11display.h"
 #include "gdkx11property.h"

gdk/x11/gdktextlistconverter-x11.c

@@ -22,7 +22,7 @@
 
 #include "gdktextlistconverter-x11.h"
 
-#include "gdkintl.h"
+#include <glib/gi18n-lib.h>
 #include "gdkprivate-x11.h"
 
 #define GDK_X11_TEXT_LIST_CONVERTER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_X11_TEXT_LIST_CONVERTER, GdkX11TextListConverterClass))

gsk/gl/gskglrenderer.c

@@ -24,7 +24,7 @@
 #include <gdk/gdkdisplayprivate.h>
 #include <gdk/gdkglcontextprivate.h>
 #include <gdk/gdksurfaceprivate.h>
-#include <gdk/gdkintl.h>
+#include <glib/gi18n-lib.h>
 #include <gsk/gskdebugprivate.h>
 #include <gsk/gskrendererprivate.h>
 #include <gsk/gskrendernodeprivate.h>