]>
Commit | Line | Data |
---|---|---|
d44117a1 MK |
1 | diff -Nuard control-center-2.4.0.orig/vfs-methods/themus/Makefile.am control-center-2.4.0/vfs-methods/themus/Makefile.am |
2 | --- control-center-2.4.0.orig/vfs-methods/themus/Makefile.am 2003-08-28 01:01:56.000000000 +0200 | |
ad7fcf92 | 3 | +++ control-center-2.4.0/vfs-methods/themus/Makefile.am 2003-11-11 01:55:19.000000000 +0100 |
d44117a1 MK |
4 | @@ -2,6 +2,7 @@ |
5 | $(THEMUS_THUMBNAILER_CFLAGS) \ | |
6 | $(THEMUS_COMPONENT_CFLAGS) \ | |
7 | -I$(top_srcdir)/capplets/common \ | |
8 | + -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \ | |
9 | -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \ | |
10 | -DDATA_DIR=\"$(datadir)/themus\" | |
11 | ||
12 | @@ -39,7 +40,8 @@ | |
13 | themus-properties-view.h \ | |
14 | themus-properties-main.c | |
15 | ||
16 | -pkgdata_DATA = apply-font.glade | |
17 | +Gladedir = $(GNOMECC_GLADE_DIR) | |
18 | +Glade_DATA = apply-font.glade | |
19 | ||
20 | @INTLTOOL_DIRECTORY_RULE@ | |
21 | ||
22 | @@ -78,6 +80,7 @@ | |
23 | @INTLTOOL_SCHEMAS_RULE@ | |
24 | ||
25 | EXTRA_DIST = \ | |
26 | + $(Glade_DATA) \ | |
27 | apply-font.glade \ | |
28 | theme-method.directory.in \ | |
29 | theme-method.conf \ | |
ad7fcf92 MK |
30 | diff -Nuard control-center-2.4.0.orig/vfs-methods/themus/themus-theme-applier.c control-center-2.4.0/vfs-methods/themus/themus-theme-applier.c |
31 | --- control-center-2.4.0.orig/vfs-methods/themus/themus-theme-applier.c 2003-07-24 23:06:38.000000000 +0200 | |
32 | +++ control-center-2.4.0/vfs-methods/themus/themus-theme-applier.c 2003-11-11 01:56:31.000000000 +0100 | |
33 | @@ -69,7 +69,7 @@ | |
34 | if (theme->application_font) | |
35 | { | |
36 | glade_init (); | |
37 | - font_xml = glade_xml_new (DATA_DIR "/apply-font.glade", | |
38 | + font_xml = glade_xml_new (GNOMECC_GLADE_DIR "/apply-font.glade", | |
39 | NULL, NULL); | |
40 | if (font_xml) | |
41 | { |