Remove -control from the end of the string as well as -capplet

2001-09-28  Bradford Hovinen  <hovinen@ximian.com>

	* capplet-util.c (get_default_moniker): Remove -control from the
	end of the string as well as -capplet
	(get_factory_name): Ditto
	(get_property_name): Ditto

	* capplets/*/Makefile.am: Change the binary name to
	*-properties-control and create a wrapper script from
	../common/wrapper-script.in to be named
	*-properties-capplet
	Remove support for disabling bonobo-conf build

12 files changed, 83 insertions, 65 deletions

diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 29664502d..6f9eac470 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-28  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am: Change the binary name to
+	background-properties-control and create a wrapper script from
+	../common/wrapper-script.in to be named
+	background-properties-capplet
+	Remove support for disabling bonobo-conf build
+
 2001-09-22  Bradford Hovinen  <hovinen@ximian.com>
 
 	* applier.c (run_render_pipeline): Create the root pixmap after we
diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index 11de9b297..8acc6b0ed 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -1,29 +1,17 @@
 cappletname = background
 cappletgroup = 
-bin_PROGRAMS = background-properties-capplet
+bin_PROGRAMS = background-properties-control
+bin_SCRIPTS = background-properties-capplet
 
-background_properties_capplet_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+background_properties_control_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 
-bonobo_sources =				\
+background_properties_control_SOURCES =		\
 	background-properties-capplet.c		\
 	preferences.c		preferences.h   \
-	applier.c applier.h
+	applier.c		applier.h
 
-legacy_sources =				\
-	main.c					\
-	applier.c		applier.h	\
-	prefs-widget.c		prefs-widget.h	\
-	preferences.c		preferences.h
-
-if BONOBO_CONF_ENABLE
 DESKTOP_EXEC_LINE = gnomecc --run-capplet background-properties
-background_properties_capplet_SOURCES = $(bonobo_sources)
 BONOBO_CONF_DEFINE=-DBONOBO_CONF_ENABLE
-else
-DESKTOP_EXEC_LINE = background-properties-capplet
-background_properties_capplet_SOURCES = $(legacy_sources)
-BONOBO_CONF_DEFINE=
-endif
 
 pixmap_DATA = 
 
@@ -42,6 +30,10 @@ $(oaffile): %.oaf: %.oaf.in
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
 
+$(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
+	chmod a+x $@
+
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
 	sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
@@ -55,7 +47,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(BONOBO_CONF_DEFINE)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in $(bonobo_sources) $(legacy_sources)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index b9ae3b5a1..c55f4429e 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-28  Bradford Hovinen  <hovinen@ximian.com>
+
+	* capplet-util.c (get_default_moniker): Remove -control from the
+	end of the string as well as -capplet
+	(get_factory_name): Ditto
+	(get_property_name): Ditto
+
 2001-09-24  Bradford Hovinen  <hovinen@ximian.com>
 
 	* capplet-util.c (legacy_is_modified): Improved error checking and
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
index 8931a7e86..100785ee9 100644
--- a/capplets/common/Makefile.am
+++ b/capplets/common/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = ChangeLog
+EXTRA_DIST = ChangeLog wrapper-script.in
 
 INCLUDES = \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 			\
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index 27acf2a06..f0a4114d8 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -322,6 +322,7 @@ get_factory_name (const gchar *binary)
 	tmp = strrchr (s, '/');
 	if (tmp == NULL) tmp = s;
 	else tmp++;
+	if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
 	if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
 	while ((tmp1 = strchr (tmp, '-')) != NULL) *tmp1 = '_';
 
@@ -344,6 +345,7 @@ get_default_moniker (const gchar *binary)
 	tmp = strrchr (s, '/');
 	if (tmp == NULL) tmp = s;
 	else tmp++;
+	if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
 	if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
 
 	res = g_strconcat ("archive:user-archive#archiverdb:", tmp, NULL);
@@ -365,6 +367,7 @@ get_property_name (const gchar *binary)
 	tmp = strrchr (s, '/');
 	if (tmp == NULL) tmp = s;
 	else tmp++;
+	if ((tmp1 = strstr (tmp, "-control")) != NULL) *tmp1 = '\0';
 	if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
 
 	for (tmp1 = tmp; *tmp1 != '\0'; tmp1++) {
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 2a1b9e1ea..01f5915bd 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-28  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am: Remove support for disabling bonobo-conf build
+
+	* Makefile.am: Change the binary name to
+	keyboard-properties-control and create a wrapper script from
+	../common/wrapper-script.in to be named keyboard-properties
+
 2001-08-09  Bradford Hovinen  <hovinen@ximian.com>
 
 	* keyboard-properties.xml: Fixed default delay setting
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index b8e966d83..fe2f950a2 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -1,24 +1,14 @@
 cappletname = keyboard
 cappletgroup =
-bin_PROGRAMS = keyboard-properties
+bin_PROGRAMS = keyboard-properties-control
+bin_SCRIPTS = keyboard-properties
 
-keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(XF86MISC_LIBS)
+keyboard_properties_control_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(XF86MISC_LIBS)
 
-bonobo_sources =				\
+keyboard_properties_control_SOURCES =		\
 	keyboard-properties.c
 
-legacy_sources =				\
-	main.c					\
-	prefs-widget.c		prefs-widget.h	\
-	preferences.c		preferences.h
-
-if BONOBO_CONF_ENABLE
 DESKTOP_EXEC_LINE = gnomecc --run-capplet keyboard-properties
-keyboard_properties_SOURCES = $(bonobo_sources)
-else
-DESKTOP_EXEC_LINE = keyboard-properties
-keyboard_properties_SOURCES = $(legacy_sources)
-endif
 
 ## this is not generic
 
@@ -36,6 +26,9 @@ $(oaffile): %.oaf: %.oaf.in
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
 
+$(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
+	chmod a+x $@
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
@@ -50,7 +43,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in $(bonobo_sources) $(legacy_sources)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index a7960c946..5b2c77fe5 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-28  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am: Remove support for disabling bonobo-conf build
+
+	* Makefile.am: Change the binary name to
+	mouse-properties-control and create a wrapper script from
+	../common/wrapper-script.in to be named mouse-properties-capplet
+
 2001-09-07  Chema Celorio  <chema@celorio.com>
 
 	* mouse-properties-capplet.c (create_dialog): dont set the pixmaps
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 84dacff0c..d3e6c077d 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -1,24 +1,14 @@
 cappletname = mouse
 cappletgroup =
-bin_PROGRAMS = mouse-properties-capplet
+bin_PROGRAMS = mouse-properties-control
+bin_SCRIPTS = mouse-properties-capplet
 
-mouse_properties_capplet_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+mouse_properties_control_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 
-bonobo_sources =				\
+mouse_properties_control_SOURCES =		\
 	mouse-properties-capplet.c
 
-legacy_sources =				\
-	main.c					\
-	prefs-widget.c		prefs-widget.h	\
-	preferences.c		preferences.h
-
-if BONOBO_CONF_ENABLE
-DESKTOP_EXEC_LINE = gnomecc --run-capplet mouse-properties-capplet
-mouse_properties_capplet_SOURCES = $(bonobo_sources)
-else
-DESKTOP_EXEC_LINE = mouse-properties-capplet
-mouse_properties_capplet_SOURCES = $(legacy_sources)
-endif
+DESKTOP_EXEC_LINE = gnomecc --run-capplet mouse-properties
 
 pixmap_DATA = mouse-left.png mouse-right.png
 
@@ -35,6 +25,11 @@ $(oaffile): %.oaf: %.oaf.in
 ## You should not need to modify anything below this line
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
+
+$(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
+	chmod a+x $@
+
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
 	sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
@@ -48,7 +43,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA).in $(defaults_DATA) $(bonobo_sources) $(legacy_sources) $(pixmap_DATA)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA).in $(defaults_DATA) $(pixmap_DATA)
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index b79de4e62..794327cba 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-28  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am: Remove support for disabling bonobo-conf build
+
+	* Makefile.am: Change the binary name to
+	mouse-properties-control and create a wrapper script from
+	../common/wrapper-script.in to be named mouse-properties-capplet
+
 2001-07-31  Chema Celorio  <chema@celorio.com>
 
 	* Makefile.am (cappletname): add DISTDIR to install-data-local
diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am
index d50f9eaf2..314c416ed 100644
--- a/capplets/sound/Makefile.am
+++ b/capplets/sound/Makefile.am
@@ -1,24 +1,14 @@
 cappletname = sound
 cappletgroup = 
-bin_PROGRAMS = sound-properties
+bin_PROGRAMS = sound-properties-control
+bin_SCRIPTS = sound-properties
 
-sound_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+sound_properties_control_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 
-bonobo_sources =				\
+sound_properties_control_SOURCES =		\
 	sound-properties-capplet.c
 
-legacy_sources =				\
-	main.c					\
-	prefs-widget.c		prefs-widget.h	\
-	preferences.c		preferences.h
-
-if BONOBO_CONF_ENABLE
 DESKTOP_EXEC_LINE = gnomecc --run-capplet sound-properties
-sound_properties_SOURCES = $(bonobo_sources)
-else
-DESKTOP_EXEC_LINE = sound-properties
-sound_properties_SOURCES = $(legacy_sources)
-endif
 
 pixmap_DATA =
 
@@ -41,6 +31,10 @@ $(oaffile): %.oaf: %.oaf.in
 ##
 @XML_I18N_MERGE_DESKTOP_RULE@
 
+$(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
+	sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
+	chmod a+x $@
+
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
 	sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
@@ -54,7 +48,7 @@ install-data-am: install-data-local
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in $(bonobo_sources) $(legacy_sources)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA) $(oaf_DATA).in
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
 pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
diff --git a/control-center/capplet-dir.c b/control-center/capplet-dir.c
index 233429077..c83596242 100644
--- a/control-center/capplet-dir.c
+++ b/control-center/capplet-dir.c
@@ -481,6 +481,8 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title)
 	oaf_iid = g_strconcat ("OAFIID:Bonobo_Control_Capplet_", tmp, NULL);
 	g_free (tmp);
 
+	g_message ("IID we are using is %s", oaf_iid);
+
 	property_control = bonobo_get_object (oaf_iid, "IDL:Bonobo/PropertyControl:1.0", &ev);
 	g_free (oaf_iid);