In pursuance of `icon-title-default-change':

Change the sense of cfg.win_name_always' representation in the UI (from
`Avoid ever using icon title' to `Separate window and icon titles').
Also update the docs to match reality.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2681 cda61777-01e9-0310-a592-d414129be87e

diff --git a/doc/config.but b/doc/config.but
index b45399a..51714ec 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -1,4 +1,4 @@
-\versionid $Id: config.but,v 1.50 2003/01/16 15:43:18 jacob Exp $
+\versionid $Id: config.but,v 1.51 2003/01/23 11:37:54 jacob Exp $
 
 \C{config} Configuring PuTTY
 
@@ -898,14 +898,16 @@ modify the title of the window in mid-session. There is also an
 This makes sense in a windowing system where the window becomes an
 icon when minimised, such as Windows 3.1 or most X Window System
 setups; but in the Windows 95-like user interface it isn't as
-applicable. By default PuTTY's window title and Taskbar caption will
+applicable.
+
+By default, PuTTY only uses the server-supplied \e{window} title, and
+ignores the icon title entirely. If for some reason you want to see
+both titles, check the box marked \q{Separate window and icon titles}.
+If you do this, PuTTY's window title and Taskbar caption will
 change into the server-supplied icon title if you minimise the PuTTY
 window, and change back to the server-supplied window title if you
 restore it. (If the server has not bothered to supply a window or
-icon title, none of this will happen.) By checking the box marked
-\q{Avoid ever using icon title}, you can arrange that PuTTY will
-always display the window title, and completely ignore any icon
-titles the server sends it.
+icon title, none of this will happen.)
 
 \S{config-mouseptr} \q{Hide mouse pointer when typing in window}
 

diff --git a/windlg.c b/windlg.c
index bda5e11..bf98129 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -1176,7 +1176,7 @@ static void init_dlg_ctrls(HWND hwnd, int keepsess)
     CheckDlgButton(hwnd, IDC_BLINKTEXT, cfg.blinktext);
 
     SetDlgItemText(hwnd, IDC_WINEDIT, cfg.wintitle);
-    CheckDlgButton(hwnd, IDC_WINNAME, cfg.win_name_always);
+    CheckDlgButton(hwnd, IDC_WINNAME, !cfg.win_name_always);
     CheckDlgButton(hwnd, IDC_HIDEMOUSE, cfg.hide_mouseptr);
     CheckDlgButton(hwnd, IDC_SUNKENEDGE, cfg.sunken_edge);
     SetDlgItemInt(hwnd, IDC_WINBEDIT, cfg.window_border, FALSE);
@@ -1720,7 +1720,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
                 IDC_BOX_APPEARANCE3);
        multiedit(&cp,
                  "Window &title:", IDC_WINTITLE, IDC_WINEDIT, 100, NULL);
-       checkbox(&cp, "Avoid ever using &icon title", IDC_WINNAME);
+       checkbox(&cp, "Separate window and &icon titles", IDC_WINNAME);
        endbox(&cp);
        beginbox(&cp, "Adjust the use of the mouse pointer",
                 IDC_BOX_APPEARANCE4);
@@ -2910,7 +2910,7 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
                if (HIWORD(wParam) == BN_CLICKED ||
                    HIWORD(wParam) == BN_DOUBLECLICKED)
                        cfg.win_name_always =
-                       IsDlgButtonChecked(hwnd, IDC_WINNAME);
+                       !IsDlgButtonChecked(hwnd, IDC_WINNAME);
                break;
              case IDC_HIDEMOUSE:
                if (HIWORD(wParam) == BN_CLICKED ||