New function ltime() returns a struct tm of the current local time.

[u/mdw/putty] / unix / gtkdlg.c

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 6b5659c..c774c8b 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -1945,7 +1945,8 @@ int get_listitemheight(void)
     return req.height;
 }
 
-int do_config_box(const char *title, Config *cfg, int midsession)
+int do_config_box(const char *title, Config *cfg, int midsession,
+                 int protcfginfo)
 {
     GtkWidget *window, *hbox, *vbox, *cols, *label,
        *tree, *treescroll, *panels, *panelvbox;
@@ -1974,7 +1975,7 @@ int do_config_box(const char *title, Config *cfg, int midsession)
     window = gtk_dialog_new();
 
     ctrlbox = ctrl_new_box();
-    setup_config_box(ctrlbox, &sl, midsession, cfg->protocol);
+    setup_config_box(ctrlbox, &sl, midsession, cfg->protocol, protcfginfo);
     unix_setup_config_box(ctrlbox, midsession, window);
 
     gtk_window_set_title(GTK_WINDOW(window), title);
@@ -2418,7 +2419,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 "
@@ -2498,7 +2499,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);
@@ -2727,16 +2728,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);