# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1192302098 -10800
# Node ID 7e65b69a9096fa8f52393a94d8472e03018bf39e
# Parent  b8fbf081bdfaebfec00feaa41396097dc5b1dc00
Sync with vtable blabla.

diff -r b8fbf081bdfa -r 7e65b69a9096 src/sid/xs_config.c
--- a/src/sid/xs_config.c	Sat Oct 13 13:17:15 2007 +0200
+++ b/src/sid/xs_config.c	Sat Oct 13 22:01:38 2007 +0300
@@ -23,26 +23,24 @@
 #include "xs_config.h"
 
 #ifdef AUDACIOUS_PLUGIN
-#include <audacious/configdb.h>
+#include <audacious/plugin.h>
 #define XS_CONFIG_FILE		ConfigDb
-#define XS_CONFIG_OPEN		bmp_cfg_db_open
-#define XS_CONFIG_FREE		bmp_cfg_db_close
-#define XS_CONFIG_WRITE
+#define XS_CONFIG_OPEN		aud_cfg_db_open
+#define XS_CONFIG_FREE		aud_cfg_db_close
 
-#define XS_CFG_SET_STRING	bmp_cfg_db_set_string
-#define XS_CFG_SET_FLOAT	bmp_cfg_db_set_float
-#define XS_CFG_SET_INT		bmp_cfg_db_set_int
-#define XS_CFG_SET_BOOL		bmp_cfg_db_set_bool
-#define XS_CFG_GET_STRING	bmp_cfg_db_get_string
-#define XS_CFG_GET_FLOAT	bmp_cfg_db_get_float
-#define XS_CFG_GET_INT		bmp_cfg_db_get_int
-#define XS_CFG_GET_BOOL		bmp_cfg_db_get_bool
+#define XS_CFG_SET_STRING	aud_cfg_db_set_string
+#define XS_CFG_SET_FLOAT	aud_cfg_db_set_float
+#define XS_CFG_SET_INT		aud_cfg_db_set_int
+#define XS_CFG_SET_BOOL		aud_cfg_db_set_bool
+#define XS_CFG_GET_STRING	aud_cfg_db_get_string
+#define XS_CFG_GET_FLOAT	aud_cfg_db_get_float
+#define XS_CFG_GET_INT		aud_cfg_db_get_int
+#define XS_CFG_GET_BOOL		aud_cfg_db_get_bool
 #else
 #include <xmms/configfile.h>
 #define XS_CONFIG_FILE		ConfigFile
 #define XS_CONFIG_OPEN		xmms_cfg_open_default_file
 #define XS_CONFIG_FREE		xmms_cfg_free
-#define XS_CONFIG_WRITE		xmms_cfg_write_default_file
 
 #define XS_CFG_SET_STRING	xmms_cfg_write_string
 #define XS_CFG_SET_FLOAT	xmms_cfg_write_float
@@ -642,7 +640,9 @@
 	}
 
 
-	XS_CONFIG_WRITE(cfg);
+#ifndef AUDACIOUS_PLUGIN
+	xmms_cfg_write_default_file(cfg);
+#endif
 	XS_CONFIG_FREE(cfg);
 
 	XS_MUTEX_UNLOCK(xs_cfg);