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

Renamed ximian_archiver to config_archiver

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

	* config-manager-dialog.c: Update #include locations
This commit is contained in:
Bradford Hovinen 2001-07-05 21:57:01 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 691aeeba30
commit 33cc1312bc
8 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

42
archiver/Makefile.am
View file

@ -1,28 +1,28 @@
confexecdir = $(libdir) confexecdir = $(libdir)
confexec_DATA = ximian_archiverConf.sh confexec_DATA = config_archiverConf.sh
Locationmetadir = $(datadir)/ximian-setup-tools/archiver Locationmetadir = $(datadir)/control-center-data/archiver
Locationmeta_DATA = default-user.xml default-global.xml Locationmeta_DATA = default-user.xml default-global.xml
includedir = $(prefix)/include/ximian-archiver includedir = $(prefix)/include/config-archiver
INCLUDES = \ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(includedir) \ -I$(includedir) \
$(GNOME_INCLUDEDIR) \ $(GNOME_INCLUDEDIR) \
-DVERSION=\""$(VERSION)"\" \ -DVERSION=\""$(VERSION)"\" \
-DG_LOG_DOMAIN=\"libximian-archiver\" \ -DG_LOG_DOMAIN=\"libconfig-archiver\" \
-DCONFIGDIR=\""/etc"\" \ -DCONFIGDIR=\""/etc"\" \
-DLOCATION_DIR=\""$(datadir)/ximian-setup-tools/archiver"\" \ -DLOCATION_DIR=\""$(datadir)/control-center-data/archiver"\" \
-DGLADE_DIR=\""$(INTERFACES_DIR)"\" \ -DGLADE_DIR=\""$(INTERFACES_DIR)"\" \
-DXST_BACKEND_LOCATION=\""$(datadir)/ximian-setup-tools/scripts"\" \ -DXST_BACKEND_LOCATION=\""$(datadir)/ximian-setup-tools/scripts"\" \
@ARCHIVER_CFLAGS@ \ @ARCHIVER_CFLAGS@ \
@MONIKER_CFLAGS@ @MONIKER_CFLAGS@
bin_PROGRAMS = bonobo-moniker-archiver ximian-archiver bin_PROGRAMS = bonobo-moniker-archiver config-archiver
lib_LTLIBRARIES = libximian_archiver.la lib_LTLIBRARIES = libconfig_archiver.la
libximian_archiver_la_SOURCES = \ libconfig_archiver_la_SOURCES = \
archive.c archive.h \ archive.c archive.h \
location.c location.h \ location.c location.h \
config-log.c config-log.h \ config-log.c config-log.h \
@ -31,7 +31,7 @@ libximian_archiver_la_SOURCES = \
cluster-location.c cluster-location.h \ cluster-location.c cluster-location.h \
util.c util.h util.c util.h
libximian_archiver_la_LIBADD = \ libconfig_archiver_la_LIBADD = \
@GNOME_XML_LIBS@ @GNOME_XML_LIBS@
include_HEADERS = \ include_HEADERS = \
@ -43,26 +43,26 @@ include_HEADERS = \
cluster-location.h \ cluster-location.h \
util.h util.h
ximian_archiver_SOURCES = \ config_archiver_SOURCES = \
main.c main.c
ximian_archiver_LDADD = \ config_archiver_LDADD = \
$(GNOME_LIBDIR) \ $(GNOME_LIBDIR) \
$(GNOMEUI_LIBS) \ $(GNOMEUI_LIBS) \
$(INTLLIBS) \ $(INTLLIBS) \
@ARCHIVER_LIBS@ \ @ARCHIVER_LIBS@ \
libximian_archiver.la libconfig_archiver.la
# #
# Create the ximian_archiverConf.sh file from the sh.in file # Create the config_archiverConf.sh file from the sh.in file
# #
ximian_archiverConf.sh: ximian_archiverConf.sh.in Makefile config_archiverConf.sh: config_archiverConf.sh.in Makefile
sed -e 's?\@VERSION\@?$(VERSION)?' \ sed -e 's?\@VERSION\@?$(VERSION)?' \
-e 's?\@XIMIAN_ARCHIVER_LIBDIR\@?$(XIMIAN_ARCHIVER_LIBDIR)?g' \ -e 's?\@CONFIG_ARCHIVER_LIBDIR\@?$(CONFIG_ARCHIVER_LIBDIR)?g' \
-e 's?\@XIMIAN_ARCHIVER_LIBS\@?$(XIMIAN_ARCHIVER_LIBS)?g' \ -e 's?\@CONFIG_ARCHIVER_LIBS\@?$(CONFIG_ARCHIVER_LIBS)?g' \
-e 's?\@XIMIAN_ARCHIVER_INCLUDEDIR\@?$(XIMIAN_ARCHIVER_INCLUDEDIR)?g' \ -e 's?\@CONFIG_ARCHIVER_INCLUDEDIR\@?$(CONFIG_ARCHIVER_INCLUDEDIR)?g' \
< $(srcdir)/ximian_archiverConf.sh.in > ximian_archiverConf.tmp \ < $(srcdir)/config_archiverConf.sh.in > config_archiverConf.tmp \
&& mv ximian_archiverConf.tmp ximian_archiverConf.sh && mv config_archiverConf.tmp config_archiverConf.sh
OAF_FILES = \ OAF_FILES = \
Bonobo_Moniker_archiver.oaf Bonobo_Moniker_archiver.oaf
@ -84,9 +84,9 @@ bonobo_moniker_archiver_SOURCES = \
bonobo-config-archiver.h \ bonobo-config-archiver.h \
bonobo-moniker-archiver.c bonobo-moniker-archiver.c
bonobo_moniker_archiver_LDADD = @MONIKER_LIBS@ libximian_archiver.la bonobo_moniker_archiver_LDADD = @MONIKER_LIBS@ libconfig_archiver.la
EXTRA_DIST = \ EXTRA_DIST = \
$(Locationmeta_DATA) \ $(Locationmeta_DATA) \
ximian_archiverConf.sh.in \ config_archiverConf.sh.in \
Bonobo_Moniker_archiver.oaf.in Bonobo_Moniker_archiver.oaf.in

6
archiver/archive.c
View file

@ -240,7 +240,7 @@ archive_load (gboolean is_global)
prefix = "/var/ximian-setup-tools"; prefix = "/var/ximian-setup-tools";
else else
prefix = g_concat_dir_and_file (g_get_home_dir (), prefix = g_concat_dir_and_file (g_get_home_dir (),
".gnome/ximian-setup-tools"); ".gnome/control-center");
object = gtk_object_new (archive_get_type (), object = gtk_object_new (archive_get_type (),
"prefix", prefix, "prefix", prefix,
@ -478,7 +478,7 @@ archive_set_current_location_id (Archive *archive, const gchar *locid)
archive->current_location_id); archive->current_location_id);
else else
gnome_config_set_string gnome_config_set_string
("/ximian-setup-tools/config/current/location", ("/control-center/config/current/location",
archive->current_location_id); archive->current_location_id);
gnome_config_sync (); gnome_config_sync ();
@ -512,7 +512,7 @@ archive_get_current_location_id (Archive *archive)
else else
archive->current_location_id = archive->current_location_id =
gnome_config_get_string_with_default gnome_config_get_string_with_default
("/ximian-setup-tools/config/current/location=default", &def); ("/control-center/config/current/location=default", &def);
/* Create default location if it does not exist */ /* Create default location if it does not exist */
if (def && archive_get_location if (def && archive_get_location

4
archiver/config_archiverConf.sh.in Normal file
View file

@ -0,0 +1,4 @@
CONFIG_ARCHIVER_LIBDIR="@CONFIG_ARCHIVER_LIBDIR@"
CONFIG_ARCHIVER_LIBS="@CONFIG_ARCHIVER_LIBS@"
CONFIG_ARCHIVER_INCLUDEDIR="@CONFIG_ARCHIVER_INCLUDEDIR@"
MODULE_VERSION="config-archiver-@VERSION@"

4
archiver/ximian_archiverConf.sh.in
View file

@ -1,4 +0,0 @@
XIMIAN_ARCHIVER_LIBDIR="@XIMIAN_ARCHIVER_LIBDIR@"
XIMIAN_ARCHIVER_LIBS="@XIMIAN_ARCHIVER_LIBS@"
XIMIAN_ARCHIVER_INCLUDEDIR="@XIMIAN_ARCHIVER_INCLUDEDIR@"
MODULE_VERSION="ximian-archiver-@VERSION@"

2
capplets/rollback/ChangeLog
View file

@ -1,5 +1,7 @@
2001-07-05 Bradford Hovinen <hovinen@ximian.com> 2001-07-05 Bradford Hovinen <hovinen@ximian.com>
* config-manager-dialog.c: Update #include locations
* Makefile.am (INCLUDES): * Makefile.am (INCLUDES):
(rollback_capplet_LDADD): Update to include ximian_archiver stuff (rollback_capplet_LDADD): Update to include ximian_archiver stuff
correctly correctly

2
capplets/rollback/Makefile.am
View file

@ -34,5 +34,5 @@ rollback_capplet_SOURCES = \
main.c main.c
rollback_capplet_LDADD = \ rollback_capplet_LDADD = \
$(top_builddir)/archiver/libximian_archiver.la \ $(top_builddir)/archiver/libconfig_archiver.la \
@ROLLBACK_CAPPLET_LIBS@ @ROLLBACK_CAPPLET_LIBS@

6
capplets/rollback/config-manager-dialog.c
View file

@ -29,9 +29,9 @@
#include <glade/glade.h> #include <glade/glade.h>
#include <ximian-archiver/archive.h> #include <archive.h>
#include <ximian-archiver/location.h> #include <location.h>
#include <ximian-archiver/backend-list.h> #include <backend-list.h>
#include "config-manager-dialog.h" #include "config-manager-dialog.h"
#include "rollback-widget.h" #include "rollback-widget.h"

6
capplets/rollback/rollback-control.c
View file

@ -25,9 +25,9 @@
# include "config.h" # include "config.h"
#endif #endif
#include <ximian-archiver/archive.h> #include <archive.h>
#include <ximian-archiver/location.h> #include <location.h>
#include <ximian-archiver/config-log.h> #include <config-log.h>
#include "rollback-control.h" #include "rollback-control.h"
#include "rollback-widget.h" #include "rollback-widget.h"