# HG changeset patch # User chainsaw # Date 1134850173 28800 # Node ID 511354316db42c5631bddaed82812226f3075fda # Parent 894e9c4a00510102f57dd5b1f80a7692714b17ef [svn] Convert to configdb usage. diff -r 894e9c4a0051 -r 511354316db4 Plugins/General/song_change/song_change.c --- a/Plugins/General/song_change/song_change.c Sat Dec 17 11:50:41 2005 -0800 +++ b/Plugins/General/song_change/song_change.c Sat Dec 17 12:09:33 2005 -0800 @@ -17,7 +17,7 @@ #include #include "audacious/plugin.h" -#include "libaudacious/configfile.h" +#include "libaudacious/configdb.h" #include "libaudacious/beepctrl.h" #include "libaudacious/formatter.h" @@ -56,28 +56,17 @@ static void read_config(void) { - ConfigFile *cfgfile; + ConfigDb *db; - g_free(cmd_line); - g_free(cmd_line_after); - g_free(cmd_line_end); - cmd_line = NULL; - cmd_line_after = NULL; - cmd_line_end = NULL; + cmd_line = g_strdup(""); + cmd_line_after = g_strdup(""); + cmd_line_end = g_strdup(""); - if ((cfgfile = xmms_cfg_open_default_file()) != NULL) - { - xmms_cfg_read_string(cfgfile, "song_change", "cmd_line", &cmd_line); - xmms_cfg_read_string(cfgfile, "song_change", "cmd_line_after", &cmd_line_after); - xmms_cfg_read_string(cfgfile, "song_change", "cmd_line_end", &cmd_line_end); - xmms_cfg_free(cfgfile); - } - if (!cmd_line) - cmd_line = g_strdup(""); - if (!cmd_line_after) - cmd_line_after = g_strdup(""); - if (!cmd_line_end) - cmd_line_end = g_strdup(""); + db = bmp_cfg_db_open(); + bmp_cfg_db_get_string(db, "song_change", "cmd_line", &cmd_line); + bmp_cfg_db_get_string(db, "song_change", "cmd_line_after", &cmd_line_after); + bmp_cfg_db_get_string(db, "song_change", "cmd_line_end", &cmd_line_end); + bmp_cfg_db_close(db); } static void init(void) @@ -105,18 +94,18 @@ static void save_and_close(GtkWidget *w, gpointer data) { + ConfigDb *db; char *cmd, *cmd_after, *cmd_end; - ConfigFile *cfgfile = xmms_cfg_open_default_file(); cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_entry))); cmd_after = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_after_entry))); cmd_end = g_strdup(gtk_entry_get_text(GTK_ENTRY(cmd_end_entry))); - xmms_cfg_write_string(cfgfile, "song_change", "cmd_line", cmd); - xmms_cfg_write_string(cfgfile, "song_change", "cmd_line_after", cmd_after); - xmms_cfg_write_string(cfgfile, "song_change", "cmd_line_end", cmd_end); - xmms_cfg_write_default_file(cfgfile); - xmms_cfg_free(cfgfile); + db = bmp_cfg_db_open(); + bmp_cfg_db_set_string(db, "song_change", "cmd_line", cmd); + bmp_cfg_db_set_string(db, "song_change", "cmd_line_after", cmd_after); + bmp_cfg_db_set_string(db, "song_change", "cmd_line_end", cmd_end); + bmp_cfg_db_close(db); g_free(cmd); g_free(cmd_after); g_free(cmd_end);