# HG changeset patch
# User nenolod
# Date 1180046878 25200
# Node ID 8ab12f092722527be25e8dddf6e04af777465675
# Parent  f42a5b531c032aed52d230fa8d626a3e26530eae
[svn] - extended compatibility with v1 API

diff -r f42a5b531c03 -r 8ab12f092722 ChangeLog
--- a/ChangeLog	Thu May 24 04:50:48 2007 -0700
+++ b/ChangeLog	Thu May 24 15:47:58 2007 -0700
@@ -1,3 +1,11 @@
+2007-05-24 11:50:48 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [4626]
+  - hide 'error' from outside to avoid symbol conflict.
+  
+  trunk/src/libaudclient/audctrl.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 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)
diff -r f42a5b531c03 -r 8ab12f092722 src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Thu May 24 04:50:48 2007 -0700
+++ b/src/audacious/build_stamp.c	Thu May 24 15:47:58 2007 -0700
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070524-4624";
+const gchar *svn_stamp = "20070524-4626";
diff -r f42a5b531c03 -r 8ab12f092722 src/audacious/pluginenum.c
--- a/src/audacious/pluginenum.c	Thu May 24 04:50:48 2007 -0700
+++ b/src/audacious/pluginenum.c	Thu May 24 15:47:58 2007 -0700
@@ -243,6 +243,7 @@
     {
         for (op_iter = header->op_list; *op_iter != NULL; op_iter++)
         {
+            PLUGIN(*op_iter)->filename = g_strdup(filename);
             g_print("plugin2 '%s' provides OutputPlugin <%p>\n", filename, *op_iter);
             output_plugin_init(PLUGIN(*op_iter));
         }
@@ -252,6 +253,7 @@
     {
         for (ep_iter = header->ep_list; *ep_iter != NULL; ep_iter++)
         {
+            PLUGIN(*ep_iter)->filename = g_strdup(filename);
             g_print("plugin2 '%s' provides EffectPlugin <%p>\n", filename, *ep_iter);
             effect_plugin_init(PLUGIN(*ep_iter));
         }
@@ -261,6 +263,7 @@
     {
         for (gp_iter = header->gp_list; *gp_iter != NULL; gp_iter++)
         {
+            PLUGIN(*gp_iter)->filename = g_strdup(filename);
             g_print("plugin2 '%s' provides GeneralPlugin <%p>\n", filename, *gp_iter);
             general_plugin_init(PLUGIN(*gp_iter));
         }
@@ -270,6 +273,7 @@
     {
         for (vp_iter = header->vp_list; *vp_iter != NULL; vp_iter++)
         {
+            PLUGIN(*vp_iter)->filename = g_strdup(filename);
             g_print("plugin2 '%s' provides VisPlugin <%p>\n", filename, *vp_iter);
             vis_plugin_init(PLUGIN(*vp_iter));
         }