* ext.c (regex_command): Eliminate g_string_*().
Этот коммит содержится в:
родитель
10451e0109
Коммит
28fed14a03
@ -1,3 +1,7 @@
|
|||||||
|
2005-02-08 Andrew V. Samoilov <sav@bcs.zp.ua>
|
||||||
|
|
||||||
|
* ext.c (regex_command): Eliminate g_string_*().
|
||||||
|
|
||||||
2005-02-08 Roland Illig <roland.illig@gmx.de>
|
2005-02-08 Roland Illig <roland.illig@gmx.de>
|
||||||
|
|
||||||
* dialog.h: Moved and reformatted #definitions.
|
* dialog.h: Moved and reformatted #definitions.
|
||||||
|
28
src/ext.c
28
src/ext.c
@ -461,35 +461,27 @@ regex_command (const char *filename, const char *action, int *move_dir)
|
|||||||
home_error = 1;
|
home_error = 1;
|
||||||
goto check_stock_mc_ext;
|
goto check_stock_mc_ext;
|
||||||
} else {
|
} else {
|
||||||
GString *msg1 = g_string_new (NULL);
|
char *title =
|
||||||
GString *msg2 = g_string_new (NULL);
|
g_strdup_printf (_(" %s%s file error"),
|
||||||
|
mc_home, MC_LIB_EXT);
|
||||||
g_string_sprintf (msg1, _(" %s%s file error"),
|
message (1, title, _("The format of the %smc.ext "
|
||||||
mc_home, MC_LIB_EXT);
|
|
||||||
g_string_sprintf (msg2, _("The format of the %smc.ext "
|
|
||||||
"file has changed with version 3.0. It seems that "
|
"file has changed with version 3.0. It seems that "
|
||||||
"the installation failed. Please fetch a fresh "
|
"the installation failed. Please fetch a fresh "
|
||||||
"copy from the Midnight Commander package."),
|
"copy from the Midnight Commander package."),
|
||||||
mc_home);
|
mc_home);
|
||||||
message (1, msg1->str, "%s", msg2->str);
|
g_free (title);
|
||||||
g_string_free (msg1, TRUE);
|
|
||||||
g_string_free (msg2, TRUE);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (home_error) {
|
if (home_error) {
|
||||||
GString *title = g_string_new (NULL);
|
char *title =
|
||||||
GString *text = g_string_new (NULL);
|
g_strdup_printf (_(" ~/%s file error "), MC_USER_EXT);
|
||||||
|
message (1, title, _("The format of the ~/%s file has "
|
||||||
g_string_sprintf (title, _(" ~/%s file error "), MC_USER_EXT);
|
|
||||||
g_string_sprintf (text, _("The format of the ~/%s file has "
|
|
||||||
"changed with version 3.0. You may either want to copy "
|
"changed with version 3.0. You may either want to copy "
|
||||||
"it from %smc.ext of use that file as an example of how "
|
"it from %smc.ext of use that file as an example of how "
|
||||||
"to write it."), MC_USER_EXT, mc_home, mc_home);
|
"to write it."), MC_USER_EXT, mc_home);
|
||||||
message (1, title->str, "%s", text->str);
|
g_free (title);
|
||||||
g_string_free (title, TRUE);
|
|
||||||
g_string_free (text, TRUE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mc_stat (filename, &mystat);
|
mc_stat (filename, &mystat);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user