X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ae62eaeb01088430162fa96e8cca35f721ff376d..962468d4b96c33869e9131eb42a0c784591f5884:/unix/gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 996e424d..334decb6 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -159,14 +159,12 @@ FontSpec *platform_default_fontspec(const char *name)
         return fontspec_new("");
 }
 
-Filename platform_default_filename(const char *name)
+Filename *platform_default_filename(const char *name)
 {
-    Filename ret;
     if (!strcmp(name, "LogFileName"))
-	strcpy(ret.path, "putty.log");
+	return filename_from_str("putty.log");
     else
-	*ret.path = '\0';
-    return ret;
+	return filename_from_str("");
 }
 
 char *platform_default_s(const char *name)
@@ -2551,7 +2549,7 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
             fs = fontspec_new(val);
-	    conf_set_fontspec(conf, CONF_font, fs);
+	    conf_set_fontspec(conf, CONF_boldfont, fs);
             fontspec_free(fs);
 
 	} else if (!strcmp(p, "-fw")) {
@@ -2559,7 +2557,7 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
             fs = fontspec_new(val);
-	    conf_set_fontspec(conf, CONF_font, fs);
+	    conf_set_fontspec(conf, CONF_widefont, fs);
             fontspec_free(fs);
 
 	} else if (!strcmp(p, "-fwb")) {
@@ -2567,7 +2565,7 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
             fs = fontspec_new(val);
-	    conf_set_fontspec(conf, CONF_font, fs);
+	    conf_set_fontspec(conf, CONF_wideboldfont, fs);
             fontspec_free(fs);
 
 	} else if (!strcmp(p, "-cs")) {
@@ -2648,13 +2646,13 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
 	    conf_set_str(conf, CONF_wintitle, val);
 
 	} else if (!strcmp(p, "-log")) {
-	    Filename fn;
+	    Filename *fn;
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(fn.path, val, sizeof(fn.path));
-	    fn.path[sizeof(fn.path)-1] = '\0';
-	    conf_set_filename(conf, CONF_logfilename, &fn);
+            fn = filename_from_str(val);
+	    conf_set_filename(conf, CONF_logfilename, fn);
 	    conf_set_int(conf, CONF_logtype, LGTYP_DEBUG);
+            filename_free(fn);
 
 	} else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
 	    SECOND_PASS_ONLY;