X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/f89c329410c18fe1f09d843747fad77babb9f89c..755e0524eb217ebed9f649405fa2624b26f0fb29:/unix/gtkdlg.c?ds=sidebyside

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 0ea6615f..2a293804 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -1976,7 +1976,8 @@ int do_config_box(const char *title, Config *cfg, int midsession,
 
     ctrlbox = ctrl_new_box();
     setup_config_box(ctrlbox, &sl, midsession, cfg->protocol, protcfginfo);
-    unix_setup_config_box(ctrlbox, midsession, window);
+    unix_setup_config_box(ctrlbox, midsession);
+    gtk_setup_config_box(ctrlbox, midsession, window);
 
     gtk_window_set_title(GTK_WINDOW(window), title);
     hbox = gtk_hbox_new(FALSE, 4);
@@ -2419,7 +2420,7 @@ static void licence_clicked(GtkButton *button, gpointer data)
     char *title;
 
     char *licence =
-	"Copyright 1997-2004 Simon Tatham.\n\n"
+	"Copyright 1997-2005 Simon Tatham.\n\n"
 
 	"Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
 	"Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
@@ -2499,7 +2500,7 @@ void about_box(void *window)
 		       w, FALSE, FALSE, 5);
     gtk_widget_show(w);
 
-    w = gtk_label_new("Copyright 1997-2004 Simon Tatham. All rights reserved");
+    w = gtk_label_new("Copyright 1997-2005 Simon Tatham. All rights reserved");
     gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
 		       w, FALSE, FALSE, 5);
     gtk_widget_show(w);
@@ -2728,16 +2729,15 @@ void logevent_dlg(void *estuff, const char *string)
     struct eventlog_stuff *es = (struct eventlog_stuff *)estuff;
 
     char timebuf[40];
-    time_t t;
+    struct tm tm;
 
     if (es->nevents >= es->negsize) {
 	es->negsize += 64;
 	es->events = sresize(es->events, es->negsize, char *);
     }
 
-    time(&t);
-    strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t",
-	     localtime(&t));
+    tm=ltime();
+    strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t", &tm);
 
     es->events[es->nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
     strcpy(es->events[es->nevents], timebuf);