diff options
| -rw-r--r-- | src/cache.c | 4 | ||||
| -rw-r--r-- | src/sound-theme-spec.c | 5 | ||||
| -rw-r--r-- | todo | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/cache.c b/src/cache.c index c0b1f87..dd8b482 100644 --- a/src/cache.c +++ b/src/cache.c @@ -197,7 +197,9 @@ static int db_open(void) { goto finish; } - database = tdb_open(pn, 0, TDB_DEFAULT, O_RDWR|O_CREAT|O_NOCTTY + /* We pass TDB_NOMMAP here as long as rhbz 460851 is not fixed in + * tdb. */ + database = tdb_open(pn, 0, TDB_NOMMAP, O_RDWR|O_CREAT|O_NOCTTY #ifdef O_CLOEXEC | O_CLOEXEC #endif diff --git a/src/sound-theme-spec.c b/src/sound-theme-spec.c index 1473ec0..46bd5c4 100644 --- a/src/sound-theme-spec.c +++ b/src/sound-theme-spec.c @@ -491,8 +491,9 @@ static int find_sound_in_locale( sprintf(p, "%s/sounds", path); if ((ret = find_sound_for_suffix(f, sfopen, sound_path, theme_name, name, p, ".disabled", locale, subdir)) == CA_ERROR_NOTFOUND) - if ((ret = find_sound_for_suffix(f, sfopen, sound_path,theme_name, name, p, ".ogg", locale, subdir)) == CA_ERROR_NOTFOUND) - ret = find_sound_for_suffix(f, sfopen, sound_path,theme_name, name, p, ".wav", locale, subdir); + if ((ret = find_sound_for_suffix(f, sfopen, sound_path,theme_name, name, p, ".oga", locale, subdir)) == CA_ERROR_NOTFOUND) + if ((ret = find_sound_for_suffix(f, sfopen, sound_path,theme_name, name, p, ".ogg", locale, subdir)) == CA_ERROR_NOTFOUND) + ret = find_sound_for_suffix(f, sfopen, sound_path,theme_name, name, p, ".wav", locale, subdir); ca_free(p); @@ -1,5 +1,3 @@ -Later: -* lookup cache * ca_context_left_to_play() +* ca_context_check() or DRY_RUN * queuing, looping, prefixing, postfixing -* make CA_PROP_CANBERRA_XDG_xxx follow GtkSettings |