Renamed ximian_archiver to config_archiver

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

	* config-manager-dialog.c: Update #include locations

archiver/Makefile.am

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

archiver/archive.c

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

archiver/config_archiverConf.sh.in

@@ -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@"

archiver/ximian_archiverConf.sh.in

@@ -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@"

capplets/rollback/ChangeLog

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

capplets/rollback/Makefile.am

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

capplets/rollback/config-manager-dialog.c

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

capplets/rollback/rollback-control.c

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