[Pkg-mc-commits] r18 - trunk/debian/patches
winnie at alioth.debian.org
winnie at alioth.debian.org
Tue Feb 12 20:55:24 UTC 2008
Author: winnie
Date: 2008-02-12 20:55:23 +0000 (Tue, 12 Feb 2008)
New Revision: 18
Modified:
trunk/debian/patches/60_recode.patch
Log:
Modified 60_recode.patch but this has to be reviewed...
Modified: trunk/debian/patches/60_recode.patch
===================================================================
--- trunk/debian/patches/60_recode.patch 2008-02-12 20:04:39 UTC (rev 17)
+++ trunk/debian/patches/60_recode.patch 2008-02-12 20:55:23 UTC (rev 18)
@@ -1,40 +1,50 @@
-diff -urN mc-4.6.1-orig/edit/editkeys.c mc-4.6.1/edit/editkeys.c
---- mc-4.6.1-orig/edit/editkeys.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/edit/editkeys.c 2005-07-30 23:13:14.000000000 +0700
-@@ -205,7 +205,7 @@
-
- #ifdef HAVE_CHARSET
- if (x_key == XCTRL ('t')) {
-- do_select_codepage ();
-+ do_select_codepage (_(" Choose codepage "));
-
- edit->force = REDRAW_COMPLETELY;
- command = CK_Refresh;
-ä×ÏÉÞÎÙÅ ÆÁÊÌÙ mc-4.6.1-orig/po/ru.gmo É mc-4.6.1/po/ru.gmo ÒÁÚÌÉÞÁÀÔÓÑ
-diff -urN mc-4.6.1-orig/po/ru.po mc-4.6.1/po/ru.po
---- mc-4.6.1-orig/po/ru.po 2005-07-23 23:53:30.000000000 +0700
-+++ mc-4.6.1/po/ru.po 2005-07-30 23:17:02.000000000 +0700
-@@ -4503,3 +4503,32 @@
- #: vfs/vfs.c:894
+Binärdateien mc-4.6.2~pre1.orig/po/de.gmo and mc-4.6.2~pre1/po/de.gmo sind verschieden.
+Binärdateien mc-4.6.2~pre1.orig/po/it.gmo and mc-4.6.2~pre1/po/it.gmo sind verschieden.
+Binärdateien mc-4.6.2~pre1.orig/po/ru.gmo and mc-4.6.2~pre1/po/ru.gmo sind verschieden.
+diff -Nurwd mc-4.6.2~pre1.orig/po/ru.po mc-4.6.2~pre1/po/ru.po
+--- mc-4.6.2~pre1.orig/po/ru.po 2007-09-11 16:35:10.000000000 +0200
++++ mc-4.6.2~pre1/po/ru.po 2008-02-12 21:13:21.000000000 +0100
+@@ -17,7 +17,7 @@
+ "Project-Id-Version: ru\n"
+ "Report-Msgid-Bugs-To: mc-devel at gnome.org\n"
+ "POT-Creation-Date: 2007-09-11 17:35+0300\n"
+-"PO-Revision-Date: 2005-09-09 14:37+0300\n"
++"PO-Revision-Date: 2008-02-12 21:13+0100\n"
+ "Last-Translator: Anton S. Chumak <nightfast at yahoo.co.uk>\n"
+ "Language-Team: Russian ru at li.org\n"
+ "MIME-Version: 1.0\n"
+@@ -3625,23 +3625,31 @@
msgid "Changes to file lost"
msgstr "éÚÍÅÎÅÎÉÑ ÄÌÑ ÆÁÊÌÁ ÐÏÔÅÒÑÎÙ"
-+
+
+-#~ msgid "&Type"
+-#~ msgstr "&ôÉÐ"
+#: messages for recode patch
+msgid "Panel &codepage"
+msgstr "ëÏÄÉÒÏ×ËÁ ÐÁÎÅÌÉ"
-+
+
+-#~ msgid "&Links"
+-#~ msgstr "&óÓÙÌËÉ"
+msgid " Choose codepage "
+msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ"
-+
+
+-#~ msgid "N&GID"
+-#~ msgstr "N&GID"
+msgid " Choose panel codepage "
+msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ ÐÁÎÅÌÉ "
-+
+
+-#~ msgid "N&UID"
+-#~ msgstr "N&UID"
+msgid " Choose default FTP codepage "
+msgstr " ÷ÙÂÅÒÉÔÅ ËÏÄÉÒÏ×ËÕ FTP ÐÏ ÕÍÏÌÞÁÎÉÀ "
-+
+
+-#~ msgid "&Owner"
+-#~ msgstr "&÷ÌÁÄÅÌÅÃ"
+msgid "FTP default codepage:"
+msgstr "ëÏÄÉÒÏ×ËÁ FTP ÐÏ ÕÍÏÌÞÁÎÉÀ:"
-+
+
+-#~ msgid "&Group"
+-#~ msgstr "&çÒÕÐÐÁ"
+msgid "Recode file names:"
+msgstr "ðÅÒÅËÏÄÉÒÏ×ÁÔØ ÉÍÅÎÁ:"
+
@@ -46,11 +56,13 @@
+
+msgid " Choose \"TO\" codepage for COPY/MOVE operaion "
+msgstr" ÷ÙÂÅÒÉÔÅ ËÏÎÅÞÎÕÀ ËÏÄÉÒÏ×ËÕ ÄÌÑ ÏÐÅÒÁÃÉÉ ËÏÐÉÒÏ×ÁÎÉÑ/ÐÅÒÅÍÅÝÅÎÉÑ "
-+
-diff -urN mc-4.6.1-orig/src/boxes.c mc-4.6.1/src/boxes.c
---- mc-4.6.1-orig/src/boxes.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/src/boxes.c 2005-07-31 01:20:52.000000000 +0700
-@@ -49,6 +49,7 @@
+
+-#~ msgid "%s bytes in %d files"
+-#~ msgstr "%s ÂÁÊÔ × %d ÆÁÊÌÁÈ"
+diff -Nurwd mc-4.6.2~pre1.orig/src/boxes.c mc-4.6.2~pre1/src/boxes.c
+--- mc-4.6.2~pre1.orig/src/boxes.c 2008-02-12 21:08:39.000000000 +0100
++++ mc-4.6.2~pre1/src/boxes.c 2008-02-12 21:09:19.000000000 +0100
+@@ -52,6 +52,7 @@
#ifdef HAVE_CHARSET
#include "charsets.h"
#include "selcodepage.h"
@@ -58,7 +70,7 @@
#endif
#ifdef USE_NETCODE
-@@ -446,8 +447,8 @@
+@@ -454,8 +455,8 @@
}
}
@@ -69,7 +81,7 @@
#ifndef HAVE_CHARSET
-@@ -543,26 +544,61 @@
+@@ -551,23 +552,58 @@
static int new_display_codepage;
@@ -105,9 +117,9 @@
+ sprintf( buf, "%s", cpname );
+ button_set_text (cpbutton_ftp, buf);
+
- return 0;
- }
-
++ return 0;
++}
++
+static int sel_charset_button_ftp(int action) {
+ char *cpname, buf[64];
+ if(new_display_codepage>0) {
@@ -129,13 +141,10 @@
+ "Setup / Display Bits dialog!\n"
+ "Do not forget to save options." ));
+ }
-+ return 0;
-+}
-+
- static Dlg_head *
- init_disp_bits_box (void)
- {
-@@ -581,9 +617,6 @@
+ return 0;
+ }
+
+@@ -589,9 +625,6 @@
cpname = (new_display_codepage < 0)
? _("Other 8 bit")
: codepages[new_display_codepage].name;
@@ -145,7 +154,7 @@
add_widget (dbits_dlg,
button_new (DISPY - 3, DISPX / 2 + 3, B_CANCEL,
NORMAL_BUTTON, _("&Cancel"), 0));
-@@ -592,13 +625,30 @@
+@@ -600,13 +633,30 @@
0));
inpcheck =
@@ -181,7 +190,7 @@
return dbits_dlg;
}
-@@ -608,6 +658,7 @@
+@@ -616,6 +666,7 @@
{
Dlg_head *dbits_dlg;
new_display_codepage = display_codepage;
@@ -189,7 +198,7 @@
application_keypad_mode ();
dbits_dlg = init_disp_bits_box ();
-@@ -628,6 +679,17 @@
+@@ -636,6 +687,17 @@
&& display_codepage != 1) ? 128 : 160;
#endif
use_8th_bit_as_meta = !(inpcheck->state & C_BOOL);
@@ -207,10 +216,10 @@
}
destroy_dlg (dbits_dlg);
repaint_screen ();
-diff -urN mc-4.6.1-orig/src/charsets.c mc-4.6.1/src/charsets.c
---- mc-4.6.1-orig/src/charsets.c 2005-07-23 23:52:02.000000000 +0700
-+++ mc-4.6.1/src/charsets.c 2005-07-30 23:31:28.000000000 +0700
-@@ -119,8 +119,6 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.c mc-4.6.2~pre1/src/charsets.c
+--- mc-4.6.2~pre1.orig/src/charsets.c 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.2~pre1/src/charsets.c 2008-02-12 21:09:19.000000000 +0100
+@@ -121,8 +121,6 @@
}
}
@@ -219,7 +228,7 @@
const char *
get_codepage_id (int n)
{
-@@ -139,7 +137,7 @@
+@@ -141,7 +139,7 @@
return -1;
}
@@ -228,9 +237,9 @@
translate_character (iconv_t cd, char c)
{
char outbuf[4], *obuf;
-diff -urN mc-4.6.1-orig/src/charsets.h mc-4.6.1/src/charsets.h
---- mc-4.6.1-orig/src/charsets.h 2004-08-30 17:38:00.000000000 +0700
-+++ mc-4.6.1/src/charsets.h 2005-07-30 23:32:37.000000000 +0700
+diff -Nurwd mc-4.6.2~pre1.orig/src/charsets.h mc-4.6.2~pre1/src/charsets.h
+--- mc-4.6.2~pre1.orig/src/charsets.h 2004-12-03 20:17:47.000000000 +0100
++++ mc-4.6.2~pre1/src/charsets.h 2008-02-12 21:09:19.000000000 +0100
@@ -6,6 +6,7 @@
#define UNKNCHAR '\001'
@@ -250,10 +259,10 @@
const char *get_codepage_id (int n);
int get_codepage_index (const char *id);
int load_codepages_list (void);
-diff -urN mc-4.6.1-orig/src/cmd.c mc-4.6.1/src/cmd.c
---- mc-4.6.1-orig/src/cmd.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/src/cmd.c 2005-07-30 23:41:23.000000000 +0700
-@@ -74,6 +74,10 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/cmd.c mc-4.6.2~pre1/src/cmd.c
+--- mc-4.6.2~pre1.orig/src/cmd.c 2007-05-02 14:01:13.000000000 +0200
++++ mc-4.6.2~pre1/src/cmd.c 2008-02-12 21:16:25.000000000 +0100
+@@ -70,6 +70,10 @@
# include "../edit/edit.h"
#endif
@@ -264,40 +273,38 @@
/* If set and you don't have subshell support,then C-o will give you a shell */
int output_starts_shell = 0;
-@@ -350,6 +354,9 @@
+@@ -347,6 +351,9 @@
+ mkdir_cmd (void)
{
- char *tempdir;
- char *dir;
+ char *dir, *absdir;
+#ifdef HAVE_CHARSET
+ char *recoded_dir;
+#endif
dir =
input_expand_dialog (_("Create a new Directory"),
-@@ -360,8 +367,17 @@
+@@ -356,8 +363,16 @@
if (dir[0] == '/' || dir[0] == '~')
- tempdir = g_strdup (dir);
+ absdir = g_strdup (dir);
- else
-- tempdir = concat_dir_and_file (current_panel->cwd, dir);
+ else {
+#ifdef HAVE_CHARSET
+ recoded_dir=g_strdup(dir);
+ my_translate_string(dir,strlen(dir), recoded_dir,current_panel->tr_table_input);
-+ tempdir = concat_dir_and_file (current_panel->cwd, recoded_dir);
++ absdir = concat_dir_and_file (current_panel->cwd, recoded_dir);
+ g_free(recoded_dir);
+#else
-+ tempdir = concat_dir_and_file (current_panel->cwd, dir);
+ absdir = concat_dir_and_file (current_panel->cwd, dir);
+#endif
+ }
-+
- g_free (dir);
save_cwds_stat ();
-diff -urN mc-4.6.1-orig/src/file.c mc-4.6.1/src/file.c
---- mc-4.6.1-orig/src/file.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/src/file.c 2005-07-30 23:55:00.000000000 +0700
-@@ -77,6 +77,9 @@
+ if (my_mkdir (absdir, 0777) == 0) {
+diff -Nurwd mc-4.6.2~pre1.orig/src/file.c mc-4.6.2~pre1/src/file.c
+--- mc-4.6.2~pre1.orig/src/file.c 2008-02-12 21:08:39.000000000 +0100
++++ mc-4.6.2~pre1/src/file.c 2008-02-12 21:09:19.000000000 +0100
+@@ -73,6 +73,9 @@
#include "../vfs/vfs-impl.h"
/* }}} */
@@ -305,93 +312,87 @@
+#include "recode.h"
+#endif
- int verbose = 1;
-
-@@ -914,7 +917,11 @@
+ /* Hack: the vfs code should not rely on this */
+ #define WITH_FULL_PATHS 1
+@@ -917,7 +920,11 @@
}
/* Dive into subdir if exists */
if (toplevel && ctx->dive_into_subdirs) {
-- dest_dir = concat_dir_and_file (d, x_basename (s));
+#ifdef HAVE_CHARSET
+ dest_dir = concat_dir_and_recoded_fname(d, x_basename (s), ctx);
+#else
-+ dest_dir = concat_dir_and_file (d, x_basename (s));
+ dest_dir = concat_dir_and_file (d, x_basename (s));
+#endif
} else {
dest_dir = g_strdup (d);
goto dont_mkdir;
-@@ -964,7 +971,11 @@
+@@ -967,7 +974,11 @@
(*ctx->stat_func) (path, &buf);
if (S_ISDIR (buf.st_mode)) {
-- mdpath = concat_dir_and_file (dest_dir, next->d_name);
+#ifdef HAVE_CHARSET
+ mdpath = concat_dir_and_recoded_fname(dest_dir, next->d_name, ctx);
+#else
-+ mdpath = concat_dir_and_file (dest_dir, next->d_name);
+ mdpath = concat_dir_and_file (dest_dir, next->d_name);
+#endif
/*
* From here, we just intend to recursively copy subdirs, not
* the double functionality of copying different when the target
-@@ -975,7 +986,11 @@
+@@ -978,7 +989,11 @@
parent_dirs, progress_count, progress_bytes);
g_free (mdpath);
} else {
-- dest_file = concat_dir_and_file (dest_dir, x_basename (path));
+#ifdef HAVE_CHARSET
+ dest_file=concat_dir_and_recoded_fname(dest_dir, x_basename(path),ctx);
+#else
-+ dest_file = concat_dir_and_file (dest_dir, x_basename (path));
+ dest_file = concat_dir_and_file (dest_dir, x_basename (path));
+#endif
return_status = copy_file_file (ctx, path, dest_file, 1,
progress_count, progress_bytes, 0);
g_free (dest_file);
-@@ -1159,7 +1174,12 @@
+@@ -1168,7 +1183,12 @@
destdir = g_strdup (d);
move_over = 1;
} else
-- destdir = concat_dir_and_file (d, x_basename (s));
+#ifdef HAVE_CHARSET
+ destdir = concat_dir_and_recoded_fname(d, x_basename (s), ctx);
+#else
-+ destdir = concat_dir_and_file (d, x_basename (s));
+ destdir = concat_dir_and_file (d, x_basename (s));
+#endif
+
if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) {
int msize = COLS - 36;
-@@ -1875,7 +1895,12 @@
+@@ -1873,7 +1893,12 @@
if (temp == NULL) {
value = transform_error;
} else {
-- char *temp2 = concat_dir_and_file (dest, temp);
+#ifdef HAVE_CHARSET
+ char *temp2 = concat_dir_and_recoded_fname (dest, temp, ctx);
+#else
-+ char *temp2 = concat_dir_and_file (dest, temp);
+ char *temp2 = concat_dir_and_file (dest, temp);
+#endif
+
g_free (dest);
dest = temp2;
temp = NULL;
-@@ -1969,7 +1994,12 @@
+@@ -1967,7 +1992,12 @@
if (temp == NULL)
value = transform_error;
else {
-- char *temp2 = concat_dir_and_file (dest, temp);
+#ifdef HAVE_CHARSET
+ char *temp2 = concat_dir_and_recoded_fname(dest, temp, ctx);
+#else
-+ char *temp2 = concat_dir_and_file (dest, temp);
+ char *temp2 = concat_dir_and_file (dest, temp);
+#endif
+
switch (operation) {
case OP_COPY:
-diff -urN mc-4.6.1-orig/src/filegui.c mc-4.6.1/src/filegui.c
---- mc-4.6.1-orig/src/filegui.c 2006-06-13 00:53:19.000000000 +0700
-+++ mc-4.6.1/src/filegui.c 2006-06-13 01:18:24.000000000 +0700
-@@ -71,6 +71,10 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/filegui.c mc-4.6.2~pre1/src/filegui.c
+--- mc-4.6.2~pre1.orig/src/filegui.c 2008-02-12 21:08:39.000000000 +0100
++++ mc-4.6.2~pre1/src/filegui.c 2008-02-12 21:19:54.000000000 +0100
+@@ -67,6 +67,10 @@
#include "util.h" /* strip_password() */
#include "tty.h"
@@ -401,8 +402,8 @@
+
/* }}} */
- /* This structure describes the UI and internal data required by a file
-@@ -722,57 +726,79 @@
+ /* Hack: the vfs code should not rely on this */
+@@ -721,57 +725,79 @@
}
}
@@ -421,12 +422,12 @@
-#define FMCB11 1
- /* follow symlinks and preserve Attributes must be the first */
- {quick_checkbox, 3, 64, 8, FMDY, N_("preserve &Attributes"), 9, 0,
-- 0 /* &op_preserve */ , 0, "preserve"},
+- 0 /* &op_preserve */ , 0, NULL},
- {quick_checkbox, 3, 64, 7, FMDY, N_("follow &Links"), 7, 0,
-- 0 /* &file_mask_op_follow_links */ , 0, "follow"},
-- {quick_label, 3, 64, 5, FMDY, N_("to:"), 0, 0, 0, 0, "to"},
+- 0 /* &file_mask_op_follow_links */ , 0, NULL},
+- {quick_label, 3, 64, 5, FMDY, N_("to:"), 0, 0, 0, 0, NULL},
- {quick_checkbox, 37, 64, 4, FMDY, N_("&Using shell patterns"), 0, 0,
-- 0 /* &source_easy_patterns */ , 0, "using-shell"},
+- 0 /* &source_easy_patterns */ , 0, NULL},
- {quick_input, 3, 64, 3, FMDY, "", 58,
- 0, 0, 0, "input-def"},
-#define FMDI1 4
@@ -435,10 +436,10 @@
- {quick_input, 3, 64, 6, FMDY, "", 58, 0,
- 0, 0, "input2"},
-#define FMDI0 6
-- {quick_label, 3, 64, 2, FMDY, "", 0, 0, 0, 0, "ql"},
+- {quick_label, 3, 64, 2, FMDY, "", 0, 0, 0, 0, NULL},
-#define FMBRGT 7
- {quick_button, 42, 64, 9, FMDY, N_("&Cancel"), 0, B_CANCEL, 0, 0,
-- "cancel"},
+- NULL},
-#undef SKIP
+#ifdef HAVE_CHARSET
+ #define Y_OK 12
@@ -453,27 +454,26 @@
-# define FMBLFT 9
-# define FMBMID 8
- {quick_button, 25, 64, 9, FMDY, N_("&Background"), 0, B_USER, 0, 0,
-- "back"},
+- NULL},
-#else /* WITH_BACKGROUND */
-# define SKIP 4
-# define FMCB21 10
-# define FMCB22 9
-# define FMBLFT 8
-# undef FMBMID
--#endif
-- {quick_button, 14, 64, 9, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, "ok"},
++ #define ADD 0
++#else
++ #define ADD -1
+ #endif
+- {quick_button, 14, 64, 9, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, NULL},
- {quick_checkbox, 42, 64, 8, FMDY, N_("&Stable Symlinks"), 0, 0,
-- 0 /* &file_mask_stable_symlinks */ , 0, "stab-sym"},
+- 0 /* &file_mask_stable_symlinks */ , 0, NULL},
- {quick_checkbox, 31, 64, 7, FMDY, N_("&Dive into subdir if exists"), 0,
- 0,
-- 0 /* &dive_into_subdirs */ , 0, "dive"},
+- 0 /* &dive_into_subdirs */ , 0, NULL},
- NULL_QuickWidget
-+ #define ADD 0
-+#else
-+ #define ADD -1
-+#endif
+
-+ #define FM_STAB_SYM 0
++ #define FM_STAB_SYM 0
+ #define FM_DIVE_INTO_SUBDIR 1
+ #define FM_PRES_ATTR 2
+ #define FM_FOLLOW_LINKS 3
@@ -527,7 +527,7 @@
};
static int
-@@ -806,48 +832,48 @@
+@@ -805,48 +831,48 @@
if (fmd_widgets[i].text[0] != '\0')
fmd_widgets[i].text = _(fmd_widgets[i].text);
@@ -595,7 +595,7 @@
}
#undef chkbox_xpos
-@@ -867,6 +893,9 @@
+@@ -866,6 +892,9 @@
int val;
QuickDialog Quick_input;
char *def_text;
@@ -605,7 +605,7 @@
g_return_val_if_fail (ctx != NULL, NULL);
def_text = g_strdup(def_text_orig);
-@@ -884,10 +913,11 @@
+@@ -883,10 +912,11 @@
/* Set up the result pointers */
@@ -621,7 +621,7 @@
/* filter out a possible password from def_text */
def_text_secure = strip_password (g_strdup (def_text), 1);
-@@ -895,8 +925,9 @@
+@@ -894,8 +924,9 @@
/* Create the dialog */
ctx->stable_symlinks = 0;
@@ -633,7 +633,7 @@
Quick_input.xlen = fmd_xlen;
Quick_input.xpos = -1;
Quick_input.title = op_names[operation];
-@@ -904,19 +935,37 @@
+@@ -903,19 +934,37 @@
Quick_input.ylen = FMDY;
Quick_input.i18n = 1;
Quick_input.widgets = fmd_widgets;
@@ -675,8 +675,8 @@
- g_free (def_text_secure);
if (ctx->follow_links)
- ctx->stat_func = (mc_stat_fn) mc_stat;
-@@ -938,6 +984,7 @@
+ ctx->stat_func = mc_stat;
+@@ -937,6 +986,7 @@
orig_mask = source_mask;
if (!dest_dir || !*dest_dir) {
g_free (source_mask);
@@ -684,7 +684,7 @@
g_free(def_text);
return dest_dir;
}
-@@ -992,6 +1039,48 @@
+@@ -991,6 +1041,48 @@
}
if (val == B_USER)
*do_background = 1;
@@ -733,10 +733,10 @@
g_free(def_text);
return dest_dir;
}
-diff -urN mc-4.6.1-orig/src/fileopctx.c mc-4.6.1/src/fileopctx.c
---- mc-4.6.1-orig/src/fileopctx.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/src/fileopctx.c 2005-07-31 00:01:14.000000000 +0700
-@@ -24,8 +24,12 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.c mc-4.6.2~pre1/src/fileopctx.c
+--- mc-4.6.2~pre1.orig/src/fileopctx.c 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.2~pre1/src/fileopctx.c 2008-02-12 21:09:19.000000000 +0100
+@@ -25,8 +25,12 @@
#include <unistd.h>
#include "global.h"
@@ -750,7 +750,7 @@
/**
* file_op_context_new:
-@@ -52,6 +56,12 @@
+@@ -53,6 +57,12 @@
ctx->umask_kill = 0777777;
ctx->erase_at_end = TRUE;
@@ -763,9 +763,9 @@
return ctx;
}
-diff -urN mc-4.6.1-orig/src/fileopctx.h mc-4.6.1/src/fileopctx.h
---- mc-4.6.1-orig/src/fileopctx.h 2004-10-07 01:06:26.000000000 +0700
-+++ mc-4.6.1/src/fileopctx.h 2005-07-31 00:03:00.000000000 +0700
+diff -Nurwd mc-4.6.2~pre1.orig/src/fileopctx.h mc-4.6.2~pre1/src/fileopctx.h
+--- mc-4.6.2~pre1.orig/src/fileopctx.h 2004-10-06 20:06:26.000000000 +0200
++++ mc-4.6.2~pre1/src/fileopctx.h 2008-02-12 21:09:19.000000000 +0100
@@ -108,6 +108,14 @@
/* User interface data goes here */
@@ -781,10 +781,10 @@
} FileOpContext;
-diff -urN mc-4.6.1-orig/src/main.c mc-4.6.1/src/main.c
---- mc-4.6.1-orig/src/main.c 2005-07-23 23:52:02.000000000 +0700
-+++ mc-4.6.1/src/main.c 2005-07-31 00:08:01.000000000 +0700
-@@ -86,6 +86,7 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/main.c mc-4.6.2~pre1/src/main.c
+--- mc-4.6.2~pre1.orig/src/main.c 2008-02-12 21:08:39.000000000 +0100
++++ mc-4.6.2~pre1/src/main.c 2008-02-12 21:09:19.000000000 +0100
+@@ -81,6 +81,7 @@
#ifdef HAVE_CHARSET
#include "charsets.h"
@@ -792,7 +792,7 @@
#endif /* HAVE_CHARSET */
#ifdef USE_VFS
-@@ -102,6 +103,7 @@
+@@ -97,6 +98,7 @@
/* The structures for the panels */
WPanel *left_panel = NULL;
WPanel *right_panel = NULL;
@@ -800,7 +800,7 @@
/* The pointer to the tree */
WTree *the_tree = NULL;
-@@ -585,6 +587,7 @@
+@@ -586,6 +588,7 @@
}
directory = *new_dir ? new_dir : home_dir;
@@ -808,7 +808,7 @@
if (mc_chdir (directory) == -1) {
strcpy (panel->cwd, olddir);
g_free (olddir);
-@@ -798,6 +801,10 @@
+@@ -804,6 +807,10 @@
{' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
{' ', N_("&Info C-x i"), 'I', info_cmd},
{' ', N_("&Tree"), 'T', tree_cmd},
@@ -819,7 +819,7 @@
{' ', "", ' ', 0},
{' ', N_("&Sort order..."), 'S', sort_cmd},
{' ', "", ' ', 0},
-@@ -822,6 +829,10 @@
+@@ -828,6 +835,10 @@
{' ', N_("&Quick view C-x q"), 'Q', quick_view_cmd},
{' ', N_("&Info C-x i"), 'I', info_cmd},
{' ', N_("&Tree"), 'T', tree_cmd},
@@ -830,10 +830,10 @@
{' ', "", ' ', 0},
{' ', N_("&Sort order..."), 'S', sort_cmd},
{' ', "", ' ', 0},
-diff -urN mc-4.6.1-orig/src/Makefile.am mc-4.6.1/src/Makefile.am
---- mc-4.6.1-orig/src/Makefile.am 2005-06-08 19:27:19.000000000 +0700
-+++ mc-4.6.1/src/Makefile.am 2005-07-31 01:30:09.000000000 +0700
-@@ -40,7 +40,8 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.am mc-4.6.2~pre1/src/Makefile.am
+--- mc-4.6.2~pre1.orig/src/Makefile.am 2006-02-04 12:13:30.000000000 +0100
++++ mc-4.6.2~pre1/src/Makefile.am 2008-02-12 21:22:20.000000000 +0100
+@@ -41,7 +41,8 @@
mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
@@ -843,46 +843,45 @@
SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
chmod.c chmod.h chown.c chown.h cmd.c cmd.h color.c color.h \
-@@ -55,8 +56,8 @@
+@@ -58,8 +59,8 @@
menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h \
option.c option.h panel.h panelize.c panelize.h poptalloca.h \
popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c \
- profile.c profile.h regex.c rxvt.c screen.c setup.c setup.h \
- slint.c subshell.c subshell.h textconf.c textconf.h \
+ profile.c profile.h regex.c rxvt.c screen.c screen.h setup.c \
-+ setup.h slint.c subshell.c subshell.h textconf.c textconf.h \
- tree.c tree.h treestore.c treestore.h tty.h user.c user.h \
++ setup.h slint.c subshell.c subshell.h textconf.c textconf.h \
+ tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h \
util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
- widget.h win.c win.h wtools.c wtools.h \
-diff -urN mc-4.6.1-orig/src/Makefile.in mc-4.6.1/src/Makefile.in
---- mc-4.6.1-orig/src/Makefile.in 2005-07-23 23:53:15.000000000 +0700
-+++ mc-4.6.1/src/Makefile.in 2005-07-31 01:47:59.000000000 +0700
-@@ -84,12 +84,12 @@
- mouse.c mouse.h myslang.h option.c option.h panel.h panelize.c \
- panelize.h poptalloca.h popt.c poptconfig.c popt.h popthelp.c \
- poptint.h poptparse.c profile.c profile.h regex.c rxvt.c \
-- screen.c setup.c setup.h slint.c subshell.c subshell.h \
-+ screen.c screen.h setup.c setup.h slint.c subshell.c subshell.h \
- textconf.c textconf.h tree.c tree.h treestore.c treestore.h \
- tty.h user.c user.h util.c util.h utilunix.c view.c view.h \
- vfsdummy.h widget.c widget.h win.c win.h wtools.c wtools.h \
- x11conn.h x11conn.c charsets.c charsets.h selcodepage.c \
-- selcodepage.h
-+ selcodepage.h recode.c recode.h
+ widget.h win.c win.h wtools.c wtools.h unixcompat.h \
+diff -Nurwd mc-4.6.2~pre1.orig/src/Makefile.in mc-4.6.2~pre1/src/Makefile.in
+--- mc-4.6.2~pre1.orig/src/Makefile.in 2007-09-11 16:33:39.000000000 +0200
++++ mc-4.6.2~pre1/src/Makefile.in 2008-02-12 21:35:30.000000000 +0100
+@@ -95,12 +95,12 @@
+ mountlist.c mountlist.h mouse.c mouse.h myslang.h option.c \
+ option.h panel.h panelize.c panelize.h poptalloca.h popt.c \
+ poptconfig.c popt.h popthelp.c poptint.h poptparse.c profile.c \
+- profile.h regex.c rxvt.c screen.c setup.c setup.h slint.c \
++ profile.h regex.c rxvt.c screen.c screen.h setup.c setup.h slint.c \
+ subshell.c subshell.h textconf.c textconf.h tree.c tree.h \
+ treestore.c treestore.h tty.c tty.h user.c user.h util.c \
+ util.h utilunix.c view.c view.h vfsdummy.h widget.c widget.h \
+ win.c win.h wtools.c wtools.h unixcompat.h x11conn.h x11conn.c \
+- ecs.h ecs.c charsets.c charsets.h selcodepage.c selcodepage.h
++ ecs.h ecs.c charsets.c charsets.h selcodepage.c selcodepage.h recode.c recode.h
am__objects_1 = achown.$(OBJEXT) background.$(OBJEXT) boxes.$(OBJEXT) \
chmod.$(OBJEXT) chown.$(OBJEXT) cmd.$(OBJEXT) color.$(OBJEXT) \
command.$(OBJEXT) complete.$(OBJEXT) cons.handler.$(OBJEXT) \
-@@ -109,7 +109,8 @@
- util.$(OBJEXT) utilunix.$(OBJEXT) view.$(OBJEXT) \
- widget.$(OBJEXT) win.$(OBJEXT) wtools.$(OBJEXT) \
- x11conn.$(OBJEXT)
+@@ -120,7 +120,7 @@
+ tty.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) utilunix.$(OBJEXT) \
+ view.$(OBJEXT) widget.$(OBJEXT) win.$(OBJEXT) wtools.$(OBJEXT) \
+ x11conn.$(OBJEXT) ecs.$(OBJEXT)
-am__objects_2 = charsets.$(OBJEXT) selcodepage.$(OBJEXT)
+am__objects_2 = charsets.$(OBJEXT) selcodepage.$(OBJEXT) recode.$(OBJEXT)
-+
@CHARSET_FALSE at am_mc_OBJECTS = $(am__objects_1)
@CHARSET_TRUE at am_mc_OBJECTS = $(am__objects_1) $(am__objects_2)
mc_OBJECTS = $(am_mc_OBJECTS)
-@@ -342,7 +343,8 @@
+@@ -329,7 +329,8 @@
mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV)
@@ -892,20 +891,18 @@
SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
chmod.c chmod.h chown.c chown.h cmd.c cmd.h color.c color.h \
command.c command.h complete.c complete.h cons.handler.c \
-@@ -356,8 +358,8 @@
+@@ -345,7 +346,7 @@
menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h \
option.c option.h panel.h panelize.c panelize.h poptalloca.h \
popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c \
- profile.c profile.h regex.c rxvt.c screen.c setup.c setup.h \
-- slint.c subshell.c subshell.h textconf.c textconf.h \
-+ profile.c profile.h regex.c rxvt.c screen.c screen.h setup.c \
-+ setup.h slint.c subshell.c subshell.h textconf.c textconf.h \
- tree.c tree.h treestore.c treestore.h tty.h user.c user.h \
++ profile.c profile.h regex.c rxvt.c screen.c screen.h setup.c setup.h \
+ slint.c subshell.c subshell.h textconf.c textconf.h \
+ tree.c tree.h treestore.c treestore.h tty.c tty.h user.c user.h \
util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
- widget.h win.c win.h wtools.c wtools.h \
-diff -urN mc-4.6.1-orig/src/panel.h mc-4.6.1/src/panel.h
---- mc-4.6.1-orig/src/panel.h 2004-08-29 23:55:51.000000000 +0700
-+++ mc-4.6.1/src/panel.h 2005-07-31 00:12:04.000000000 +0700
+diff -Nurwd mc-4.6.2~pre1.orig/src/panel.h mc-4.6.2~pre1/src/panel.h
+--- mc-4.6.2~pre1.orig/src/panel.h 2004-12-03 20:17:47.000000000 +0100
++++ mc-4.6.2~pre1/src/panel.h 2008-02-12 21:09:19.000000000 +0100
@@ -71,6 +71,19 @@
int searching;
@@ -934,9 +931,9 @@
void try_to_select (WPanel *panel, const char *name);
-diff -urN mc-4.6.1-orig/src/recode.c mc-4.6.1/src/recode.c
---- mc-4.6.1-orig/src/recode.c 1970-01-01 07:00:00.000000000 +0700
-+++ mc-4.6.1/src/recode.c 2005-07-31 02:39:42.000000000 +0700
+diff -Nurwd mc-4.6.2~pre1.orig/src/recode.c mc-4.6.2~pre1/src/recode.c
+--- mc-4.6.2~pre1.orig/src/recode.c 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/src/recode.c 2008-02-12 21:09:19.000000000 +0100
@@ -0,0 +1,153 @@
+#include "recode.h"
+#ifdef HAVE_CHARSET
@@ -1091,9 +1088,9 @@
+}
+
+#endif //HAVE_CHARSET
-diff -urN mc-4.6.1-orig/src/recode.h mc-4.6.1/src/recode.h
---- mc-4.6.1-orig/src/recode.h 1970-01-01 07:00:00.000000000 +0700
-+++ mc-4.6.1/src/recode.h 2005-07-31 02:39:13.000000000 +0700
+diff -Nurwd mc-4.6.2~pre1.orig/src/recode.h mc-4.6.2~pre1/src/recode.h
+--- mc-4.6.2~pre1.orig/src/recode.h 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/src/recode.h 2008-02-12 21:09:19.000000000 +0100
@@ -0,0 +1,48 @@
+#ifndef __RECODE_H__
+#define __RECODE_H__
@@ -1143,12 +1140,12 @@
+
+#endif // HAVE_CHARSET
+#endif //__RECODE_H__
-diff -urN mc-4.6.1-orig/src/screen.c mc-4.6.1/src/screen.c
---- mc-4.6.1-orig/src/screen.c 2006-06-13 00:21:48.000000000 +0700
-+++ mc-4.6.1/src/screen.c 2006-06-13 00:42:17.000000000 +0700
-@@ -48,6 +48,10 @@
- #define WANT_WIDGETS
+diff -Nurwd mc-4.6.2~pre1.orig/src/screen.c mc-4.6.2~pre1/src/screen.c
+--- mc-4.6.2~pre1.orig/src/screen.c 2008-02-12 21:08:39.000000000 +0100
++++ mc-4.6.2~pre1/src/screen.c 2008-02-12 21:39:30.000000000 +0100
+@@ -50,6 +50,10 @@
#include "main.h" /* the_menubar */
+ #include "unixcompat.h"
+#ifdef HAVE_CHARSET
+#include "recode.h"
@@ -1157,15 +1154,15 @@
#define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
#define J_LEFT 1
-@@ -170,6 +174,7 @@
+@@ -172,6 +176,7 @@
string_file_name (file_entry *fe, int len)
{
size_t i;
+ char* filename;
+
#ifdef UTF8
static char buffer [BUF_SMALL * 4];
- mbstate_t s;
-@@ -181,6 +186,13 @@
+@@ -184,6 +189,13 @@
static char buffer [BUF_SMALL];
#endif
@@ -1179,16 +1176,16 @@
#ifdef UTF8
if (SLsmg_Is_Unicode)
for (i = 0; i < sizeof (buffer) - 1; i++) {
-@@ -212,7 +224,7 @@
- for (i = 0; i < sizeof(buffer) - 1; i++) {
- char c;
+@@ -214,7 +226,7 @@
+ for (i = 0; i < sizeof(buffer) - 1; i++) {
+ char c;
-- c = fe->fname[i];
-+ c= filename[i];
+- c = fe->fname[i];
++ c = filename[i];
- if (!c)
- break;
-@@ -698,6 +710,10 @@
+ if (!c) break;
+
+@@ -721,6 +733,10 @@
int second_column = 0;
int width, offset;
@@ -1199,7 +1196,7 @@
offset = 0;
if (!isstatus && panel->split){
-@@ -737,7 +753,7 @@
+@@ -760,7 +776,7 @@
}
}
@@ -1208,7 +1205,7 @@
display_mini_info (WPanel *panel)
{
if (!show_mini_info)
-@@ -798,7 +814,7 @@
+@@ -830,7 +846,7 @@
return;
}
@@ -1217,7 +1214,7 @@
paint_dir (WPanel *panel)
{
int i;
-@@ -836,7 +852,7 @@
+@@ -868,7 +884,7 @@
#endif /* !HAVE_SLANG */
}
@@ -1226,23 +1223,23 @@
show_dir (WPanel *panel)
{
char *tmp;
-@@ -864,8 +880,15 @@
+@@ -897,8 +913,15 @@
tmp = g_malloc (panel->widget.cols + 1);
tmp[panel->widget.cols] = '\0';
+#ifdef HAVE_CHARSET
-+ my_translate_string(panel->cwd,strlen(panel->cwd),recode_buf, panel->tr_table);
-+ trim (strip_home_and_password (recode_buf), tmp,
-+ min (max (panel->widget.cols - 7, 0), panel->widget.cols) );
-+#else
++ my_translate_string(panel->cwd,strlen(panel->cwd),recode_buf, panel->tr_table);
++ trim (strip_home_and_password (recode_buf), tmp,
++ min (max (panel->widget.cols - 7, 0), panel->widget.cols) );
++ #else
trim (strip_home_and_password (panel->cwd), tmp,
- min (max (panel->widget.cols - 7, 0), panel->widget.cols) );
+ max (panel->widget.cols - 9, 0));
+#endif
+
addstr (tmp);
g_free (tmp);
- widget_move (&panel->widget, 0, 1);
-@@ -1077,6 +1100,17 @@
+
+@@ -1111,6 +1134,17 @@
mc_get_current_wd (panel->cwd, sizeof (panel->cwd) - 2);
strcpy (panel->lwd, ".");
@@ -1260,7 +1257,7 @@
panel->hist_name = g_strconcat ("Dir Hist ", panel_name, (char *) NULL);
panel->dir_history = history_get (panel->hist_name);
directory_history_add (panel, panel->cwd);
-@@ -2234,7 +2268,12 @@
+@@ -2311,7 +2345,12 @@
{ XCTRL('n'), move_down }, /* C-n like emacs */
{ XCTRL('s'), start_search }, /* C-s like emacs */
{ ALT('s'), start_search }, /* M-s not like emacs */
@@ -1271,11 +1268,11 @@
+ { XCTRL('t'), mark_file }, /* was 'fnc_c_cmd' */
+#endif
{ ALT('o'), chdir_other_panel },
+ { ALT('i'), sync_other_panel },
{ ALT('l'), chdir_to_readlink },
- { ALT('H'), directory_history_list },
-diff -urN mc-4.6.1-orig/src/screen.h mc-4.6.1/src/screen.h
---- mc-4.6.1-orig/src/screen.h 1970-01-01 07:00:00.000000000 +0700
-+++ mc-4.6.1/src/screen.h 2005-07-31 00:26:59.000000000 +0700
+diff -Nurwd mc-4.6.2~pre1.orig/src/screen.h mc-4.6.2~pre1/src/screen.h
+--- mc-4.6.2~pre1.orig/src/screen.h 1970-01-01 00:00:00.000000000 +0000
++++ mc-4.6.2~pre1/src/screen.h 2008-02-12 21:09:19.000000000 +0100
@@ -0,0 +1,11 @@
+#ifndef __SCREEN_H__
+#define __SCREEN_H__
@@ -1288,10 +1285,10 @@
+extern void show_dir(WPanel *panel);
+#endif //__SCREEN_H__
+
-diff -urN mc-4.6.1-orig/src/selcodepage.c mc-4.6.1/src/selcodepage.c
---- mc-4.6.1-orig/src/selcodepage.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/src/selcodepage.c 2005-07-31 00:31:43.000000000 +0700
-@@ -44,14 +44,16 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.c mc-4.6.2~pre1/src/selcodepage.c
+--- mc-4.6.2~pre1.orig/src/selcodepage.c 2005-05-27 05:35:15.000000000 +0200
++++ mc-4.6.2~pre1/src/selcodepage.c 2008-02-12 21:09:19.000000000 +0100
+@@ -45,14 +45,16 @@
}
int
@@ -1310,7 +1307,7 @@
"[Codepages Translation]");
if (!seldisplay)
-@@ -81,20 +83,26 @@
+@@ -82,20 +84,26 @@
i = run_listbox (listbox);
@@ -1341,25 +1338,25 @@
errmsg =
init_translation_table (source_codepage, display_codepage);
if (errmsg) {
-diff -urN mc-4.6.1-orig/src/selcodepage.h mc-4.6.1/src/selcodepage.h
---- mc-4.6.1-orig/src/selcodepage.h 2002-10-31 05:16:16.000000000 +0600
-+++ mc-4.6.1/src/selcodepage.h 2005-07-31 00:31:33.000000000 +0700
+diff -Nurwd mc-4.6.2~pre1.orig/src/selcodepage.h mc-4.6.2~pre1/src/selcodepage.h
+--- mc-4.6.2~pre1.orig/src/selcodepage.h 2005-06-14 15:14:49.000000000 +0200
++++ mc-4.6.2~pre1/src/selcodepage.h 2008-02-12 21:40:21.000000000 +0100
@@ -2,8 +2,8 @@
- #ifndef __SELCODEPAGE_H__
- #define __SELCODEPAGE_H__
+ #define MC_SELCODEPAGE_H
+ #ifdef HAVE_CHARSET
-int select_charset (int current_charset, int seldisplay);
-int do_select_codepage (void);
+int select_charset (int current_charset, int seldisplay, const char *title);
+int do_select_codepage (const char *title);
-
- #endif /* __SELCODEPAGE_H__ */
#endif /* HAVE_CHARSET */
-diff -urN mc-4.6.1-orig/src/setup.c mc-4.6.1/src/setup.c
---- mc-4.6.1-orig/src/setup.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/src/setup.c 2005-07-31 00:36:33.000000000 +0700
-@@ -47,6 +47,8 @@
+ #endif
+diff -Nurwd mc-4.6.2~pre1.orig/src/setup.c mc-4.6.2~pre1/src/setup.c
+--- mc-4.6.2~pre1.orig/src/setup.c 2006-02-23 16:32:18.000000000 +0100
++++ mc-4.6.2~pre1/src/setup.c 2008-02-12 21:09:19.000000000 +0100
+@@ -48,6 +48,8 @@
+
#ifdef HAVE_CHARSET
#include "charsets.h"
+#include"recode.h"
@@ -1367,7 +1364,7 @@
#endif
#ifdef USE_NETCODE
-@@ -255,6 +257,11 @@
+@@ -269,6 +271,11 @@
g_snprintf (buffer, sizeof (buffer), "%d", panel->user_mini_status);
save_string (section, "user_mini_status", buffer,
profile_name);
@@ -1379,7 +1376,7 @@
}
void
-@@ -352,6 +359,7 @@
+@@ -371,6 +378,7 @@
#ifdef HAVE_CHARSET
save_string( "Misc", "display_codepage",
get_codepage_id( display_codepage ), profile_name );
@@ -1387,7 +1384,7 @@
#endif /* HAVE_CHARSET */
g_free (profile);
-@@ -401,6 +409,31 @@
+@@ -420,6 +428,31 @@
panel->user_mini_status =
load_int (section, "user_mini_status", 0);
@@ -1419,18 +1416,14 @@
}
static void
-@@ -543,12 +576,18 @@
- #endif /* USE_VFS && USE_NETCODE */
-
+@@ -569,10 +602,16 @@
#ifdef HAVE_CHARSET
-- if ( load_codepages_list() > 0 ) {
-- char cpname[128];
+ if ( load_codepages_list() > 0 ) {
+ char cpname[128];
- load_string( "Misc", "display_codepage", "",
- cpname, sizeof(cpname) );
- if ( cpname[0] != '\0' )
- display_codepage = get_codepage_index( cpname );
-+ if(load_codepages_list() > 0) {
-+ char cpname[128];
+ get_locale_codepage();
+ load_string("Misc", "display_codepage", "", cpname, sizeof(cpname));
+ if(cpname[0] != '\0') display_codepage=get_codepage_index(cpname);
@@ -1444,22 +1437,22 @@
}
init_translation_table( source_codepage, display_codepage );
-diff -urN mc-4.6.1-orig/src/view.c mc-4.6.1/src/view.c
---- mc-4.6.1-orig/src/view.c 2005-05-27 21:19:18.000000000 +0700
-+++ mc-4.6.1/src/view.c 2005-07-31 00:37:29.000000000 +0700
-@@ -2534,7 +2534,7 @@
+diff -Nurwd mc-4.6.2~pre1.orig/src/view.c mc-4.6.2~pre1/src/view.c
+--- mc-4.6.2~pre1.orig/src/view.c 2008-02-12 21:08:39.000000000 +0100
++++ mc-4.6.2~pre1/src/view.c 2008-02-12 21:09:19.000000000 +0100
+@@ -3232,7 +3232,7 @@
#ifdef HAVE_CHARSET
case XCTRL ('t'):
- do_select_codepage ();
+ do_select_codepage (_(" Choose codepage "));
view->dirty++;
- view_update (view, TRUE);
+ view_update (view);
return MSG_HANDLED;
-diff -urN mc-4.6.1-orig/vfs/vfs.c mc-4.6.1/vfs/vfs.c
---- mc-4.6.1-orig/vfs/vfs.c 2005-05-27 21:19:19.000000000 +0700
-+++ mc-4.6.1/vfs/vfs.c 2005-07-31 00:42:45.000000000 +0700
-@@ -49,6 +49,11 @@
+diff -Nurwd mc-4.6.2~pre1.orig/vfs/vfs.c mc-4.6.2~pre1/vfs/vfs.c
+--- mc-4.6.2~pre1.orig/vfs/vfs.c 2008-02-12 21:08:39.000000000 +0100
++++ mc-4.6.2~pre1/vfs/vfs.c 2008-02-12 21:09:19.000000000 +0100
+@@ -53,6 +53,11 @@
#include "smbfs.h"
#include "local.h"
@@ -1471,7 +1464,7 @@
/* They keep track of the current directory */
static struct vfs_class *current_vfs;
static char *current_dir;
-@@ -681,8 +686,66 @@
+@@ -685,8 +690,66 @@
vfsid old_vfsid;
int result;
@@ -1538,7 +1531,7 @@
if (!new_vfs->chdir) {
g_free (new_dir);
return -1;
-@@ -696,9 +759,6 @@
+@@ -700,9 +763,6 @@
return -1;
}
More information about the Pkg-mc-commits
mailing list