[rhythmbox] visualizer: remove dbus interface

[Jonathan Matthew <jmatthew src gnome org>]

commit 70fb9685eec77b733d85fff4f7342665432cf74c
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sun Mar 6 22:14:32 2011 +1000

    visualizer: remove dbus interface
    
    I'm pretty sure no one has ever used it.

 plugins/visualizer/Makefile.am            |   10 -----
 plugins/visualizer/rb-visualizer-plugin.c |   61 -----------------------------
 plugins/visualizer/rb-visualizer.xml      |   17 --------
 3 files changed, 0 insertions(+), 88 deletions(-)
---
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
index 8376e73..5ded449 100644
--- a/plugins/visualizer/Makefile.am
+++ b/plugins/visualizer/Makefile.am
@@ -14,7 +14,6 @@ libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static
 libvisualizer_la_LIBADD = 				\
 	$(top_builddir)/shell/librhythmbox-core.la	\
 	-lgstinterfaces-0.10				\
-	$(DBUS_LIBS)					\
 	$(RHYTHMBOX_LIBS)
 
 INCLUDES = 						\
@@ -39,7 +38,6 @@ INCLUDES = 						\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DPLUGIN_SRC_DIR=\""$(ROOT_UNINSTALLED_DIR)/plugins/visualizer"\" \
 	$(RHYTHMBOX_CFLAGS)				\
-	$(DBUS_CFLAGS)					\
 	-D_XOPEN_SOURCE -D_BSD_SOURCE
 
 gtkbuilderdir = $(plugindir)
@@ -82,11 +80,3 @@ DISTCLEANFILES =		\
 	$(BUILT_SOURCES)	\
 	$(NULL)
 
-rb-visualizer-glue.h: rb-visualizer.xml Makefile
-	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=rb_visualizer --mode=glib-server --output=$@ $<
-
-BUILT_SOURCES += rb-visualizer-glue.h
-EXTRA_DIST += rb-visualizer.xml
-
-libvisualizer_la_LIBADD += $(DBUS_LIBS)
-
diff --git a/plugins/visualizer/rb-visualizer-plugin.c b/plugins/visualizer/rb-visualizer-plugin.c
index c21d807..12760a7 100644
--- a/plugins/visualizer/rb-visualizer-plugin.c
+++ b/plugins/visualizer/rb-visualizer-plugin.c
@@ -78,8 +78,6 @@
 
 #define VISUALIZATION_ICON_NAME	"visualization"
 
-#include <dbus/dbus-glib.h>
-
 #include "rb-vis-widget.h"
 
 /* preferences */
@@ -103,8 +101,6 @@
 
 #define HIDE_CONTROLS_TIMEOUT	5 * 1000
 
-#define VISUALIZER_DBUS_PATH	"/org/gnome/Rhythmbox/Visualizer"
-
 /* playbin2 flag(s) */
 #define PLAYBIN2_FLAG_VIS	0x08
 
@@ -195,10 +191,6 @@ typedef struct
 	GtkWidget *song_info_label;
 	GtkWidget *play_button;
 	gboolean syncing_play;
-
-	gboolean dbus_interface_registered;
-	gboolean plugin_enabled;
-
 } RBVisualizerPlugin;
 
 typedef struct
@@ -219,11 +211,6 @@ static void enable_visualization (RBVisualizerPlugin *pi);
 static gboolean disable_visualization (RBVisualizerPlugin *pi, gboolean set_action);
 static void update_window (RBVisualizerPlugin *plugin, VisualizerMode mode, int screen, int monitor);
 
-gboolean rb_visualizer_start_remote (RBVisualizerPlugin *plugin, unsigned long window_id, GError **error);
-gboolean rb_visualizer_stop_remote (RBVisualizerPlugin *plugin, GError **error);
-
-#include "rb-visualizer-glue.h"
-
 static GtkToggleActionEntry rb_visualizer_plugin_toggle_actions [] =
 {
 	{ "ToggleVisualizer", VISUALIZATION_ICON_NAME, N_("_Visualization"), NULL,
@@ -1800,23 +1787,6 @@ impl_activate (RBPlugin *plugin,
 					 "window-title-changed",
 					 G_CALLBACK (rb_visualizer_plugin_window_title_change_cb),
 					 pi, 0);
-
-	/* add dbus interface */
-	if (pi->dbus_interface_registered == FALSE) {
-		DBusGConnection *conn;
-		GError *error = NULL;
-
-		conn = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-		if (conn != NULL) {
-			dbus_g_object_type_install_info (RB_TYPE_VISUALIZER_PLUGIN,
-							 &dbus_glib_rb_visualizer_object_info);
-			dbus_g_connection_register_g_object (conn,
-							     VISUALIZER_DBUS_PATH,
-							     G_OBJECT (plugin));
-			pi->dbus_interface_registered = TRUE;
-		}
-	}
-	pi->plugin_enabled = TRUE;
 }
 
 static void
@@ -1841,10 +1811,6 @@ impl_deactivate	(RBPlugin *plugin,
 		pi->action_group = NULL;
 	}
 
-	/* can't remove the dbus interface.  it only goes away when the
-	 * plugin object does, which is when the process exits.
-	 */
-
 	g_object_unref (uim);
 
 	/* disconnect signal handlers */
@@ -1887,8 +1853,6 @@ impl_deactivate	(RBPlugin *plugin,
 	if (pi->shell != NULL) {
 		pi->shell = NULL;
 	}
-
-	pi->plugin_enabled = FALSE;
 }
 
 /* play controls (prev|play|next + song info (+ maybe seek bar) */
@@ -2370,28 +2334,3 @@ rb_visualizer_plugin_class_init (RBVisualizerPluginClass *klass)
 	plugin_class->activate = impl_activate;
 	plugin_class->deactivate = impl_deactivate;
 }
-
-gboolean
-rb_visualizer_start_remote (RBVisualizerPlugin *plugin, unsigned long window_id, GError **error)
-{
-	/* don't do anything is plugin is disabled */
-	if (plugin->plugin_enabled == FALSE)
-		return TRUE;
-
-	/* this might not work properly - might need a new visualizer mode */
-	plugin->remote_window = window_id;
-	update_window (plugin, DESKTOP_WINDOW, -1, -1);
-	return TRUE;
-}
-
-gboolean
-rb_visualizer_stop_remote (RBVisualizerPlugin *plugin, GError **error)
-{
-	/* don't do anything is plugin is disabled */
-	if (plugin->plugin_enabled == FALSE)
-		return TRUE;
-
-	plugin->remote_window = 0;
-	update_window (plugin, EMBEDDED, -1, -1);
-	return TRUE;
-}