[Xfce4-commits] [xfce/libxfce4ui] 01/01: fix: add libxfce4ui_get_resource to abi check symbols (Bug #13326)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/libxfce4ui.

commit 1feefa99ee50ff0cab474d52d4d00407e4e95362
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Tue May 16 10:04:27 2017 +0300

    fix: add libxfce4ui_get_resource to abi check symbols (Bug #13326)
    
    libxfce4ui_get_resource is only used internally but the abi check
    still needs it to be added. Instead of complicating that symbol
    file more, we'll just build the libxfce4ui-dialog-ui.ui resource
    for both Gtk2 and Gtk3 even though we only need it for Gtk3.
---
 libxfce4ui/Makefile.am        | 11 ++++-------
 libxfce4ui/libxfce4ui.symbols |  1 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index 0a6a59f..9644a72 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -84,10 +84,6 @@ pkgconfig_DATA = libxfce4ui-1.pc
 ##
 if ENABLE_GTK3_LIBRARY
 
-libxfce4ui_built_sources += \
-	libxfce4ui-resources.c \
-	libxfce4ui-resources.h
-
 libxfce4ui2_includedir = \
 	$(includedir)/xfce4/libxfce4ui-2/libxfce4ui
 
@@ -188,11 +184,14 @@ libxfce4ui-enum-types.c: $(libxfce4ui_enum_headers) Makefile
 	cp xgen-letc libxfce4ui-enum-types.c
 	rm -f xgen-letc
 
-if ENABLE_GTK3_LIBRARY
 LIBXFCE4UI_RESOURCE_FILES = \
 	libxfce4ui-dialog-ui.ui \
 	$(NULL)
 
+libxfce4ui_built_sources += \
+	libxfce4ui-resources.c \
+	libxfce4ui-resources.h
+
 libxfce4ui-resources.c: libxfce4ui.gresource.xml $(UI_FILES)
 	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name libxfce4ui $(srcdir)/libxfce4ui.gresource.xml
 
@@ -201,8 +200,6 @@ libxfce4ui-resources.h: libxfce4ui.gresource.xml
 
 endif
 
-endif
-
 # required for gtk-doc
 dist-hook: all
 
diff --git a/libxfce4ui/libxfce4ui.symbols b/libxfce4ui/libxfce4ui.symbols
index bd87d5f..a4bf4ae 100644
--- a/libxfce4ui/libxfce4ui.symbols
+++ b/libxfce4ui/libxfce4ui.symbols
@@ -40,6 +40,7 @@
 libxfce4ui_major_version
 libxfce4ui_minor_version
 libxfce4ui_micro_version
+libxfce4ui_get_resource
 #endif
 libxfce4ui_check_version
 #endif

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.