diff src/audacious/pluginenum.c @ 2763:637359219e10 trunk

[svn] Reverted the modifications that were initially needed for DBus support.

--- a/src/audacious/pluginenum.c	Sat May 12 14:35:30 2007 -0700
+++ b/src/audacious/pluginenum.c	Sat May 12 15:22:58 2007 -0700
@@ -36,12 +36,6 @@
 #include <glib/gprintf.h>
 #include <string.h>
 
-
-#ifdef USE_DBUS
-#include "dbus.h"
-#include "dbus-service.h"
-#endif
-
 #include "main.h"
 #include "ui_main.h"
 #include "playback.h"
@@ -63,11 +57,6 @@
 GHashTable *plugin_matrix = NULL;
 GList *lowlevel_list = NULL;
 
-#ifdef USE_DBUS
-static DBusGProxy *dbus_proxy = NULL;
-static DBusGConnection *connection = NULL;
-#endif
-
 extern GList *vfs_transports;
 
 static gint
@@ -184,9 +173,6 @@
 {
     GeneralPlugin *p = GENERAL_PLUGIN(plugin);
     p->xmms_session = -1;
-#ifdef USE_DBUS
-    p->dbus_proxy = dbus_proxy;
-#endif
     gp_data.general_list = g_list_append(gp_data.general_list, p);
 }
 
@@ -195,9 +181,6 @@
 {
     VisPlugin *p = VIS_PLUGIN(plugin);
     p->xmms_session = -1;
-#ifdef USE_DBUS
-    p->dbus_proxy = dbus_proxy;
-#endif
     p->disable_plugin = vis_disable_plugin;
     vp_data.vis_list = g_list_append(vp_data.vis_list, p);
 }
@@ -292,23 +275,6 @@
     LowlevelPlugin *lp;
     gint dirsel = 0, i = 0;
 
-#ifdef USE_DBUS
-	GError *error = NULL;
-	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-
-	if (connection == NULL)
-	{
-		g_printerr("audtool: D-Bus error: %s", error->message);
-		g_error_free(error);
-
-		exit(EXIT_FAILURE);
-	}
-
-	dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE,
-                                           AUDACIOUS_DBUS_PATH,
-                                           AUDACIOUS_DBUS_INTERFACE);
-#endif
-
     if (!g_module_supported()) {
         report_error("Module loading not supported! Plugins will not be loaded.\n");
         return;