# HG changeset patch
# User yaz
# Date 1180007448 25200
# Node ID f42a5b531c032aed52d230fa8d626a3e26530eae
# Parent  febdfe7a482bafa4d993bc9b80da11f3cdbc3537
[svn] - hide 'error' from outside to avoid symbol conflict.

diff -r febdfe7a482b -r f42a5b531c03 ChangeLog
--- a/ChangeLog	Thu May 24 03:41:13 2007 -0700
+++ b/ChangeLog	Thu May 24 04:50:48 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-24 10:41:13 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4624]
+  - improve plugin2 loader's robustness (e.g. make it not crash)
+  
+  trunk/src/audacious/pluginenum.c |   47 +++++++++++++++++++++++++--------------
+  1 file changed, 31 insertions(+), 16 deletions(-)
+
+
 2007-05-24 10:37:54 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4622]
   - temporarily work around plugin API v1 retardation
diff -r febdfe7a482b -r f42a5b531c03 src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Thu May 24 03:41:13 2007 -0700
+++ b/src/audacious/build_stamp.c	Thu May 24 04:50:48 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070524-4622";
+const gchar *svn_stamp = "20070524-4624";
diff -r febdfe7a482b -r f42a5b531c03 src/libaudclient/audctrl.c
--- a/src/libaudclient/audctrl.c	Thu May 24 03:41:13 2007 -0700
+++ b/src/libaudclient/audctrl.c	Thu May 24 04:50:48 2007 -0700
@@ -28,7 +28,7 @@
 #include "audacious/dbus-client-bindings.h"
 #include "audctrl.h"
 
-GError *error = NULL;
+static GError *error = NULL; //it must be hidden from outside, otherwise symbol conflict likely to happen.
 
 /**
  * audacious_remote_playlist: