remove the png so that it can theme.

2003-12-16  Jody Goldberg <jody@gnome.org>

	* capplets/file-types/file-types.desktop.in : remove the png so that
	  it can theme.

	* capplets/desktop-links/Makefile.am : remove .in.in path kludge.
	* capplets/desktop-links/Accessibility.directory.in :
	* capplets/desktop-links/Advanced.directory.in : ditto.

	* capplets/background/Makefile.am : no need to install capplet icon
	  anymore its part of the theme.
	* capplets/default-applications/Makefile.am :
	* capplets/font/Makefile.am  :
	* capplets/keybindings/Makefile.am :
	* capplets/keyboard/Makefile.am :
	* capplets/mouse/Makefile.am :
	* capplets/network/Makefile.am :
	* capplets/sound/Makefile.am :
	* capplets/theme-switcher/Makefile.am :
	* capplets/ui-properties/Makefile.am :
	* capplets/windows/Makefile.am :

	* capplets/accessibility/at-properties/Makefile.am :
	* capplets/accessibility/keyboard/Makefile.am :

	* capplets/background/background.desktop.in : Use the themed icon.
	* capplets/default-applications/default-applications.desktop.in :
	* capplets/font/font-properties.desktop.in :
	* capplets/keybindings/keybinding.desktop.in :
	* capplets/keyboard/keyboard.desktop.in :
	* capplets/mouse/gnome-settings-mouse.desktop.in :
	* capplets/network/gnome-network-preferences.desktop.in :
	* capplets/sound/gnome-settings-sound.desktop.in :
	* capplets/theme-switcher/gtk-theme-selector.desktop.in :
	* capplets/ui-properties/gnome-ui-properties.desktop.in :
	* capplets/windows/window-properties.desktop.in :
	* capplets/accessibility/at-properties/at-properties.desktop.in :
	* capplets/accessibility/keyboard/accessibility-keyboard.desktop.in :

5 files changed, 6 insertions, 17 deletions

diff --git a/capplets/ui-properties/.cvsignore b/capplets/ui-properties/.cvsignore
index ba3e62a51..df57c1725 100644
--- a/capplets/ui-properties/.cvsignore
+++ b/capplets/ui-properties/.cvsignore
@@ -6,4 +6,4 @@ Makefile.in
 *.la
 *.o
 gnome-ui-properties
-behavior.desktop
+gnome-ui-properties.desktop
diff --git a/capplets/ui-properties/Makefile.am b/capplets/ui-properties/Makefile.am
index 9c01420fe..3ca090255 100644
--- a/capplets/ui-properties/Makefile.am
+++ b/capplets/ui-properties/Makefile.am
@@ -6,17 +6,13 @@ gnome_ui_properties_SOURCES = \
 
 @INTLTOOL_DESKTOP_RULE@
 
-iconsdir   = $(GNOMECC_ICONS_DIR)
-icons_DATA = behavior-capplet.png
-
-desktop_iconsdir = $(datadir)/pixmaps
-desktop_icons_DATA = behavior-capplet.png
-
 desktopdir = $(GNOMECC_DESKTOP_DIR)
-Desktop_in_files = behavior.desktop.in
+Desktop_in_files = gnome-ui-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+
 Gladedir   = $(GNOMECC_GLADE_DIR)
 Glade_DATA = gnome-ui-properties.glade
+
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
diff --git a/capplets/ui-properties/behavior-capplet.png b/capplets/ui-properties/behavior-capplet.png
deleted file mode 100644
index 66d265d07..000000000
--- a/capplets/ui-properties/behavior-capplet.png
+++ /dev/null
diff --git a/capplets/ui-properties/behavior.desktop.in.in b/capplets/ui-properties/behavior.desktop.in.in
deleted file mode 100644
index 65210271a..000000000
--- a/capplets/ui-properties/behavior.desktop.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Behavior
-_Comment=Sets the default behavior of GNOME applications
-Exec=ui-properties
-Icon=gnome-applications.png
-Terminal=0
-Type=Application
diff --git a/capplets/ui-properties/behavior.desktop.in b/capplets/ui-properties/gnome-ui-properties.desktop.in
index 48995c7d0..fcce94e3d 100644
--- a/capplets/ui-properties/behavior.desktop.in
+++ b/capplets/ui-properties/gnome-ui-properties.desktop.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=Menus & Toolbars
 _Comment=Customize the appearance of toolbars and menubars in applications
 Exec=gnome-ui-properties
-Icon=behavior-capplet.png
+Icon=gnome-settings-ui-behavior
 Terminal=false
 Type=Application
 StartupNotify=true