Rename the launcher applet from 'nautilus-icon-applet' to

	* applets/launcher/Makefile.am:
	* applets/launcher/nautilus-icon-applet.c:
	* applets/launcher/nautilus-launcher-applet.c: (create_pixbufs),
	(applet_change_pixel_size), (image_enter_event),
	(image_leave_event), (get_root_window), (root_window_set_busy),
	(root_window_set_not_busy), (image_button_press_event), (main):
	* nautilus.spec.in:
	Rename the launcher applet from 'nautilus-icon-applet' to
	'nautilus-launcher-applet'.

3 files changed, 8 insertions, 25 deletions

diff --git a/applets/launcher/Makefile.am b/applets/launcher/Makefile.am
index 1612b8598..869d1d00d 100644
--- a/applets/launcher/Makefile.am
+++ b/applets/launcher/Makefile.am
@@ -1,4 +1,4 @@
-NULL=
+include $(top_srcdir)/Makefile.shared
 
 INCLUDES = -I. -I$(srcdir) 				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
@@ -8,35 +8,18 @@ INCLUDES = -I. -I$(srcdir) 				\
 	-DBINDIR=\""$(bindir)"\" 			\
 	$(NULL)
 
-bin_PROGRAMS = nautilus-icon-applet
+bin_PROGRAMS = nautilus-launcher-applet
 
-nautilus_icon_applet_SOURCES = 	\
-	nautilus-icon-applet.c	\
-	nautilus-icon-applet.h	\
+nautilus_launcher_applet_SOURCES =\
+	nautilus-launcher-applet.c \
 	$(NULL)
 
-nautilus_icon_applet_LDADD =	\
+nautilus_launcher_applet_LDADD =	\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
-	$(APPLETS_LIBS) 	\
+	$(APPLETS_LIBS) \
 	$(NULL)
 
-foo =\
-	$(top_builddir)/libnautilus/libnautilus.la 				\
-	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(BONOBO_LIBS) 			\
-	$(OAF_LIBS) 			\
-	$(GCONF_LIBS) 			\
-	$(GNOMEUI_LIBS) 		\
-	$(VFS_LIBS) 			\
-	$(XML_LIBS) 			\
+EXTRA_DIST =\
+	nautilus-launcher-applet.gnorba \
 	$(NULL)
-
-EXTRA_DIST = 				\
-	nautilus-icon-applet.desktop 	\
-	nautilus-icon-applet.gnorba 	\
-	nautilus-icon-applet.png	\
-	$(NULL)
-
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = nautilus-icon-applet.png
diff --git a/applets/launcher/nautilus-icon-applet.png b/applets/launcher/nautilus-icon-applet.png
deleted file mode 100644
index 6139476ee..000000000
--- a/applets/launcher/nautilus-icon-applet.png
+++ /dev/null
diff --git a/applets/launcher/nautilus-icon-applet.c b/applets/launcher/nautilus-launcher-applet.c
index a3c4c544b..a3c4c544b 100644
--- a/applets/launcher/nautilus-icon-applet.c
+++ b/applets/launcher/nautilus-launcher-applet.c