Ticket #33959: patch-glib-2.32.diff

./src/common/dbus/dbus-plugin.c

@@ -24 +24 @@
 #include <config.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include "../xchat-plugin.h"
 
 #define PNAME _("remote access")

./src/common/modes.c

@@ -20 +20 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <glib.h>
-#include <glib/gprintf.h>
+#include <glib.h>
 
 #include "xchat.h"
 #include "xchatc.h"

./src/common/servlist.c

@@ -24 +24 @@
 #include <unistd.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 
 #include "cfgfiles.h"
 #include "fe.h"

./src/common/text.c

@@ -28 +28 @@
 #include <sys/mman.h>
 
 #include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
 #include "cfgfiles.h"
 #include "chanopt.h"
 #include "plugin.h"

./src/common/util.c

@@ -39 +39 @@
 #include <errno.h>
 #include "xchat.h"
 #include "xchatc.h"
-#include <glib/gmarkup.h>
+#include <glib.h>
 #include <ctype.h>
 #include "util.h"
 #include "../../config.h"

./src/common/xchat.h

@@ -1 +1 @@
 #include "../../config.h"
 
-#include <glib/gslist.h>
-#include <glib/glist.h>
-#include <glib/gutils.h>
-#include <glib/giochannel.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <time.h>                       /* need time_t */
 
 #ifndef XCHAT_H

./src/fe-gtk/sexy-spell-entry.c

@@ -26 +26 @@
 #include <gtk/gtk.h>
 #include "sexy-spell-entry.h"
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <sys/types.h>
 /*#include "gtkspell-iso-codes.h"
 #include "sexy-marshal.h"*/