Re: pending bonobo-config problems

["R.I.P. Deaddog" <maddog linuxhall org>]

On Wed, 10 Oct 2001, R.I.P. Deaddog wrote:

> 1. Seems Havoc's parallel install fix is not done yet. It still conflicts
>    with bonobo-conf 0.12. A patch is worked out, and is going to post here
>    very soon, once anybody answer the following questions:
>
> 2. is bonobo-property-frame.h a left-over from bonobo-conf? Can't see any
>    reference of it's usage even internally; however it is installed.
>
> 3. Should bonobo-config-bag.h be installed? (I almost have no knowledge
>    in bonobo-conf{,ig}, so can't determine; sorry)

Sorry for replying myself. Attached the patch; if nobody objects it I'll
apply it into bonobo-config CVS soon.

Abel

diff -ur bonobo-config-0.103.0-orig/bonobo-config/Makefile.am bonobo-config-0.103.0/bonobo-config/Makefile.am
--- bonobo-config-0.103.0-orig/bonobo-config/Makefile.am	Fri Sep 21 03:49:55 2001
+++ bonobo-config-0.103.0/bonobo-config/Makefile.am	Wed Oct 10 21:58:32 2001
@@ -25,8 +25,8 @@
 libbonobo_configincludedir = $(includedir)/bonobo-config
 libbonobo_configinclude_HEADERS =	 		\
 	Bonobo_Config.h				\
+	bonobo-config-bag.h			\
 	bonobo-config-database.h		\
-	bonobo-property-frame.h			\
 	bonobo-property-bag-proxy.h		\
 	bonobo-config-utils.h			
 
diff -ur bonobo-config-0.103.0-orig/monikers/Bonobo_Moniker_config.server.in bonobo-config-0.103.0/monikers/Bonobo_Moniker_config.server.in
--- bonobo-config-0.103.0-orig/monikers/Bonobo_Moniker_config.server.in	Mon Apr 30 22:02:42 2001
+++ bonobo-config-0.103.0/monikers/Bonobo_Moniker_config.server.in	Wed Oct 10 21:56:47 2001
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:Bonobo_Moniker_config_Factory" type="shlib" location="@MONIKER_LIBDIR@/libmoniker_config.so">
+<oaf_server iid="OAFIID:Bonobo_Moniker_config_Factory" type="shlib" location="@MONIKER_LIBDIR@/libmoniker_config2.so">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/GenericFactory:1.0"/>
 	</oaf_attribute>
diff -ur bonobo-config-0.103.0-orig/monikers/Bonobo_Moniker_ditem.server.in.in bonobo-config-0.103.0/monikers/Bonobo_Moniker_ditem.server.in.in
--- bonobo-config-0.103.0-orig/monikers/Bonobo_Moniker_ditem.server.in.in	Tue Aug 28 18:34:53 2001
+++ bonobo-config-0.103.0/monikers/Bonobo_Moniker_ditem.server.in.in	Wed Oct 10 21:56:47 2001
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:Bonobo_Moniker_ditem_Factory" type="exe" location="@MONIKER_BINDIR@/bonobo-moniker-ditem">
+<oaf_server iid="OAFIID:Bonobo_Moniker_ditem_Factory" type="exe" location="@MONIKER_BINDIR@/bonobo-moniker-ditem-2">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/GenericFactory:1.0"/>
 	</oaf_attribute>
diff -ur bonobo-config-0.103.0-orig/monikers/Makefile.am bonobo-config-0.103.0/monikers/Makefile.am
--- bonobo-config-0.103.0-orig/monikers/Makefile.am	Wed Oct 10 21:56:15 2001
+++ bonobo-config-0.103.0/monikers/Makefile.am	Wed Oct 10 21:56:47 2001
@@ -32,7 +32,7 @@
 clean-local:
 	-rm -f $(SERVER_FILES)
 
-bin_PROGRAMS = bonobo-moniker-xmldb-2 bonobo-moniker-ditem
+bin_PROGRAMS = bonobo-moniker-xmldb-2 bonobo-moniker-ditem-2
 
 bonobo_moniker_xmldb_2_SOURCES =			\
 	bonobo-config-xmldb.c			\
@@ -41,16 +41,16 @@
 
 bonobo_moniker_xmldb_2_LDADD = $(BONOBO_CONFIG_LIBS) ../bonobo-config/libbonobo_config.la
 
-bonobo_moniker_ditem_SOURCES =	 		\
+bonobo_moniker_ditem_2_SOURCES =	 		\
 	bonobo-moniker-ditem.c 			\
 	bonobo-config-ditem.c			\
 	bonobo-config-ditem.h
 
-bonobo_moniker_ditem_LDADD = $(BONOBO_CONFIG_LIBS) ../bonobo-config/libbonobo_config.la
+bonobo_moniker_ditem_2_LDADD = $(BONOBO_CONFIG_LIBS) ../bonobo-config/libbonobo_config.la
 
 monikerdir = $(libdir)/bonobo/monikers
 
-moniker_LTLIBRARIES = libmoniker_config.la libmoniker_gconf2.la
+moniker_LTLIBRARIES = libmoniker_config2.la libmoniker_gconf2.la
 
 libmoniker_gconf2_la_SOURCES = 			\
 	bonobo-moniker-gconf.c			\
@@ -60,10 +60,10 @@
 libmoniker_gconf2_la_LIBADD = $(BONOBO_CONFIG_GCONF_LIBS) \
 	../bonobo-config/libbonobo_config.la
 
-libmoniker_config_la_SOURCES =	 		\
+libmoniker_config2_la_SOURCES =	 		\
 	bonobo-moniker-config.c 		
 
-libmoniker_config_la_LIBADD = $(BONOBO_CONFIG_LIBS) \
+libmoniker_config2_la_LIBADD = $(BONOBO_CONFIG_LIBS) \
 	../bonobo-config/libbonobo_config.la
 
 noinst_PROGRAMS = test-xmldb