diff options
| author | Max Kellermann <max@duempel.org> | 2008-11-07 16:14:39 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-11-07 16:14:39 +0100 |
| commit | c238364f6833320fee4256226af650347d5a751b (patch) | |
| tree | c04fbb8f91e34dea95410290b941bee627e66c18 /src/screen_file.c | |
| parent | 06aafa1328f50d247676c2eca488e53fa02c0dbd (diff) | |
| download | mpd-c238364f6833320fee4256226af650347d5a751b.tar.gz mpd-c238364f6833320fee4256226af650347d5a751b.tar.xz mpd-c238364f6833320fee4256226af650347d5a751b.zip | |
mpdclient: expect UTF-8 strings
Don't convert the character set of strings to and from the current
locale. This library cannot know what the strings are going to be
used for, so it should not mess with them.
Diffstat (limited to 'src/screen_file.c')
| -rw-r--r-- | src/screen_file.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/screen_file.c b/src/screen_file.c index 75e4d1631..f42297971 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -82,6 +82,7 @@ handle_save(mpdclient_t *c) { filelist_entry_t *entry; char *defaultname = NULL; + int ret; if (browser.lw->selected >= filelist_length(browser.filelist)) return -1; @@ -95,7 +96,11 @@ handle_save(mpdclient_t *c) } } - return playlist_save(c, NULL, defaultname); + defaultname = utf8_to_locale(defaultname); + ret = playlist_save(c, NULL, defaultname); + g_free(defaultname); + + return ret; } static int @@ -133,7 +138,7 @@ handle_delete(mpdclient_t *c) return 0; } - if( mpdclient_cmd_delete_playlist_utf8(c, plf->path) ) + if( mpdclient_cmd_delete_playlist(c, plf->path) ) return -1; screen_status_printf(_("Playlist deleted!")); @@ -177,6 +182,7 @@ static const char * browse_title(char *str, size_t size) { const char *path = NULL, *prev = NULL, *slash = browser.filelist->path; + char *path_locale; /* determine the last 2 parts of the path */ while ((slash = strchr(slash, '/')) != NULL) { @@ -188,7 +194,9 @@ browse_title(char *str, size_t size) /* fall back to full path */ path = browser.filelist->path; - g_snprintf(str, size, _("Browse: %s"), path); + path_locale = utf8_to_locale(path); + g_snprintf(str, size, _("Browse: %s"), path_locale); + g_free(path_locale); return str; } @@ -236,10 +244,13 @@ browse_cmd(mpdclient_t *c, command_t cmd) if (!c->status->updatingDb) { if (mpdclient_cmd_db_update_utf8(c, browser.filelist->path) == 0) { - if (strcmp(browser.filelist->path, "")) + if (strcmp(browser.filelist->path, "")) { + char *path_locale = + utf8_to_locale(browser.filelist->path); screen_status_printf(_("Database update of %s started!"), - browser.filelist->path); - else + path_locale); + g_free(path_locale); + } else screen_status_printf(_("Database update started!")); /* set updatingDb to make shure the browse callback gets called |