Mercurial > audlegacy
diff src/audacious/playlist.c @ 4608:23a9ded30c70
Use str_assert_utf8() where it makes sense in the core.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 04 Jun 2008 23:30:29 +0300 |
parents | aec8fc12e075 |
children | c18e18ecc36b |
line wrap: on
line diff
--- a/src/audacious/playlist.c Wed Jun 04 23:26:23 2008 +0300 +++ b/src/audacious/playlist.c Wed Jun 04 23:30:29 2008 +0300 @@ -170,7 +170,7 @@ entry = mowgli_heap_alloc(playlist_entry_heap); entry->filename = g_strdup(filename); - entry->title = str_to_utf8(title); + entry->title = str_assert_utf8(title); entry->length = length; entry->selected = FALSE; entry->decoder = dec; @@ -406,7 +406,7 @@ return FALSE; } - playlist->title = str_to_utf8(title); + playlist->title = str_assert_utf8(title); g_free(oldtitle); hook_call("playlist update", NULL); return TRUE; @@ -1552,7 +1552,7 @@ /* FIXME: there should not be a need to do additional conversion, * if playlist is properly maintained */ if (playlist->position->title) { - title = str_to_utf8(playlist->position->title); + title = str_assert_utf8(playlist->position->title); } else { gchar *realfn = g_filename_from_uri(playlist->position->filename, NULL, NULL); @@ -1864,7 +1864,7 @@ return str_replace(title, filename_to_utf8(title)); } - return str_to_utf8(title); + return str_assert_utf8(title); } Tuple *