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

get the glade file from GLADEDIR

Browse source 
2002-04-12  jacob berkman  <jacob@ximian.com>

	* gnome-font-and-theme-properties.c (create_dialog): get the glade
	file from GLADEDIR

	* Makefile.am (INCLUDES): define GLADEDIR
This commit is contained in:
jacob berkman 2002-04-12 19:47:59 +00:00 • committed by Jacob Berkman
parent 8c63c8bd88
commit e10f58e431
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,11 @@
2002-04-12 jacob berkman <jacob@ximian.com>
* gnome-font-and-theme-properties.c (create_dialog): get the glade
file from GLADEDIR
* Makefile.am (INCLUDES): define GLADEDIR
(glade_DATA): install the right glade file
Wed Apr 10 18:03:25 2002 Jonathan Blandford <jrb@gnome.org> Wed Apr 10 18:03:25 2002 Jonathan Blandford <jrb@gnome.org>
* gtk-theme-selector.desktop.in (Exec): s/gtk2-theme-selector-capplet/gnome-font-and-theme-properties * gtk-theme-selector.desktop.in (Exec): s/gtk2-theme-selector-capplet/gnome-font-and-theme-properties

7
capplets/theme-switcher/Makefile.am
View file

@ -12,8 +12,11 @@ Desktop_in_files = gtk-theme-selector.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
gladedir = $(GNOMECC_GLADE_DIR) gladedir = $(GNOMECC_GLADE_DIR)
glade_DATA = gtk-theme-selector.glade glade_DATA = gnome-theme-and-font-and-theme-properties.glade
INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\"
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) EXTRA_DIST = $(Desktop_in_files) $(glade_DATA)

2
capplets/theme-switcher/gnome-font-and-theme-properties.c
View file

@ -35,7 +35,7 @@ create_dialog (void)
{ {
GladeXML *dialog; GladeXML *dialog;
dialog = glade_xml_new ("./gnome-font-and-theme-properties.glade", "font_and_theme_dialog", NULL); dialog = glade_xml_new (GLADEDIR "/gnome-font-and-theme-properties.glade", "font_and_theme_dialog", NULL);
return dialog; return dialog;
} }