Ticket #1584: gentoo-bug-282556.patch

File gentoo-bug-282556.patch, 2.2 KB (added by rt, 15 years ago)

Proposed patch

  • boxes.c

    diff -ruN src.jj/boxes.c src/boxes.c
    old new  
    572572 
    573573    (void) action; 
    574574 
    575     new_dcp = select_charset (0, 0, new_display_codepage, TRUE); 
     575    new_dcp = select_charset (new_display_codepage, TRUE); 
    576576 
    577577    if (new_dcp != SELECT_CHARSET_CANCEL) { 
    578578        const char *cpname; 
  • screen.c

    diff -ruN src.jj/screen.c src/screen.c
    old new  
    27032703#ifdef HAVE_CHARSET 
    27042704    const char *errmsg; 
    27052705    int r; 
    2706     int width = (panel->widget.x)? panel->widget.cols : panel->widget.cols * (-1); 
    27072706 
    2708     r = select_charset (width, 0, source_codepage, FALSE); 
     2707    r = select_charset (source_codepage, FALSE); 
    27092708 
    27102709    if (r == SELECT_CHARSET_CANCEL) 
    27112710        return; /* Cancel */ 
  • selcodepage.c

    diff -ruN src.jj/selcodepage.c src/selcodepage.c
    old new  
    5555 *   >= 0                             : charset number 
    5656 */ 
    5757int 
    58 select_charset (int delta_x, int delta_y, int current_charset, gboolean seldisplay) 
     58select_charset (int current_charset, gboolean seldisplay) 
    5959{ 
    6060    int i; 
    6161    char buffer[255]; 
    6262 
    6363    /* Create listbox */ 
    64     Listbox *listbox = create_listbox_window_delta (delta_x, delta_y, 
     64    Listbox *listbox = create_listbox_window_delta (0, 0, 
    6565                                              ENTRY_LEN + 2, n_codepages + 1, 
    6666                                              _("Choose codepage"), 
    6767                                              "[Codepages Translation]"); 
     
    114114    const char *errmsg = NULL; 
    115115    int r; 
    116116 
    117     r = select_charset (0, 0, source_codepage, FALSE); 
     117    r = select_charset (source_codepage, FALSE); 
    118118    if (r == SELECT_CHARSET_CANCEL) 
    119119        return FALSE; 
    120120 
  • selcodepage.h

    diff -ruN src.jj/selcodepage.h src/selcodepage.h
    old new  
    1010 
    1111#include "global.h" 
    1212 
    13 int select_charset (int delta_x, int delta_y, int current_charset, gboolean seldisplay); 
     13int select_charset (int current_charset, gboolean seldisplay); 
    1414gboolean do_select_codepage (void); 
    1515 
    1616/* some results of select_charset() */