Mercurial > pidgin.yaz
diff pidgin/gtksound.c @ 25541:411b5a604a17
propagate from branch 'im.pidgin.pidgin' (head cb5420b4b28888af9a419d6ca29f524e552c9cf0)
to branch 'im.pidgin.pidgin.yaz' (head 2fb9c50de147c3e10a2bb579beca0cf90ab363d0)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Tue, 14 Aug 2007 07:13:22 +0000 |
| parents | 4c26b23e7859 |
| children | 630938110521 |
line wrap: on
line diff
--- a/pidgin/gtksound.c Tue Aug 14 06:58:29 2007 +0000 +++ b/pidgin/gtksound.c Tue Aug 14 07:13:22 2007 +0000 @@ -543,7 +543,8 @@ char *filename = g_strdup(purple_prefs_get_path(file_pref)); if(!filename || !strlen(filename)) { g_free(filename); - filename = g_build_filename(DATADIR, "sounds", "pidgin", sounds[event].def, NULL); + /* XXX Consider creating a constant for "sounds/purple" to be shared with Finch */ + filename = g_build_filename(DATADIR, "sounds", "purple", sounds[event].def, NULL); } purple_sound_play_file(filename, NULL);