mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

* file.c: Warning fix. Include global.h before other local

Browse Source 
includes.
* filegui.c: Likewise.
(fmd_init_i18n) [!ENABLE_NLS]: Completely disable.
* i18n.h [!ENABLE_NLS]: Warning fix.
* learn.c (init_learn): Move do_refresh() call immediately
before cleate_dlg().  Warning fix.
This commit is contained in:
Pavel Roskin 2001-08-03 04:47:52 +00:00
parent 50859eae37
commit b201fe6077
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
2001-08-03 Pavel Roskin <proski@gnu.org>
* file.c: Warning fix. Include global.h before other local
includes.
* filegui.c: Likewise.
(fmd_init_i18n) [!ENABLE_NLS]: Completely disable.
* i18n.h [!ENABLE_NLS]: Warning fix.
* learn.c (init_learn): Move do_refresh() call immediately
before cleate_dlg(). Warning fix.
2001-07-31 Pavel Roskin <proski@gnu.org>
* Makefile.in: "install" now depends on "all".

2
src/file.c
View File

@ -79,9 +79,9 @@
#endif /* SCO_FLAVOR */
#include <time.h>
#include <utime.h>
#include "global.h"
#include "eregex.h"
#include "dialog.h"
#include "global.h"
#include "setup.h"
/* Needed by query_replace */
#include "color.h"

8
src/filegui.c
View File

@ -68,7 +68,6 @@
#endif
#include <errno.h>
#include "tty.h"
#include <ctype.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@ -82,8 +81,9 @@
#endif /* SCO_FLAVOR */
#include <time.h>
#include <utime.h>
#include "eregex.h"
#include "global.h"
#include "tty.h"
#include "eregex.h"
#include "setup.h"
#include "dialog.h"
/* Needed by query_replace */
@ -812,6 +812,7 @@ static QuickWidget fmd_widgets [] = {
void
fmd_init_i18n (int force)
{
#ifdef ENABLE_NLS
static int initialized = FALSE;
register int i;
int len;
@ -819,7 +820,6 @@ fmd_init_i18n (int force)
if (initialized && !force)
return;
#ifdef ENABLE_NLS
for (i = sizeof (op_names) / sizeof (op_names[0]); i--;)
op_names [i] = _(op_names [i]);
@ -873,9 +873,9 @@ fmd_init_i18n (int force)
fmd_widgets [FMDI2].hotkey_pos = fmd_xlen - 6;
}
#undef chkbox_xpos
#endif /* ENABLE_NLS */
initialized = TRUE;
#endif /* !ENABLE_NLS */
}
char *

4
src/i18n.h
View File

@ -17,11 +17,11 @@
# endif
# else
/* Stubs that do something close enough. */
# define textdomain(String) (String)
# define textdomain(String)
# define gettext(String) (String)
# define dgettext(Domain,Message) (Message)
# define dcgettext(Domain,Message,Type) (Message)
# define bindtextdomain(Domain,Directory) (Domain)
# define bindtextdomain(Domain,Directory)
# define _(String) (String)
# define N_(String) (String)
# endif

6
src/learn.c
View File

@ -232,11 +232,9 @@ static void init_learn (void)
int x, y, i, j;
key_code_name_t *key;
char buffer [BUF_TINY];
static int i18n_flag = 0;
do_refresh ();
#ifdef ENABLE_NLS
static int i18n_flag = 0;
if (!i18n_flag)
{
char* cp;
@ -259,6 +257,8 @@ static void init_learn (void)
}
#endif /* ENABLE_NLS */
do_refresh ();
learn_dlg = create_dlg (0, 0, 23, 78, dialog_colors,
learn_callback, "[Learn keys]", "Learn keys",
DLG_CENTER);