# HG changeset patch
# User magma
# Date 1179008578 25200
# Node ID 637359219e10b8a43df3fc39dbd47ac2329a7150
# Parent  c89362b15525d5bde0541a72898a6c949fcb05f8
[svn] Reverted the modifications that were initially needed for DBus support.

diff -r c89362b15525 -r 637359219e10 ChangeLog
--- a/ChangeLog	Sat May 12 14:35:30 2007 -0700
+++ b/ChangeLog	Sat May 12 15:22:58 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-12 21:35:30 +0000  Ben Tucker <bnt@interchange.ubc.ca>
+  revision [4550]
+  Added lots of comments (styled after beepctrl).
+  
+  trunk/src/libaudclient/audctrl.c |  449 ++++++++++++++++++++++++++++++++++++++-
+  1 file changed, 446 insertions(+), 3 deletions(-)
+
+
 2007-05-12 18:44:30 +0000  Ralf Ertzinger <ralf@skytale.net>
   revision [4548]
   
diff -r c89362b15525 -r 637359219e10 src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Sat May 12 14:35:30 2007 -0700
+++ b/src/audacious/build_stamp.c	Sat May 12 15:22:58 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070512-4548";
+const gchar *svn_stamp = "20070512-4550";
diff -r c89362b15525 -r 637359219e10 src/audacious/plugin.h
--- a/src/audacious/plugin.h	Sat May 12 14:35:30 2007 -0700
+++ b/src/audacious/plugin.h	Sat May 12 15:22:58 2007 -0700
@@ -37,18 +37,11 @@
 #ifndef BMP_PLUGIN_H
 #define BMP_PLUGIN_H
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 
 #include <glib.h>
 #include "audacious/vfs.h"
 #include "audacious/titlestring.h"
 
-#ifdef USE_DBUS
-#include <dbus/dbus-glib.h>
-#endif
-
 #define INPUT_PLUGIN(x)   ((InputPlugin *)(x))
 #define OUTPUT_PLUGIN(x)  ((OutputPlugin *)(x))
 #define EFFECT_PLUGIN(x)  ((EffectPlugin *)(x))
@@ -227,10 +220,6 @@
     void (*about) (void);
     void (*configure) (void);
     void (*cleanup) (void);
-
-#ifdef USE_DBUS
-    DBusGProxy *dbus_proxy;
-#endif
 };
 
 struct _VisPlugin {
@@ -252,10 +241,6 @@
     void (*playback_stop) (void);
     void (*render_pcm) (gint16 pcm_data[2][512]);
     void (*render_freq) (gint16 freq_data[2][256]);
-
-#ifdef USE_DBUS
-    DBusGProxy *dbus_proxy;
-#endif
 };
 
 
diff -r c89362b15525 -r 637359219e10 src/audacious/pluginenum.c
--- 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;