# HG changeset patch
# User nenolod
# Date 1178770749 25200
# Node ID 2f638e729d9e59c21515aad70b325f3028905bb7
# Parent  88b39b1d9b7bf7d7f58d117ffb8a2bbce193f9d2
[svn] Remove documentation about XMMS controlsocket compatibility. This code
has been removed.

diff -r 88b39b1d9b7b -r 2f638e729d9e ChangeLog
--- a/ChangeLog	Wed May 09 21:16:57 2007 -0700
+++ b/ChangeLog	Wed May 09 21:19:09 2007 -0700
@@ -1,3 +1,16 @@
+2007-05-10 04:16:57 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4474]
+  Fix build without --enable-dbus -- this will render an audacious which
+  is not remote-controllable (the buggy controlsocket code has been removed
+  in a prior build), but makes our dependency on dbus optional. When built 
+  without dbus, MPRIS support is also disabled (as it needs D-Bus).
+  
+  trunk/configure.ac   |    2 ++
+  trunk/mk/rules.mk.in |    1 +
+  trunk/src/Makefile   |    2 +-
+  3 files changed, 4 insertions(+), 1 deletion(-)
+
+
 2007-05-10 00:14:46 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4472]
   - bind to the right dbus interfaces, but this still has problems building
diff -r 88b39b1d9b7b -r 2f638e729d9e man/audacious.1.in
--- a/man/audacious.1.in	Wed May 09 21:16:57 2007 -0700
+++ b/man/audacious.1.in	Wed May 09 21:19:09 2007 -0700
@@ -3,7 +3,7 @@
 Audacious \- an audio player for X.
 .SH SYNOPSIS
 .B audacious
-[\-h] [\-\-help] [\-n \fI<session>\fP] [\-\-session=\fI<session>\fP] [\-r]
+[\-h] [\-\-help] [\-r]
 [\-\-rew] [\-p] [\-\-play] [\-u] [\-\-pause] [\-s] [\-\-stop] [\-f]
 [\-\-fwd] [\-e] [\-\-enqueue] [\-m] [\-\-show\-main\-window] [\-v]
 [\-\-version] [\-\-headless] [\fIfilename\fP]...
@@ -20,9 +20,6 @@
 .B \-h, \-\-help
 Show summary of options.
 .TP
-.B \-n, \-\-session
-Select Audacious/BMP/XMMS session (Default: 0).
-.TP
 .B \-r, \-\-rew
 Skip backwards in playlist.
 .TP
diff -r 88b39b1d9b7b -r 2f638e729d9e src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Wed May 09 21:16:57 2007 -0700
+++ b/src/audacious/build_stamp.c	Wed May 09 21:19:09 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070510-4472";
+const gchar *svn_stamp = "20070510-4474";