Mercurial > audlegacy
changeset 3240:13360ebb72b3
Automated merge with ssh://hg.atheme.org//hg/audacious
author | William Pitcock <nenolod@atheme-project.org> |
---|---|
date | Sat, 04 Aug 2007 03:02:53 -0500 |
parents | d2eec0a406e9 (diff) 12bc288a7511 (current diff) |
children | 1c1a0bc666bd 91dd21cce4a5 |
files | |
diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/ui_credits.c Sat Aug 04 15:37:37 2007 +0900 +++ b/src/audacious/ui_credits.c Sat Aug 04 03:02:53 2007 -0500 @@ -53,6 +53,7 @@ N_("Audacious core developers:"), "George Averill", "Daniel Barkalow", + "Christian Birchinger", "Daniel Bradshaw", "Adam Cecile", "Michael Färber", @@ -91,7 +92,7 @@ NULL, N_("Patch authors:"), - "Christian Birchinger", + "Massimo Cavalleri", "Laszlo Dvornik", "Ralf Ertzinger", "Mike Frysinger",
--- a/src/audacious/ui_equalizer.c Sat Aug 04 15:37:37 2007 +0900 +++ b/src/audacious/ui_equalizer.c Sat Aug 04 03:02:53 2007 -0500 @@ -385,13 +385,23 @@ gint i, p = 0; EqualizerPreset *preset; + /* START mod: add check for the default presets locate in system path ({prefix}/share/audacious) + by Massimo Cavalleri (submax) */ + filename = g_build_filename(bmp_paths[BMP_PATH_USER_DIR], basename, NULL); if ((rcfile = bmp_rcfile_open(filename)) == NULL) { g_free(filename); - return NULL; + // DATA_DIR = "{prefix}/share/audacious" ; example is "/usr/share/audacious" + filename = g_build_filename(DATA_DIR, basename, NULL); + if ((rcfile = bmp_rcfile_open(filename)) == NULL) { + g_free(filename); + return NULL; + } } + // END mod + g_free(filename); for (;;) {