[rhythmbox] status-icon: drop the -notplaying variant of the tray icon

[Jonathan Matthew <jmatthew src gnome org>]

commit e3d43f1ebde4dfabce9620d2a170b732c5dfa475
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Aug 17 10:44:51 2010 +1000

    status-icon: drop the -notplaying variant of the tray icon
    
    We don't have a -notplaying variant of the new app icon, and this is
    of questionable utility anyway.

 data/icons/hicolor/16x16/status/Makefile.am        |    4 +-
 .../hicolor/16x16/status/rhythmbox-notplaying.png  |  Bin 541 -> 0 bytes
 .../hicolor/16x16/status/rhythmbox-notplaying.svg  |  571 ----------------
 data/icons/hicolor/22x22/Makefile.am               |    2 +-
 data/icons/hicolor/22x22/status/Makefile.am        |   15 -
 .../hicolor/22x22/status/rhythmbox-notplaying.png  |  Bin 896 -> 0 bytes
 .../hicolor/22x22/status/rhythmbox-notplaying.svg  |  611 -----------------
 data/icons/hicolor/32x32/Makefile.am               |    2 +-
 data/icons/hicolor/32x32/status/Makefile.am        |   15 -
 .../hicolor/32x32/status/rhythmbox-notplaying.png  |  Bin 1271 -> 0 bytes
 .../hicolor/32x32/status/rhythmbox-notplaying.svg  |  670 -------------------
 data/icons/hicolor/scalable/Makefile.am            |    2 +-
 data/icons/hicolor/scalable/status/Makefile.am     |   14 -
 .../scalable/status/rhythmbox-notplaying.svg       |  700 --------------------
 lib/rb-stock-icons.c                               |    3 +-
 lib/rb-stock-icons.h                               |    3 +-
 plugins/status-icon/rb-tray-icon-gtk.c             |   19 +-
 17 files changed, 7 insertions(+), 2624 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/status/Makefile.am b/data/icons/hicolor/16x16/status/Makefile.am
index 849a30e..0c19fee 100644
--- a/data/icons/hicolor/16x16/status/Makefile.am
+++ b/data/icons/hicolor/16x16/status/Makefile.am
@@ -5,13 +5,11 @@ context = status
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-	rhythmbox-notplaying.png	\
 	rhythmbox-set-star.png		\
 	rhythmbox-unset-star.png	\
 	rhythmbox-no-star.png
 
-noinst_DATA = \
-	rhythmbox-notplaying.svg
+noinst_DATA =
 
 EXTRA_DIST = \
 	$(icons_DATA)	\
diff --git a/data/icons/hicolor/22x22/Makefile.am b/data/icons/hicolor/22x22/Makefile.am
index d3736bb..0f1aa6d 100644
--- a/data/icons/hicolor/22x22/Makefile.am
+++ b/data/icons/hicolor/22x22/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions apps places status
+SUBDIRS = actions apps places
diff --git a/data/icons/hicolor/32x32/Makefile.am b/data/icons/hicolor/32x32/Makefile.am
index d3736bb..0f1aa6d 100644
--- a/data/icons/hicolor/32x32/Makefile.am
+++ b/data/icons/hicolor/32x32/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions apps places status
+SUBDIRS = actions apps places
diff --git a/data/icons/hicolor/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
index d3736bb..0f1aa6d 100644
--- a/data/icons/hicolor/scalable/Makefile.am
+++ b/data/icons/hicolor/scalable/Makefile.am
@@ -1 +1 @@
-SUBDIRS = actions apps places status
+SUBDIRS = actions apps places
diff --git a/lib/rb-stock-icons.c b/lib/rb-stock-icons.c
index 3b9339e..3bb7792 100644
--- a/lib/rb-stock-icons.c
+++ b/lib/rb-stock-icons.c
@@ -48,8 +48,7 @@ typedef struct {
 } RBInlineIconData;
 
 const char RB_APP_ICON[] = "rhythmbox";
-const char RB_STOCK_TRAY_ICON_PLAYING[] = "rhythmbox";
-const char RB_STOCK_TRAY_ICON_NOT_PLAYING[] = "rhythmbox-notplaying";
+const char RB_STOCK_TRAY_ICON[] = "rhythmbox";
 const char RB_STOCK_SET_STAR[] = "rhythmbox-set-star";
 const char RB_STOCK_UNSET_STAR[] = "rhythmbox-unset-star";
 const char RB_STOCK_NO_STAR[] = "rhythmbox-no-star";
diff --git a/lib/rb-stock-icons.h b/lib/rb-stock-icons.h
index 9e01776..662fa5f 100644
--- a/lib/rb-stock-icons.h
+++ b/lib/rb-stock-icons.h
@@ -32,8 +32,7 @@
 G_BEGIN_DECLS
 
 extern const char RB_APP_ICON[];
-extern const char RB_STOCK_TRAY_ICON_PLAYING[];
-extern const char RB_STOCK_TRAY_ICON_NOT_PLAYING[];
+extern const char RB_STOCK_TRAY_ICON[];
 extern const char RB_STOCK_SET_STAR[];
 extern const char RB_STOCK_UNSET_STAR[];
 extern const char RB_STOCK_NO_STAR[];
diff --git a/plugins/status-icon/rb-tray-icon-gtk.c b/plugins/status-icon/rb-tray-icon-gtk.c
index e44055f..5ee5932 100644
--- a/plugins/status-icon/rb-tray-icon-gtk.c
+++ b/plugins/status-icon/rb-tray-icon-gtk.c
@@ -77,9 +77,6 @@ static void rb_tray_icon_button_press_event_cb (GtkStatusIcon *status_icon,
 static void rb_tray_icon_scroll_event_cb (GtkStatusIcon *status_icon,
 					  GdkEventScroll *event,
 					  RBTrayIcon *tray);
-static void rb_tray_icon_playing_changed_cb (RBShellPlayer *player,
-					     gboolean playing,
-					     RBTrayIcon *tray);
 
 struct _RBTrayIconPrivate
 {
@@ -150,7 +147,7 @@ rb_tray_icon_init (RBTrayIcon *tray)
 
 	tray->priv = G_TYPE_INSTANCE_GET_PRIVATE ((tray), RB_TYPE_TRAY_ICON, RBTrayIconPrivate);
 
-	tray->priv->icon = gtk_status_icon_new_from_icon_name (RB_STOCK_TRAY_ICON_NOT_PLAYING);
+	tray->priv->icon = gtk_status_icon_new_from_icon_name (RB_STOCK_TRAY_ICON);
 	gtk_status_icon_set_visible (tray->priv->icon, FALSE);
 	gtk_status_icon_set_title (GTK_STATUS_ICON (tray->priv->icon), _("Rhythmbox"));
 
@@ -172,11 +169,6 @@ rb_tray_icon_constructed (GObject *object)
 	RB_CHAIN_GOBJECT_METHOD (rb_tray_icon_parent_class, constructed, object);
 	tray = RB_TRAY_ICON (object);
 
-	g_signal_connect_object (tray->priv->shell_player,
-				 "playing-changed",
-				 G_CALLBACK (rb_tray_icon_playing_changed_cb),
-				 tray, 0);
-
 	gtk_status_icon_set_has_tooltip (tray->priv->icon, TRUE);
 	g_signal_connect_object (tray->priv->icon, "query-tooltip",
 				 G_CALLBACK (rb_status_icon_plugin_set_tooltip),
@@ -204,15 +196,6 @@ rb_tray_icon_dispose (GObject *object)
 }
 
 static void
-rb_tray_icon_playing_changed_cb (RBShellPlayer *player, gboolean playing, RBTrayIcon *tray)
-{
-	const char *icon_name;
-
-	icon_name = playing ? RB_STOCK_TRAY_ICON_PLAYING : RB_STOCK_TRAY_ICON_NOT_PLAYING;
-	gtk_status_icon_set_from_icon_name (tray->priv->icon, icon_name);
-}
-
-static void
 rb_tray_icon_set_property (GObject *object,
 			   guint prop_id,
 			   const GValue *value,