clean this mess.

ChangeLog

@@ -1,5 +1,9 @@
 2001-07-17  Chema Celorio  <chema@celorio.com>
 
+	* configure.in: define the directories
+
+	* capplets/background/Makefile.am (SUBDIRS): clean
+
 	* configure.in (gnome_cv_use_gnome): clean the macro
 
 2001-07-17  Bradford Hovinen  <hovinen@ximian.com>

acconfig.h

@@ -10,6 +10,7 @@
 #undef HAVE_XIMIAN_ARCHIVER
 #undef GNOMECC_ICONS_DIR
 #undef GNOMECC_GLADE_DIR
+#undef GNOMECC_PIXMAPS_DIR
 #undef PACKAGE
 #undef VERSION
 

capplets/background/.cvsignore

@@ -5,5 +5,6 @@ Makefile.in
 *.o
 *.lo
 *.la
-background-properties-capplet
+background-properties
-background-properties.desktop
+background.desktop
+background.desktop.in

capplets/background/ChangeLog

@@ -0,0 +1,4 @@
+2001-07-17  Chema Celorio  <chema@celorio.com>
+
+	* start
+

capplets/background/Makefile.am

@@ -1,33 +1,29 @@
-Applicationsdir = $(datadir)/control-center/capplets
+SUBDIRS =
-Applications_in_files = background-properties.desktop.in
-Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
 
-pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop
+cappletname = background
-pApplications_DATA = $(Applications_DATA)
+bin_PROGRAMS = background-properties
 
-Gladedir = $(datadir)/control-center-data
+background_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
-Glade_DATA = \
+background_properties_SOURCES = \
-	background-properties.glade
+	main.c\
-
-EXTRA_DIST = $(Applications_in_files) $(Glade_DATA)
-
-INCLUDES = \
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
-	-DG_LOG_DOMAIN=\"background-properties\"	\
-	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	@BG_CAPPLET_CFLAGS@				\
-	-I$(top_srcdir)/				\
-	-I$(top_srcdir)/intl
-
-bin_PROGRAMS = background-properties-capplet
-
-background_properties_capplet_SOURCES = \
 	prefs-widget.c		prefs-widget.h \
 	preferences.c		preferences.h \
-	applier.c applier.h 				\
+	applier.c
-	main.c
+
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
+
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)
 
-background_properties_capplet_LDADD = \
-	@BG_CAPPLET_LIBS@

capplets/background/background.desktop.in.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Background
 _Comment=Configuration of the desktop's background
-Exec=background-properties-capplet
+Exec=background-properties
 Icon=gnome-ccbackground.png
 Terminal=0
 Type=Application

capplets/background/main.c

@@ -269,7 +269,7 @@ main (int argc, char **argv)
 	}
 
 	gnome_window_icon_set_default_from_file
-		(GNOME_ICONDIR"/gnome-ccbackground.png");
+		(GNOMECC_ICONS_DIR"/gnome-ccbackground.png");
 
 #ifdef HAVE_XIMIAN_ARCHIVER
 	archive = ARCHIVE (archive_load (FALSE));

capplets/background/prefs-widget.c

@@ -123,8 +123,13 @@ prefs_widget_init (PrefsWidget *prefs_widget)
 	int i;
 
 	prefs_widget->dialog_data = 
-		glade_xml_new (GLADE_DATADIR "/background-properties.glade",
+		glade_xml_new (GNOMECC_GLADE_DIR "/background-properties.glade",
 					"prefs_widget");
+	if (prefs_widget->dialog_data == NULL) {
+		g_warning ("Could not load \"%s\"\n",
+				 GNOMECC_GLADE_DIR "/background-properties.glade");
+		return;
+	}
 
 	widget = glade_xml_get_widget (prefs_widget->dialog_data, 
 				       "prefs_widget");

capplets/default-applications/ChangeLog

@@ -1,3 +1,7 @@
+2001-07-17  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am (SUBDIRS): clean
+
 2001-07-17  Bradford Hovinen  <hovinen@ximian.com>
 
 	* Makefile.am (default_application_properties_capplet_SOURCES):

capplets/default-applications/Makefile.am

@@ -1,29 +1,32 @@
-INCLUDES = -I. -I$(srcdir) 				\
+SUBDIRS = 
-	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-I$(includedir) $(GNOME_INCLUDEDIR)		\
-	-DGNOMESYSCONFDIR=\""$(sysconfdir)"\"		\
-	@CAPPLET_CFLAGS@
 
-bin_PROGRAMS = default-application-properties-capplet
+cappletname = default-applications
+bin_PROGRAMS = default-applications-properties
 
-default_application_properties_capplet_SOURCES =	\
+default_applications_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+default_applications_properties_SOURCES = \
 	default-application-properties.c \
 	interface.c		interface.h \
 	callbacks.c		callbacks.h \
 	support.c			support.h	\
 	defaults.h
 
-default_application_properties_capplet_LDADD = @CAPPLET_LIBS@ 
+pixmap_DATA =
 
-EXTRA_DIST =						\
+##
-	default-application-properties.desktop.in	\
+## You should not need to modify anything below this line
-	default-application-properties.desktop
+##
-
-sysdir = $(datadir)/control-center/capplets/
-sys_in_files = default-application-properties.desktop.in
-sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 @XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
+
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMESYSCONFDIR=\""$(sysconfdir)"\"
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)
 
-install-data-local:
-	$(INSTALL_DATA) $(srcdir)/default-application-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/default-application-properties.desktop

capplets/default-applications/default-applications-properties.glade

@@ -0,0 +1 @@
+1

capplets/desktop-links/.cvsignore

@@ -1 +1,3 @@
 gnome-hint-properties.desktop
+Makefile
+Makefile.in

capplets/desktop-links/Sawfish/.cvsignore

@@ -1,12 +1,4 @@
 Sawfish.directory
-appearance-properties.desktop
+*.desktop
-bindings-properties.desktop
+Makefile
-focus-properties.desktop
+Makefile.in
-match-properties.desktop
-maximize-properties.desktop
-meta-properties.desktop
-misc-properties.desktop
-move-properties.desktop
-placement-properties.desktop
-sound-properties.desktop
-workspace-properties.desktop

capplets/keyboard/Makefile.am

@@ -1,3 +1,5 @@
+SUBDIRS =
+
 cappletname = keyboard
 bin_PROGRAMS = keyboard-properties
 
@@ -18,6 +20,7 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
 Glade_DATA = $(cappletname)-properties.glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop

capplets/keyboard/prefs-widget.c

@@ -95,7 +95,7 @@ prefs_widget_init (PrefsWidget *prefs_widget)
 	GtkAdjustment *adjustment;
 
 	prefs_widget->dialog_data = 
-		glade_xml_new (GLADE_DATADIR "/keyboard-properties.glade",
+		glade_xml_new (GNOMECC_GLADE_DIR "/keyboard-properties.glade",
 			       "prefs_widget");
 
 	glade_xml_signal_connect_data

capplets/mouse/.cvsignore

@@ -5,5 +5,6 @@ Makefile.in
 *.o
 *.lo
 *.la
-mouse-properties-capplet
+mouse-properties
-mouse-properties.desktop
+mouse.desktop
+mouse.desktop.in

capplets/mouse/Makefile.am

@@ -1,16 +1,13 @@
 cappletname = mouse
 bin_PROGRAMS = mouse-properties
 
-mouse_properties_LDADD = @CAPPLET_LIBS@
+mouse_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 mouse_properties_SOURCES = \
 	main.c\
 	prefs-widget.c		prefs-widget.h \
 	preferences.c		preferences.h
 
-pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = mouse-left.png mouse-right.png
-pixmap_DATA = \
-	mouse-left.png	\
-	mouse-right.png
 
 ##
 ## You should not need to modify anything below this line
@@ -23,6 +20,7 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
 iconsdir   = $(GNOMECC_ICONS_DIR)
 Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
 Glade_DATA = $(cappletname)-properties.glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop

capplets/mouse/prefs-widget.c

@@ -97,7 +97,7 @@ prefs_widget_init (PrefsWidget *prefs_widget)
 	GtkAdjustment *adjustment;
 
 	prefs_widget->dialog_data = 
-		glade_xml_new (GLADE_DATADIR "/mouse-properties.glade",
+		glade_xml_new (GNOMECC_GLADE_DIR "/mouse-properties.glade",
 			       "prefs_widget");
 
 	widget = glade_xml_get_widget (prefs_widget->dialog_data, 

capplets/screensaver/.cvsignore

@@ -5,5 +5,6 @@ Makefile.in
 *.lo
 *.la
 *.o
-screensaver-properties-capplet
+screensaver-properties
-screensaver-properties.desktop
+screensaver.desktop.in
+screensaver.desktop

capplets/screensaver/ChangeLog

@@ -1,3 +1,7 @@
+2001-07-17  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am (SUBDIRS): clean
+
 2001-07-17  Bradford Hovinen  <hovinen@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): Changed Applications_DATA to

capplets/screensaver/Makefile.am

@@ -1,36 +1,11 @@
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = \
-	no-hack.png 
-
-Applicationsdir = $(datadir)/control-center/capplets
-Applications_in_files = screensaver-properties.desktop.in
-Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop
-pApplications_DATA = $(Applications_DATA)
-
-Gladedir = $(datadir)/control-center-data
-Glade_DATA = \
-	screensaver-properties.glade
-
 SUBDIRS = screensavers
 
-EXTRA_DIST = ChangeLog $(Applications_in_files) $(pixmap_DATA) $(Glade_DATA)
+cappletname = screensaver
+bin_PROGRAMS = screensaver-properties
 
-INCLUDES = \
+screensaver_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) -lXt
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+screensaver_properties_SOURCES = \
-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
+	main.c \
-	-DSSPROP_DATADIR=\""${prefix}/share"\" \
-	-DG_LOG_DOMAIN=\"screensaver-properties\" \
-	-DGLADE_DATADIR=\""$(Gladedir)"\"	\
-	@SCREENSAVER_CAPPLET_CFLAGS@ \
-	-I$(top_srcdir)/ \
-	-I$(top_srcdir)/intl
-
-bin_PROGRAMS = screensaver-properties-capplet
-
-screensaver_properties_capplet_SOURCES = \
 	prefs-widget.c				prefs-widget.h\
 	preferences.c				preferences.h\
 	screensaver-prefs-dialog.c	screensaver-prefs-dialog.h\
@@ -41,7 +16,24 @@ screensaver_properties_capplet_SOURCES = \
 	daemon.c					daemon.h\
 	rc-parse.c				rc-parse.h\
 	resources.c				resources.h\
-	XScreenSaver_ad.h \
+	XScreenSaver_ad.h
-	main.c
+
+pixmap_DATA = no-hack.png 
+
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
+
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) -DSSPROP_DATADIR=\""${prefix}/share"\"
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)
 
-screensaver_properties_capplet_LDADD = @SCREENSAVER_CAPPLET_LIBS@ -lXt

capplets/screensaver/main.c

@@ -374,7 +374,7 @@ main (int argc, char **argv)
 	}
 
 	gnome_window_icon_set_default_from_file
-		(GNOME_ICONDIR"/gnome-ccscreensaver.png");
+		(GNOMECC_ICONS_DIR"/gnome-ccscreensaver.png");
 
 	init_resource_database (argc, argv);
 #ifdef HAVE_XIMIAN_ARCHIVER

capplets/screensaver/preview.c

@@ -232,7 +232,7 @@ show_screensaver_timeout (void)
 	}
 	else if (ret > 0) {
 		pixbuf = gdk_pixbuf_new_from_file 
-			(GNOME_ICONDIR "/no-hack.png");
+			(GNOMECC_PIXMAPS_DIR "/no-hack.png");
 		gdk_pixbuf_render_to_drawable
 			(pixbuf, (GdkDrawable *) preview_window->window,
 			 preview_window->style->fg_gc[0], 0, 0, 0, 0,

capplets/sound/.cvsignore

@@ -5,5 +5,7 @@ Makefile.in
 *.lo
 *.la
 *.o
-sound-properties-capplet
 sound-properties.desktop
+sound-properties
+sound.desktop.in
+sound.desktop

capplets/sound/ChangeLog

@@ -1,3 +1,7 @@
+2001-07-17  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am (SUBDIRS): clean
+
 2001-07-17  Bradford Hovinen  <hovinen@ximian.com>
 
 	* sound-properties-capplet.c (create_dialog): Implement

capplets/sound/Makefile.am

@@ -1,39 +1,34 @@
-Applicationsdir = $(datadir)/control-center/capplets
+SUBDIRS =
-Applications_in_files = sound-properties.desktop.in
-Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
-
-pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop
-pApplications_DATA = $(Applications_DATA)
-
-Gladedir = $(datadir)/control-center/interfaces
-Glade_DATA = \
-	sound-properties.glade
 
 defaultsdir= $(datadir)/control-center/defaults
-defaults_DATA = \
+defaults_DATA = sound-properties.xml
-	sound-properties.xml
 
 oafdir = $(datadir)/oaf
-oaf_DATA = \
+oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
-	Bonobo_Control_Capplet_sound_properties.oaf
 
-EXTRA_DIST = ChangeLog $(Applications_in_files) $(Glade_DATA) $(oaf_DATA) $(defaults_DATA)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(oaf_DATA) $(defaults_DATA)
 
-INCLUDES =								\
+cappletname = sound
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
+bin_PROGRAMS = sound-properties
-	-DG_LOG_DOMAIN=\"sound-properties\"				\
-	-DGLADE_DATADIR=\""$(datadir)/control-center/interfaces"\"	\
-	-I$(top_srcdir)/						\
-	-I$(top_srcdir)/intl						\
-	-I$(top_srcdir)/capplets/common					\
-	@CAPPLET_CFLAGS@
 
-bin_PROGRAMS = sound-properties-capplet
+sound_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
-
+sound_properties_SOURCES = \
-sound_properties_capplet_SOURCES = \
 	sound-properties-capplet.c
 
-sound_properties_capplet_LDADD = \
+pixmap_DATA =
-	@CAPPLET_LIBS@					\
+
-	$(top_builddir)/capplets/common/libcommon.a
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
+
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)

configure.in

@@ -103,11 +103,11 @@ else
 	AC_MSG_ERROR(You need at least bonobo-conf 0.7 or greater for this version of control-center.)
 fi
 
-capplet_modules="libcapplet libglade-gnome gdk_pixbuf bonobo_conf $ARCHIVER_MODULE"
+capplet_modules="libcapplet libglade-gnome gdk_pixbuf bonobo_conf gdk_pixbuf_xlib gal $ARCHIVER_MODULE"
 
 PKG_CHECK_MODULES(CAPPLET, $capplet_modules)
-PKG_CHECK_MODULES(BG_CAPPLET, $capplet_modules gdk_pixbuf_xlib)
+dnl PKG_CHECK_MODULES(BG_CAPPLET, $capplet_modules gdk_pixbuf_xlib)
-PKG_CHECK_MODULES(SCREENSAVER_CAPPLET, $capplet_modules gal)
+dnl PKG_CHECK_MODULES(SCREENSAVER_CAPPLET, $capplet_modules gal)
 dnl PKG_CHECK_MODULES(ROLLBACK_CAPPLET, $capplet_modules)
 PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf bonobo bonobox gtkhtml)
 PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf)
@@ -115,16 +115,21 @@ PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf xml)
 PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml)
 PKG_CHECK_MODULES(CONFIG_ARCHIVER, gnome xml)
 
-GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"keyboard-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\"  "
+GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\" -I\$(top_srcdir)/capplets/common "
+GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} \$(top_builddir)/capplets/common/libcommon.a"
+AC_SUBST(GNOMECC_CAPPLETS_CFLAGS)
+AC_SUBST(GNOMECC_CAPPLETS_LIBS)
 
-AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${datadir}/${PACKAGE}/icons")
+AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${prefix}/share/${PACKAGE}/icons")
 GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons""
 AC_SUBST(GNOMECC_ICONS_DIR)
-AC_DEFINE_UNQUOTED(GNOMECC_GLADE_DIR, "${datadir}/${PACKAGE}/interfaces")
+AC_DEFINE_UNQUOTED(GNOMECC_GLADE_DIR, "${prefix}/share/${PACKAGE}/interfaces")
 GNOMECC_GLADE_DIR=""${datadir}/${PACKAGE}/interfaces""
 AC_SUBST(GNOMECC_GLADE_DIR)
+AC_DEFINE_UNQUOTED(GNOMECC_PIXMAPS_DIR, "${prefix}/share/${PACKAGE}/pixmaps")
+GNOMECC_PIXMAPS_DIR=""${datadir}/${PACKAGE}/pixmaps""
+AC_SUBST(GNOMECC_PIXMAPS_DIR)
 
-AC_SUBST(GNOMECC_CAPPLETS_CFLAGS)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)

po/POTFILES.in

@@ -2,19 +2,19 @@ Gnome.directory.in
 archiver/location.c
 archiver/main.c
 capplets/background/applier.c
-capplets/background/background-properties.desktop.in
+capplets/background/background.desktop.in
 capplets/background/background-properties.glade
 capplets/background/prefs-widget.c
-capplets/keyboard/keyboard-properties.desktop.in
+capplets/keyboard/keyboard.desktop.in
 capplets/keyboard/keyboard-properties.glade
 capplets/keyboard/prefs-widget.c
-capplets/mouse/mouse-properties.desktop.in
+capplets/mouse/mouse.desktop.in
 capplets/mouse/mouse-properties.glade
 capplets/mouse/prefs-widget.c
 capplets/screensaver/preferences.c
 capplets/screensaver/prefs-widget.c
 capplets/screensaver/screensaver-prefs-dialog.c
-capplets/screensaver/screensaver-properties.desktop.in
+capplets/screensaver/screensaver.desktop.in
 capplets/screensaver/screensaver-properties.glade
 capplets/screensaver/screensavers/3d_clock.xml
 capplets/screensaver/screensavers/ant.xml
@@ -67,7 +67,7 @@ capplets/screensaver/screensavers/vines.xml
 capplets/screensaver/screensavers/xroger.xml
 capplets/screensaver/selection-dialog.c
 capplets/sound/sound-properties-capplet.c
-capplets/sound/sound-properties.desktop.in
+capplets/sound/sound.desktop.in
 capplets/sound/sound-properties.glade
 control-center/capplet-dir.c
 control-center/capplet-dir-view.c