applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use GNOMECC_GLADE_DIR. Patch from Marcin Krzyzanowski. Fixes: Bug 126545.

Browse source 
2004-01-02  Andrew Sobala  <aes@gnome.org>

	* Makefile.am:
	* themus-theme-applier.c: (main): use GNOMECC_GLADE_DIR. Patch from
	Marcin Krzyzanowski. Fixes: Bug 126545.
This commit is contained in:
Andrew Sobala 2004-01-02 19:11:57 +00:00 • committed by Andrew Sobala
parent 012b1218a4
commit c949aac8a2
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
vfs-methods/themus/ChangeLog
View file

@ -1,3 +1,9 @@
2004-01-02 Andrew Sobala <aes@gnome.org>
* Makefile.am:
* themus-theme-applier.c: (main): use GNOMECC_GLADE_DIR. Patch from
Marcin Krzyzanowski. Fixes: Bug 126545.
2003-12-30 Jody Goldberg <jody@gnome.org> 2003-12-30 Jody Goldberg <jody@gnome.org>
* Release 2.5.1.1 * Release 2.5.1.1

5
vfs-methods/themus/Makefile.am
View file

@ -2,6 +2,7 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \
$(THEMUS_THUMBNAILER_CFLAGS) \ $(THEMUS_THUMBNAILER_CFLAGS) \
$(THEMUS_COMPONENT_CFLAGS) \ $(THEMUS_COMPONENT_CFLAGS) \
-I$(top_srcdir)/capplets/common \ -I$(top_srcdir)/capplets/common \
-DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \
-DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \ -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \
-DDATA_DIR=\"$(datadir)/themus\" -DDATA_DIR=\"$(datadir)/themus\"
@ -39,7 +40,8 @@ libthemus_theme_properties_view_la_SOURCES = \
themus-properties-view.h \ themus-properties-view.h \
themus-properties-main.c themus-properties-main.c
pkgdata_DATA = apply-font.glade Gladedir = $(GNOMECC_GLADE_DIR)
Glade_DATA = apply-font.glade
@INTLTOOL_DIRECTORY_RULE@ @INTLTOOL_DIRECTORY_RULE@
@ -78,6 +80,7 @@ install-data-local:
@INTLTOOL_SCHEMAS_RULE@ @INTLTOOL_SCHEMAS_RULE@
EXTRA_DIST = \ EXTRA_DIST = \
$(Glade_DATA) \
apply-font.glade \ apply-font.glade \
theme-method.directory.in \ theme-method.directory.in \
theme-method.conf \ theme-method.conf \

2
vfs-methods/themus/themus-theme-applier.c
View file

@ -69,7 +69,7 @@ int main (int argc, char* argv[])
if (theme->application_font) if (theme->application_font)
{ {
glade_init (); 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); NULL, NULL);
if (font_xml) if (font_xml)
{ {