--- old-tango/configure.ac	2007-03-12 07:13:54.000000000 +1000
+++ new-tango/configure.ac	2007-03-12 07:13:54.000000000 +1000
@@ -953,6 +954,7 @@
 plugins/daap/Makefile
 plugins/ipod/Makefile
 plugins/iradio/Makefile
+plugins/iradio/icons/Makefile
 plugins/lirc/Makefile
 plugins/lyrics/Makefile
 plugins/sample-python/Makefile

--- old-tango/plugins/iradio/rb-iradio-plugin.c	2007-03-12 07:13:54.000000000 +1000
+++ new-tango/plugins/iradio/rb-iradio-plugin.c	2007-03-12 07:13:54.000000000 +1000
@@ -71,6 +71,12 @@
 rb_iradio_plugin_init (RBIRadioPlugin *plugin)
 {
 	rb_debug ("RBIRadioPlugin initialising");
+
+	/* for uninstalled builds, add the source directory icon path */
+#ifdef USE_UNINSTALLED_DIRS
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+					   PLUGIN_SRC_DIR G_DIR_SEPARATOR_S "icons");
+#endif
 }
 
 static void

--- old-tango/plugins/iradio/rb-iradio-source.c	2007-03-12 07:13:54.000000000 +1000
+++ new-tango/plugins/iradio/rb-iradio-source.c	2007-03-12 07:13:54.000000000 +1000
@@ -51,6 +51,11 @@
 #include "rb-metadata.h"
 #include "rb-plugin.h"
 
+/* icon names */
+#define IRADIO_SOURCE_ICON	"internet-radio"
+#define IRADIO_NEW_STATION_ICON	"internet-radio-new"
+
+
 static void rb_iradio_source_class_init (RBIRadioSourceClass *klass);
 static void rb_iradio_source_init (RBIRadioSource *source);
 static GObject *rb_iradio_source_constructor (GType type, guint n_construct_properties,
@@ -159,7 +164,7 @@
 
 static GtkActionEntry rb_iradio_source_actions [] =
 {
-	{ "MusicNewInternetRadioStation", GTK_STOCK_NEW, N_("New Internet _Radio Station"), "<control>I",
+	{ "MusicNewInternetRadioStation", IRADIO_NEW_STATION_ICON, N_("New Internet _Radio Station"), "<control>I",
 	  N_("Create a new Internet Radio station"),
 	  G_CALLBACK (rb_iradio_source_cmd_new_station) }
 };
@@ -216,7 +221,7 @@
 
 	gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &size, NULL);
 	pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-					   "stock_channel",
+					   IRADIO_SOURCE_ICON,
 					   size,
 					   0, NULL);
 	rb_source_set_pixbuf (RB_SOURCE (source), pixbuf);

--- old-tango/plugins/iradio/Makefile.am	2007-03-12 07:13:54.000000000 +1000
+++ new-tango/plugins/iradio/Makefile.am	2007-03-12 07:13:54.000000000 +1000
@@ -29,6 +29,7 @@
 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"		\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
+	-DPLUGIN_SRC_DIR=\""$(ROOT_UNINSTALLED_DIR)/plugins/iradio"\" \
 	$(RHYTHMBOX_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(TOTEM_PLPARSER_CFLAGS)			\
@@ -41,6 +42,8 @@
 uixmldir = $(plugindir)
 uixml_DATA = iradio-ui.xml
 
+SUBDIRS = icons
+
 plugin_in_files = iradio.rb-plugin.desktop.in
 
 %.rb-plugin: %.rb-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache

--- old-tango/plugins/iradio/icons/Makefile.am	1970-01-01 10:00:00.000000000 +1000
+++ new-tango/plugins/iradio/icons/Makefile.am	2007-03-12 07:13:54.000000000 +1000
@@ -0,0 +1,72 @@
+
+# iradio icon installation
+
+themedir = $(pkgdatadir)/icons/hicolor
+
+# 16x16
+
+icons16x16_actionsdir = $(themedir)/16x16/actions
+icons16x16_actions_DATA = 				\
+	hicolor/16x16/actions/internet-radio-new.png
+
+icons16x16_placesdir = $(themedir)/16x16/places
+icons16x16_places_DATA =				\
+	hicolor/16x16/places/internet-radio.png
+
+# 22x22
+
+icons22x22_actionsdir = $(themedir)/22x22/actions
+icons22x22_actions_DATA = 				\
+	hicolor/22x22/actions/internet-radio-new.png
+
+icons22x22_placesdir = $(themedir)/22x22/places
+icons22x22_places_DATA = 				\
+	hicolor/22x22/places/internet-radio.png
+
+# 32x32
+
+icons32x32_actionsdir = $(themedir)/32x32/actions
+icons32x32_actions_DATA = 				\
+	hicolor/32x32/actions/internet-radio-new.png
+
+icons32x32_placesdir = $(themedir)/32x32/places
+icons32x32_places_DATA = 				\
+	hicolor/32x32/places/internet-radio.png
+
+# 48x48
+
+icons48x48_actionsdir = $(themedir)/48x48/actions
+icons48x48_actions_DATA = 				\
+	hicolor/48x48/actions/internet-radio-new.svg
+
+icons48x48_placesdir = $(themedir)/48x48/places
+icons48x48_places_DATA = 				\
+	hicolor/48x48/places/internet-radio.svg
+
+# source files
+
+noinst_DATA =						\
+	hicolor/16x16/actions/internet-radio-new.xcf	\
+	hicolor/16x16/places/internet-radio.xcf		\
+	\
+	hicolor/22x22/actions/internet-radio-new.svg	\
+	hicolor/22x22/places/internet-radio.svg		\
+	\
+	hicolor/32x32/actions/internet-radio-new.svg	\
+	hicolor/32x32/places/internet-radio.svg
+
+EXTRA_DIST = \
+	$(icons16x16_actions_DATA)			\
+	$(icons16x16_places_DATA)			\
+	\
+	$(icons22x22_actions_DATA)			\
+	$(icons22x22_places_DATA)			\
+	\
+	$(icons32x32_actions_DATA)			\
+	$(icons32x32_places_DATA)			\
+	\
+	$(icons48x48_actions_DATA)			\
+	$(icons48x48_places_DATA)			\
+	\
+	$(noinst_DATA)
+

