Merge commit 'origin/mc-4.6'

This commit is contained in:
Enrico Weigelt, metux IT service 2009-02-01 22:38:48 +01:00
commit 3410eb3229
2 changed files with 4 additions and 3 deletions

View File

@ -1,6 +1,7 @@
2009-02-01 Enrico Weigelt, metux ITS <weigelt@metux.de> 2009-02-01 Enrico Weigelt, metux ITS <weigelt@metux.de>
* src/util.c: fixed name_trunc() on NULL or empty parameters * src/util.c: fixed name_trunc() on NULL or empty parameters
* src/achown.c: fixed unitialized var in init_chown_advanced()
(patch from andrew_b) (patch from andrew_b)
2009-01-31 Enrico Weigelt, metux ITS <weigelt@metux.de>, Patrick Winnertz <winnie@debian.org>, Slava Zanko <slavazanko@gmail.com>, Sergei Trofimovich <slyfox@inbox.ru> 2009-01-31 Enrico Weigelt, metux ITS <weigelt@metux.de>, Patrick Winnertz <winnie@debian.org>, Slava Zanko <slavazanko@gmail.com>, Sergei Trofimovich <slyfox@inbox.ru>

View File

@ -539,9 +539,9 @@ init_chown_advanced (void)
int i; int i;
enum { dlg_h = 13, dlg_w = 74, n_elem = 4 }; enum { dlg_h = 13, dlg_w = 74, n_elem = 4 };
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
static int i18n_len; static int i18n_len = 0;
if (!i18n_len) { if (i18n_len == 0) {
int dx, cx; int dx, cx;
for (i = 0 ; i < n_elem ; i++) { for (i = 0 ; i < n_elem ; i++) {
chown_advanced_but[i].text = _(chown_advanced_but[i].text); chown_advanced_but[i].text = _(chown_advanced_but[i].text);