nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-10 07:38:06 -05:00
Code Issues Projects Releases Wiki Activity

Merge tag '0.78', for real this time.

Browse Source 
Oops. The previous merge came from a version of the release tag we
ended up not using. This one reflects what really went into the
release.
This commit is contained in:
Simon Tatham 2022-10-29 10:50:38 +01:00
commit 2916f92467
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Buildscr
View File

@ -35,7 +35,7 @@ module putty
ifeq "$(RELEASE)" "" set Ndate $(!builddate)
ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -pe 's/(....)(..)(..)/$$1-$$2-$$3/' > date
ifneq "$(Ndate)" "" read Date date
set Epoch 18288 # update this at every release
set Epoch 18293 # update this at every release
ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -ne 'use Time::Local; /(....)(..)(..)/ and print timegm(0,0,0,$$3,$$2-1,$$1) / 86400 - $(Epoch)' > days
ifneq "$(Ndate)" "" read Days days

5
unix/dialog.c
View File

@ -2141,7 +2141,10 @@ GtkWidget *layout_ctrls(
case CTRL_FONTSELECT: {
GtkWidget *ww;
if (!ctrl->fileselect.just_button) {
bool just_button = (ctrl->type == CTRL_FILESELECT &&
ctrl->fileselect.just_button);
if (!just_button) {
const char *browsebtn =
(ctrl->type == CTRL_FILESELECT ?
"Browse..." : "Change...");