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

Try to load the defaults file if no rollback data can be found

Browse source 
2001-07-09  Bradford Hovinen  <hovinen@ximian.com>

	* bonobo-config-archiver.c (bonobo_config_archiver_new): Try to
	load the defaults file if no rollback data can be found

	* capplets/sound/Makefile.am (defaults_DATA): Add sound-properties.xml
	(EXTRA_DIST): Add defaults_DATA

	* control-center/Makefile.am (INCLUDES): Update directory locations
This commit is contained in:
Bradford Hovinen 2001-07-09 16:46:31 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 080ffef435
commit 299c4ed6f4
8 changed files with 47 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
archiver/ChangeLog
View file

@ -1,3 +1,8 @@
2001-07-09 Bradford Hovinen <hovinen@ximian.com>
* bonobo-config-archiver.c (bonobo_config_archiver_new): Try to
load the defaults file if no rollback data can be found
2001-07-05 Bradford Hovinen <hovinen@ximian.com>
* bonobo-config-archiver.[ch]: Use bonobo-conf rather than

3
archiver/Makefile.am
View file

@ -13,9 +13,10 @@ INCLUDES = \
-DVERSION=\""$(VERSION)"\" \
-DG_LOG_DOMAIN=\"libconfig-archiver\" \
-DCONFIGDIR=\""/etc"\" \
-DLOCATION_DIR=\""$(datadir)/control-center-data/archiver"\" \
-DLOCATION_DIR=\""$(datadir)/control-center/archiver"\" \
-DGLADE_DIR=\""$(INTERFACES_DIR)"\" \
-DXST_BACKEND_LOCATION=\""$(datadir)/ximian-setup-tools/scripts"\" \
-DDEFAULTS_DIR=\""$(datadir)/control-center/defaults"\" \
@ARCHIVER_CFLAGS@ \
@MONIKER_CFLAGS@

14
archiver/bonobo-config-archiver.c
View file

@ -656,8 +656,18 @@ bonobo_config_archiver_new (const char *backend_id, const char *location_id)
archiver_db->doc = location_load_rollback_data
(archiver_db->location, NULL, 0, archiver_db->backend_id, TRUE);
if (archiver_db->doc == NULL)
archiver_db->doc = xmlNewDoc ("1.0");
if (archiver_db->doc == NULL) {
gchar *filename;
filename = g_strconcat (DEFAULTS_DIR, "/", archiver_db->backend_id, ".xml", NULL);
archiver_db->doc = xmlParseFile (filename);
g_free (filename);
if (archiver_db->doc == NULL) {
gtk_object_destroy (GTK_OBJECT (archiver_db));
return CORBA_OBJECT_NIL;
}
}
if (archiver_db->doc->root == NULL)
archiver_db->doc->root =

3
capplets/sound/ChangeLog
View file

@ -1,5 +1,8 @@
2001-07-09 Bradford Hovinen <hovinen@ximian.com>
* Makefile.am (defaults_DATA): Add sound-properties.xml
(EXTRA_DIST): Add defaults_DATA
* sound-properties-capplet.c (close_cb): Don't destroy the widget
-- it's already destroyed

10
capplets/sound/Makefile.am
View file

@ -1,4 +1,4 @@
Applicationsdir = $(datadir)/control-center/Desktop
Applicationsdir = $(datadir)/control-center/capplets/Desktop
Applications_DATA = \
sound-properties.desktop
@ -6,10 +6,14 @@ pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop
pApplications_DATA = \
sound-properties.desktop
Gladedir = $(datadir)/control-center-data
Gladedir = $(datadir)/control-center/interfaces
Glade_DATA = \
sound-properties.glade
defaultsdir= $(datadir)/control-center/defaults
defaults_DATA = \
sound-properties.xml
oafdir = $(datadir)/oaf
oaf_DATA = \
Bonobo_Control_Capplet_sound_properties.oaf
@ -17,7 +21,7 @@ oaf_DATA = \
glade_msgs = \
sound-properties.glade.h
EXTRA_DIST = ChangeLog $(Applications_DATA) $(Glade_DATA) $(glade_msgs) $(oaf_DATA)
EXTRA_DIST = ChangeLog $(Applications_DATA) $(Glade_DATA) $(glade_msgs) $(oaf_DATA) $(defaults_DATA)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \

7
capplets/sound/sound-properties.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<bonobo-config>
<section path="bonobo-conf-test">
<entry name="start_esd" type="boolean" value="false"/>
<entry name="event_sounds" type="boolean" value="true"/>
</section>
</bonobo-config>

2
control-center/ChangeLog
View file

@ -1,5 +1,7 @@
2001-07-09 Bradford Hovinen <hovinen@ximian.com>
* Makefile.am (INCLUDES): Update directory locations
* capplet-dir.c (capplet_control_launch): Terminate the list of
properties to set

18
control-center/Makefile.am
View file

@ -23,15 +23,15 @@ glade_DATA = \
icon-view.xpm \
tree-view.xpm
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGLADEDIR=\""$(datadir)/control-center-data"\" \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-DVERSION=\""$(VERSION)"\" \
-DSETTINGS_DIR=\""$(datadir)/control-center"\" \
-DPIXMAPS_DIR=\""$(appicondir)"\" \
-DART_DIR=\""$(splashdir)"\" \
-DGNOME_SBINDIR=\""$(sbindir)"\" \
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGLADEDIR=\""$(datadir)/control-center/interfaces"\" \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-DVERSION=\""$(VERSION)"\" \
-DSETTINGS_DIR=\""$(datadir)/control-center/capplets"\" \
-DPIXMAPS_DIR=\""$(appicondir)"\" \
-DART_DIR=\""$(splashdir)"\" \
-DGNOME_SBINDIR=\""$(sbindir)"\" \
@GNOMECC_CFLAGS@
bin_PROGRAMS = gnomecc