--- np2/x11/gtk/Attic/dialog_newdisk.c	2003/11/16 16:43:45	1.1
+++ np2/x11/gtk/Attic/dialog_newdisk.c	2003/12/11 15:11:56	1.4
@@ -28,7 +28,7 @@
 #include "compiler.h"
 
 #include "gtk/xnp2.h"
-#include "gtk/gtkmenu.h"
+#include "gtk/gtk_menu.h"
 
 #include "np2.h"
 #include "dosio.h"
@@ -134,21 +134,21 @@ newdisk_fd(newdisk_fd_t *datap)
 	gtk_table_set_col_spacings(GTK_TABLE(dialog_table), 5);
 	gtk_widget_show(dialog_table);
 
-	/* "Disk name" label */
-	label = gtk_label_new(" Disk name");
+	/* "Disk Label" label */
+	label = gtk_label_new(" Disk Label");
 	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(dialog_table), label, 0, 1, 0, 1);
 	gtk_widget_show(label);
 
-	/* "Disk name" text entry */
+	/* "Disk Label" text entry */
 	datap->diskname_entry = entry = gtk_entry_new();
 	gtk_entry_set_max_length(GTK_ENTRY(entry), DISKNAME_LEN);
 	gtk_entry_set_editable(GTK_ENTRY(entry), TRUE);
 	gtk_table_attach_defaults(GTK_TABLE(dialog_table), entry, 1, 2, 0, 1);
 	gtk_widget_show(entry);
 
-	/* "Disk type" label */
-	label = gtk_label_new(" Disk type");
+	/* "Disk Type" label */
+	label = gtk_label_new(" Disk Type");
 	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(dialog_table), label, 0, 1, 1, 2);
 	gtk_widget_show(label);
@@ -271,13 +271,13 @@ newdisk_hd(newdisk_hd_t *datap)
 	gtk_container_add(GTK_CONTAINER(dialog), dialog_table);
 	gtk_widget_show(dialog_table);
 
-	/* "HDD size" label */
-	label = gtk_label_new(" HDD size");
+	/* "HDD Size" label */
+	label = gtk_label_new(" HDD Size");
 	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(dialog_table), label, 0, 1, 0, 1);
 	gtk_widget_show(label);
 
-	/* HDD size */
+	/* HDD Size */
 	hbox = gtk_hbox_new(FALSE, 2);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
 	gtk_table_attach_defaults(GTK_TABLE(dialog_table), hbox, 1, 2, 0, 1);
@@ -349,11 +349,24 @@ typedef union {
 } newdisk_t;
 
 void
+setext(char *path, const char *ext, int maxlen)
+{
+	size_t len;
+
+	len = strlen(path);
+	if (len > 0) {
+		if (path[len - 1] != '.') {
+			milstr_ncat(path, ".", maxlen);
+		}
+	}
+	milstr_ncat(path, ext, maxlen);
+}
+
+void
 create_newdisk_dialog(const char *filebasename, const char *fileextname)
 {
 	newdisk_t *disk;
 	char *extName;
-	size_t len;
 
 	disk = _MALLOC(sizeof(*disk), "newdisk work");
 	if (disk == NULL) {
@@ -368,24 +381,14 @@ create_newdisk_dialog(const char *fileba
 	if (milstr_extendcmp(fileextname, "thd") == 0) {
 		if ((milstr_extendcmp(extName, disk->com.filename) == 0) ||
 		    (milstr_extendcmp(extName, "thd") != 0)) {
-			len = strlen(disk->com.filename);
-			if (disk->com.filename[len - 1] != '.')
-				milstr_ncat(disk->com.filename, ".",
-				    sizeof(disk->com.filename));
-			milstr_ncat(disk->com.filename, fileextname,
-			    sizeof(disk->com.filename));
+			setext(disk->com.filename, fileextname, sizeof(disk->com.filename));
 		}
 		newdisk_hd(&disk->hd);
 	} else if ((milstr_extendcmp(fileextname, "d88") == 0) ||
 	           (milstr_extendcmp(fileextname, "88d") == 0)) {
 		if ((milstr_extendcmp(extName, disk->com.filename) == 0) ||
 		    ((milstr_extendcmp(extName, "d88") != 0) && (milstr_extendcmp(extName, "88d") != 0))) {
-			len = strlen(disk->com.filename);
-			if (disk->com.filename[len - 1] != '.')
-				milstr_ncat(disk->com.filename, ".",
-				    sizeof(disk->com.filename));
-			milstr_ncat(disk->com.filename, fileextname,
-			    sizeof(disk->com.filename));
+			setext(disk->com.filename, fileextname, sizeof(disk->com.filename));
 		}
 		newdisk_fd(&disk->fd);
 	}