From c949aac8a29e46480f2f7a1a5d759cbf1dc56b0b Mon Sep 17 00:00:00 2001 From: Andrew Sobala Date: Fri, 2 Jan 2004 19:11:57 +0000 Subject: [PATCH] use GNOMECC_GLADE_DIR. Patch from Marcin Krzyzanowski. Fixes: Bug 126545. 2004-01-02 Andrew Sobala * Makefile.am: * themus-theme-applier.c: (main): use GNOMECC_GLADE_DIR. Patch from Marcin Krzyzanowski. Fixes: Bug 126545. --- vfs-methods/themus/ChangeLog | 6 ++++++ vfs-methods/themus/Makefile.am | 5 ++++- vfs-methods/themus/themus-theme-applier.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog index 0e5d4e451..a7867d9e6 100644 --- a/vfs-methods/themus/ChangeLog +++ b/vfs-methods/themus/ChangeLog @@ -1,3 +1,9 @@ +2004-01-02 Andrew Sobala + + * Makefile.am: + * themus-theme-applier.c: (main): use GNOMECC_GLADE_DIR. Patch from + Marcin Krzyzanowski. Fixes: Bug 126545. + 2003-12-30 Jody Goldberg * Release 2.5.1.1 diff --git a/vfs-methods/themus/Makefile.am b/vfs-methods/themus/Makefile.am index 6c422fe38..5f8834567 100644 --- a/vfs-methods/themus/Makefile.am +++ b/vfs-methods/themus/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \ $(THEMUS_THUMBNAILER_CFLAGS) \ $(THEMUS_COMPONENT_CFLAGS) \ -I$(top_srcdir)/capplets/common \ + -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \ -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \ -DDATA_DIR=\"$(datadir)/themus\" @@ -39,7 +40,8 @@ libthemus_theme_properties_view_la_SOURCES = \ themus-properties-view.h \ themus-properties-main.c -pkgdata_DATA = apply-font.glade +Gladedir = $(GNOMECC_GLADE_DIR) +Glade_DATA = apply-font.glade @INTLTOOL_DIRECTORY_RULE@ @@ -78,6 +80,7 @@ install-data-local: @INTLTOOL_SCHEMAS_RULE@ EXTRA_DIST = \ + $(Glade_DATA) \ apply-font.glade \ theme-method.directory.in \ theme-method.conf \ diff --git a/vfs-methods/themus/themus-theme-applier.c b/vfs-methods/themus/themus-theme-applier.c index 169a76c34..06513661f 100644 --- a/vfs-methods/themus/themus-theme-applier.c +++ b/vfs-methods/themus/themus-theme-applier.c @@ -69,7 +69,7 @@ int main (int argc, char* argv[]) if (theme->application_font) { glade_init (); - font_xml = glade_xml_new (DATA_DIR "/apply-font.glade", + font_xml = glade_xml_new (GNOMECC_GLADE_DIR "/apply-font.glade", NULL, NULL); if (font_xml) {