From 34c6aec4dd5f77497d67e54ec3e13f342c941506 Mon Sep 17 00:00:00 2001
From: Eric Koegel <eric.koegel@gmail.com>
Date: Tue, 18 Jul 2017 14:28:31 +0300
Subject: [PATCH] Attempt to fix missing gresource file (Bug #13705)

Go back to how the 4.13.1 gresource handling was done and try to
keep the check_abi script happy at the same time.
---
 libxfce4ui/Makefile.am    | 14 +++++++++-----
 libxfce4ui/xfce-dialogs.c |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index feaee0d..8a6e256 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -33,7 +33,9 @@ libxfce4ui_built_sources = \
 	libxfce4ui-enum-types.c \
 	libxfce4ui-enum-types.h \
 	libxfce4ui-marshal.c \
-	libxfce4ui-marshal.h
+	libxfce4ui-marshal.h \
+	libxfce4ui-resources.c \
+	libxfce4ui-resources.h
 
 libxfce4ui_sources = \
 	$(libxfce4ui_headers) \
@@ -103,10 +105,6 @@ LIBXFCE4UI_RESOURCE_FILES = \
 	libxfce4ui-dialog-ui.ui \
 	$(NULL)
 
-libxfce4ui-resources.c: libxfce4ui.gresource.xml $(LIBXFCE4UI_RESOURCE_FILES)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --internal --c-name libxfce4ui libxfce4ui.gresource.xml
-
-
 include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ENV = CC="$(CC)"
@@ -243,6 +241,12 @@ libxfce4ui-enum-types.c: $(libxfce4ui_enum_headers) Makefile
 		$(libxfce4ui_enum_headers) ) > xgen-letc
 	cp xgen-letc libxfce4ui-enum-types.c
 	rm -f xgen-letc
+
+libxfce4ui-resources.c: libxfce4ui.gresource.xml $(LIBXFCE4UI_RESOURCE_FILES)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source --internal --c-name libxfce4ui libxfce4ui.gresource.xml
+libxfce4ui-resources.h: libxfce4ui.gresource.xml $(LIBXFCE4UI_RESOURCE_FILES)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header --internal --c-name libxfce4ui libxfce4ui.gresource.xml
+
 endif
 
 # required for gtk-doc
diff --git a/libxfce4ui/xfce-dialogs.c b/libxfce4ui/xfce-dialogs.c
index 60a2340..cf402f9 100644
--- a/libxfce4ui/xfce-dialogs.c
+++ b/libxfce4ui/xfce-dialogs.c
@@ -54,6 +54,7 @@
 #include <libxfce4ui/libxfce4ui-private.h>
 #include <libxfce4ui/libxfce4ui-alias.h>
 
+#include "libxfce4ui-resources.h"
 
 static void
 xfce_dialog_show_help_auto_toggled (GtkWidget *button)
-- 
2.11.0