diff -u -r xmms-infopipe-1.3.audacious/src/infopipe_config.c xmms-infopipe-1.3/src/infopipe_config.c --- xmms-infopipe-1.3.audacious/src/infopipe_config.c 2006-05-26 15:09:30.000000000 -0400 +++ xmms-infopipe-1.3/src/infopipe_config.c 2006-05-26 15:21:12.000000000 -0400 @@ -22,9 +22,7 @@ #include #include -/* Refer to audacious/configfile.h - I am not a real programmer! */ -#define I_AM_A_THIRD_PARTY_DEVELOPER_WHO_NEEDS_TO_BE_KICKED_IN_THE_HEAD_BY_CHUCK_NORRIS -#include +#include #include "infopipe_config.h" #include "infopipe.h" @@ -36,14 +34,14 @@ void load_config(void) { - ConfigFile *cfg; + ConfigDb *cfg; gboolean save; /* Is it necessary to save? Not yet! */ save = FALSE; /* Open the default config file (~/.xmms/config) */ - cfg = xmms_cfg_open_default_file(); + cfg = bmp_cfg_db_open(); /* Couldn't open? We really should have a default config file! */ if(!cfg) { @@ -58,32 +56,28 @@ param.chowntogid = (gint) getgid(); /* Read information... */ - xmms_cfg_read_boolean(cfg, "InfoPipe", "create_symlinks", + bmp_cfg_db_get_bool(cfg, "InfoPipe", "create_symlinks", ¶m.create_symlinks); - xmms_cfg_read_boolean(cfg, "InfoPipe", "delete_symlinks", + bmp_cfg_db_get_bool(cfg, "InfoPipe", "delete_symlinks", ¶m.delete_symlinks); - xmms_cfg_read_boolean(cfg, "InfoPipe", "do_chown", + bmp_cfg_db_get_bool(cfg, "InfoPipe", "do_chown", ¶m.do_chown); - xmms_cfg_read_int(cfg, "InfoPipe", "chown_to_uid", + bmp_cfg_db_get_int(cfg, "InfoPipe", "chown_to_uid", ¶m.chowntouid); - xmms_cfg_read_int(cfg, "InfoPipe", "chown_to_gid", + bmp_cfg_db_get_int(cfg, "InfoPipe", "chown_to_gid", ¶m.chowntogid); /* ...and save information, in case it wasn't there... */ - xmms_cfg_write_boolean(cfg, "InfoPipe", "create_symlinks", + bmp_cfg_db_set_bool(cfg, "InfoPipe", "create_symlinks", param.create_symlinks); - xmms_cfg_write_boolean(cfg, "InfoPipe", "delete_symlinks", + bmp_cfg_db_set_bool(cfg, "InfoPipe", "delete_symlinks", param.delete_symlinks); - xmms_cfg_write_boolean(cfg, "InfoPipe", "do_chown", + bmp_cfg_db_set_bool(cfg, "InfoPipe", "do_chown", param.do_chown); - xmms_cfg_write_int(cfg, "InfoPipe", "chown_to_uid", + bmp_cfg_db_set_int(cfg, "InfoPipe", "chown_to_uid", param.chowntouid); - xmms_cfg_write_int(cfg, "InfoPipe", "chown_to_gid", + bmp_cfg_db_set_int(cfg, "InfoPipe", "chown_to_gid", param.chowntogid); - - /* Write it out and get rid of our config object. */ - xmms_cfg_write_default_file(cfg); - xmms_cfg_free(cfg); }