[rhythmbox] remove EggTrayIcon, always use GtkStatusIcon

[Jonathan Matthew <jmatthew src gnome org>]

commit be6796fce07227801e3515b448c2be6d9c058b57
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Feb 10 23:02:28 2010 +1000

    remove EggTrayIcon, always use GtkStatusIcon

 configure.ac                                |    8 -
 plugins/status-icon/Makefile.am             |    8 -
 plugins/status-icon/eggtrayicon.c           |  559 ---------------------------
 plugins/status-icon/eggtrayicon.h           |   80 ----
 plugins/status-icon/rb-status-icon-plugin.c |   82 +----
 plugins/status-icon/rb-tray-icon.c          |  479 -----------------------
 plugins/status-icon/rb-tray-icon.h          |   86 ----
 7 files changed, 2 insertions(+), 1300 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 82a573c..091d371 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,14 +71,6 @@ PKG_PROG_PKG_CONFIG
 
 PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS)
 
-# use gtk status icon with gtk >= 2.16
-PKG_CHECK_EXISTS(gtk+-2.0 >= 2.16, [
-	use_gtk_status_icon=yes
-	AC_DEFINE(USE_GTK_STATUS_ICON, 1, [Use GtkStatusIcon])
-], [use_gtk_status_icon=no])
-AM_CONDITIONAL(USE_GTK_STATUS_ICON, test x"$use_gtk_status_icon" = xyes)
-
-
 dnl  note: gio-unix-2.0 is here for libmediaplayerid
 PKG_CHECK_MODULES(RHYTHMBOX,				\
 		  gtk+-2.0 >= $GTK_REQS			\
diff --git a/plugins/status-icon/Makefile.am b/plugins/status-icon/Makefile.am
index 3bc0d6e..f8265fc 100644
--- a/plugins/status-icon/Makefile.am
+++ b/plugins/status-icon/Makefile.am
@@ -3,17 +3,9 @@ NULL =
 plugindir = $(PLUGINDIR)/status-icon
 plugin_LTLIBRARIES = libstatus-icon.la
 
-if USE_GTK_STATUS_ICON
 ICON_IMPL_FILES = \
 	rb-tray-icon-gtk.h 				\
 	rb-tray-icon-gtk.c
-else
-ICON_IMPL_FILES = \
-	eggtrayicon.c \
-	eggtrayicon.h \
-	rb-tray-icon.c \
-	rb-tray-icon.h
-endif
 
 libstatus_icon_la_SOURCES = \
 	rb-status-icon-plugin.h				\
diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
index cc7b8aa..b94c057 100644
--- a/plugins/status-icon/rb-status-icon-plugin.c
+++ b/plugins/status-icon/rb-status-icon-plugin.c
@@ -51,11 +51,7 @@
 #include "eel-gconf-extensions.h"
 #include "rb-builder-helpers.h"
 
-#if defined(USE_GTK_STATUS_ICON)
 #include "rb-tray-icon-gtk.h"
-#else
-#include "rb-tray-icon.h"
-#endif
 
 #define TRAY_ICON_DEFAULT_TOOLTIP _("Music Player")
 
@@ -1033,80 +1029,6 @@ store_window_visibility (RBStatusIconPlugin *plugin)
 	}
 }
 
-#if !defined(USE_GTK_STATUS_ICON)
-
-/* EggTrayIcon helpers */
-
-#if 0
-static void
-tray_embedded_cb (GtkPlug *plug,
-		  gpointer data)
-{
-	/* FIXME - this doesn't work */
-	RBShell *shell = RB_SHELL (data);
-
-	rb_debug ("got embedded signal");
-
-	gdk_window_set_decorations (shell->priv->window->window,
-				    GDK_DECOR_ALL | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE);
-}
-#endif
-
-static gboolean
-tray_destroy_cb (GtkObject *object, RBStatusIconPlugin *plugin)
-{
-	if (plugin->priv->tray_icon) {
-		rb_debug ("caught destroy event for icon %p", object);
-		g_object_ref_sink (object);
-		plugin->priv->tray_icon = NULL;
-		rb_debug ("finished sinking tray");
-	}
-
-	rb_debug ("creating new icon");
-	plugin->priv->tray_icon = rb_tray_icon_new (plugin, plugin->priv->shell);
-	g_signal_connect_object (plugin->priv->tray_icon, "destroy", G_CALLBACK (tray_destroy_cb), plugin, 0);
-	/* g_signal_connect_object (plugin->priv->tray_icon, "embedded", G_CALLBACK (tray_embedded_cb), plugin, 0); */
-
-	rb_debug ("done creating new icon %p", plugin->priv->tray_icon);
-	return TRUE;
-}
-
-static void
-cleanup_status_icon (RBStatusIconPlugin *plugin)
-{
-	g_signal_handlers_disconnect_by_func (plugin->priv->tray_icon,
-					      G_CALLBACK (tray_destroy_cb),
-					      plugin);
-
-	gtk_widget_hide_all (GTK_WIDGET (plugin->priv->tray_icon));
-	gtk_widget_destroy (GTK_WIDGET (plugin->priv->tray_icon));
-}
-
-static void
-create_status_icon (RBStatusIconPlugin *plugin)
-{
-	tray_destroy_cb (NULL, plugin);
-}
-
-#else
-
-/* boring equivalents for GtkStatusIcon */
-
-static void
-create_status_icon (RBStatusIconPlugin *plugin)
-{
-	plugin->priv->tray_icon = rb_tray_icon_new (plugin, plugin->priv->shell_player);
-}
-
-static void
-cleanup_status_icon (RBStatusIconPlugin *plugin)
-{
-	g_object_unref (plugin->priv->tray_icon);
-}
-
-
-#endif
-
 /* preferences dialog and gconf stuff */
 
 static void
@@ -1348,7 +1270,7 @@ impl_activate (RBPlugin *bplugin,
 	plugin->priv->wheel_mode = eel_gconf_get_integer (CONF_MOUSE_WHEEL_MODE);
 
 	/* create status icon */
-	create_status_icon (plugin);
+	plugin->priv->tray_icon = rb_tray_icon_new (plugin, plugin->priv->shell_player);
 	update_status_icon_visibility (plugin, FALSE);
 
 	/* update everything in case we're already playing something */
@@ -1401,7 +1323,7 @@ impl_deactivate	(RBPlugin *bplugin,
 
 	/* remove icon */
 	if (plugin->priv->tray_icon != NULL) {
-		cleanup_status_icon (plugin);
+		g_object_unref (plugin->priv->tray_icon);
 		plugin->priv->tray_icon = NULL;
 	}