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

really fix DATADIR and make directory definitions more consistent with

Browse source 
2007-02-13  Jens Granseuer  <jensgr@gmx.net>

	* Makefile.am:
	* gnome-da-capplet.c: (show_dialog):
	* gnome-da-xml.c: (gnome_da_xml_load_list): really fix DATADIR and
	make directory definitions more consistent with other capplets.
	Closes bug #407597.

svn path=/trunk/; revision=7290
This commit is contained in:
Jens Granseuer 2007-02-13 22:19:12 +00:00 • committed by Jens Granseuer
parent 6d08f0a4ee
commit 3bc84f6ace
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/default-applications/ChangeLog
View file

@ -1,3 +1,11 @@
2007-02-13 Jens Granseuer <jensgr@gmx.net>
* Makefile.am:
* gnome-da-capplet.c: (show_dialog):
* gnome-da-xml.c: (gnome_da_xml_load_list): really fix DATADIR and
make directory definitions more consistent with other capplets.
Closes bug #407597.
2007-02-03 Jens Granseuer <jensgr@gmx.net> 2007-02-03 Jens Granseuer <jensgr@gmx.net>
* Makefile.am: fix DATADIR define * Makefile.am: fix DATADIR define

8
capplets/default-applications/Makefile.am
View file

@ -19,16 +19,16 @@ Desktop_in_files = default-applications.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
xmldata_in_files = gnome-default-applications.xml.in xmldata_in_files = gnome-default-applications.xml.in
xmldatadir = $(pkgdatadir)/gnome-default-applications xmldatadir = $(pkgdatadir)
xmldata_DATA = $(xmldata_in_files:.xml.in=.xml) xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@ @INTLTOOL_XML_RULE@
INCLUDES = \ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \ $(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
-DGNOMELOCALEDIR="\"$(datadir)/locale\""\ -DGNOMECC_GLADE_DIR=\""$(gladedir)"\" \
-DDATADIR=\""$(xmldatadir)"\" -DGNOMECC_DATA_DIR=\""$(pkgdatadir)"\"
noinst_DATA = gnome-default-applications.xml.in noinst_DATA = gnome-default-applications.xml.in
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA)

4
capplets/default-applications/gnome-da-capplet.c
View file

@ -746,8 +746,8 @@ show_dialog (GnomeDACapplet *capplet)
{ {
GConfValue *value; GConfValue *value;
if (g_file_test (GLADEDIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) { if (g_file_test (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) {
capplet->xml = glade_xml_new (GLADEDIR "/gnome-default-applications-properties.glade", NULL, NULL); capplet->xml = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", NULL, NULL);
} }
else { else {
capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, NULL); capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, NULL);

3
capplets/default-applications/gnome-da-xml.c
View file

@ -219,8 +219,7 @@ gnome_da_xml_load_list (GnomeDACapplet *capplet)
{ {
gchar *filename; gchar *filename;
filename = g_build_filename (DATADIR, filename = g_build_filename (GNOMECC_DATA_DIR,
"gnome-default-applications",
"gnome-default-applications.xml", "gnome-default-applications.xml",
NULL); NULL);