[rhythmbox] shell-player: remove dbus interface



commit 6ba631a70811303a0508c1719a1ddb63785960cc
Author: Jonathan Matthew <jonathan d14n org>
Date:   Mon Mar 7 08:30:45 2011 +1000

    shell-player: remove dbus interface
    
    Clients that were using this before should use MPRIS now.

 shell/Makefile.am         |    8 +---
 shell/main.c              |    9 -----
 shell/rb-shell-player.xml |   89 ---------------------------------------------
 3 files changed, 2 insertions(+), 104 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8b1959d..306010d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -146,15 +146,11 @@ endif
 
 rb-shell-glue.h: rb-shell.xml Makefile
 	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=rb_shell --mode=glib-server --output=$@ $<
-rb-shell-player-glue.h: rb-shell-player.xml Makefile
-	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=rb_shell_player --mode=glib-server --output=$@ $<
 rb-shell-binding.h: rb-shell.xml Makefile
 	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=rb_shell --mode=glib-client --output=$@ $<
-rb-shell-player-binding.h: rb-shell-player.xml Makefile
-	$(LIBTOOL) --mode=execute $(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=rb_shell --mode=glib-client --output=$@ $<
 
-BUILT_SOURCES += rb-shell-glue.h rb-shell-binding.h rb-shell-player-glue.h rb-shell-player-binding.h
-EXTRA_DIST += rb-shell.xml rb-shell-player.xml
+BUILT_SOURCES += rb-shell-glue.h rb-shell-binding.h
+EXTRA_DIST += rb-shell.xml
 
 rhythmbox_LDADD = 					\
 	librhythmbox-core.la				\
diff --git a/shell/main.c b/shell/main.c
index 36dabcc..c0b7811 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -283,18 +283,9 @@ main (int argc, char **argv)
 		rb_shell = rb_shell_new (no_registration, no_update, dry_run, autostarted, disable_plugins, rhythmdb_file, playlists_file);
 		g_object_weak_ref (G_OBJECT (rb_shell), main_shell_weak_ref_cb, NULL);
 		if (!no_registration && session_bus != NULL) {
-			GObject *obj;
-			const char *path;
-
 			dbus_g_object_type_install_info (RB_TYPE_SHELL, &dbus_glib_rb_shell_object_info);
 			dbus_g_connection_register_g_object (session_bus, "/org/gnome/Rhythmbox/Shell", G_OBJECT (rb_shell));
 
-			/* register player object */
-			dbus_g_object_type_install_info (RB_TYPE_SHELL_PLAYER, &dbus_glib_rb_shell_player_object_info);
-			obj = rb_shell_get_player (rb_shell);
-			path = rb_shell_get_player_path (rb_shell);
-			dbus_g_connection_register_g_object (session_bus, path, obj);
-
 			g_signal_connect (G_OBJECT (rb_shell),
 					  "database-load-complete",
 					  G_CALLBACK (database_load_complete),



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]