X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/abb6895f8e13fb0fda3b6567a2b36b590ea7bfda..ad58c9bc9403a7bdbbdb420ac1ae70db0b4a66c8:/unix/gtkdlg.c

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 000fe04a..460fe888 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -307,15 +307,18 @@ void dlg_listbox_clear(union control *ctrl, void *dlg)
 {
     struct dlgparam *dp = (struct dlgparam *)dlg;
     struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
-    GtkContainer *cont;
 
     assert(uc->ctrl->generic.type == CTRL_EDITBOX ||
 	   uc->ctrl->generic.type == CTRL_LISTBOX);
     assert(uc->menu != NULL || uc->list != NULL);
 
-    cont = (uc->menu ? GTK_CONTAINER(uc->menu) : GTK_CONTAINER(uc->list));
-
-    gtk_container_foreach(cont, container_remove_and_destroy, cont);
+    if (uc->menu) {
+	gtk_container_foreach(GTK_CONTAINER(uc->menu),
+			      container_remove_and_destroy,
+			      GTK_CONTAINER(uc->menu));
+    } else {
+	gtk_list_clear_items(GTK_LIST(uc->list), 0, -1);
+    }
 }
 
 void dlg_listbox_del(union control *ctrl, void *dlg, int index)
@@ -371,7 +374,8 @@ void dlg_listbox_addwithid(union control *ctrl, void *dlg,
 	gtk_container_add(GTK_CONTAINER(uc->menu), menuitem);
 	gtk_widget_show(menuitem);
 
-	gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", (gpointer)id);
+	gtk_object_set_data(GTK_OBJECT(menuitem), "user-data",
+			    GINT_TO_POINTER(id));
 	gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 			   GTK_SIGNAL_FUNC(menuitem_activate), dp);
     } else if (!uc->entry) {
@@ -433,7 +437,8 @@ void dlg_listbox_addwithid(union control *ctrl, void *dlg,
                            GTK_SIGNAL_FUNC(widget_focus), dp);
 	gtk_signal_connect(GTK_OBJECT(listitem), "button_press_event",
 			   GTK_SIGNAL_FUNC(listitem_button), dp);
-	gtk_object_set_data(GTK_OBJECT(listitem), "user-data", (gpointer)id);
+	gtk_object_set_data(GTK_OBJECT(listitem), "user-data",
+			    GINT_TO_POINTER(id));
     } else {
 	/*
 	 * List item in a combo-box list, which means the sensible
@@ -445,7 +450,8 @@ void dlg_listbox_addwithid(union control *ctrl, void *dlg,
 	gtk_container_add(GTK_CONTAINER(uc->list), listitem);
 	gtk_widget_show(listitem);
 
-	gtk_object_set_data(GTK_OBJECT(listitem), "user-data", (gpointer)id);
+	gtk_object_set_data(GTK_OBJECT(listitem), "user-data",
+			    GINT_TO_POINTER(id));
     }
 
     dp->flags &= ~FLAG_UPDATING_COMBO_LIST;
@@ -467,7 +473,7 @@ int dlg_listbox_getid(union control *ctrl, void *dlg, int index)
     item = GTK_OBJECT(g_list_nth_data(children, index));
     g_list_free(children);
 
-    return (int)gtk_object_get_data(GTK_OBJECT(item), "user-data");
+    return GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item), "user-data"));
 }
 
 /* dlg_listbox_index returns <0 if no single element is selected. */
@@ -486,6 +492,8 @@ int dlg_listbox_index(union control *ctrl, void *dlg)
 
     if (uc->menu)
 	activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
+    else
+	activeitem = NULL;	       /* unnecessarily placate gcc */
 
     children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
 						    uc->list));
@@ -1964,7 +1972,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, 0);
+    setup_config_box(ctrlbox, &sl, midsession, cfg->protocol);
     unix_setup_config_box(ctrlbox, midsession, window);
 
     gtk_window_set_title(GTK_WINDOW(window), title);
@@ -2288,7 +2296,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     static const char absenttxt[] =
 	"The server's host key is not cached. You have no guarantee "
 	"that the server is the computer you think it is.\n"
-	"The server's key fingerprint is:\n"
+	"The server's %s key fingerprint is:\n"
 	"%s\n"
 	"If you trust this host, press \"Accept\" to add the key to "
 	"PuTTY's cache and carry on connecting.\n"
@@ -2302,7 +2310,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 	"cached. This means that either the server administrator "
 	"has changed the host key, or you have actually connected "
 	"to another computer pretending to be the server.\n"
-	"The new key fingerprint is:\n"
+	"The new %s key fingerprint is:\n"
 	"%s\n"
 	"If you were expecting this change and trust the new key, "
 	"press \"Accept\" to update PuTTY's cache and continue connecting.\n"
@@ -2322,7 +2330,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     if (ret == 0)		       /* success - key matched OK */
 	return;
 
-    text = dupprintf((ret == 2 ? wrongtxt : absenttxt), fingerprint);
+    text = dupprintf((ret == 2 ? wrongtxt : absenttxt), keytype, fingerprint);
 
     ret = messagebox(GTK_WIDGET(get_window(frontend)),
 		     "PuTTY Security Alert", text,
@@ -2715,7 +2723,7 @@ void *eventlogstuff_new(void)
     return es;
 }
 
-void logevent_dlg(void *estuff, char *string)
+void logevent_dlg(void *estuff, const char *string)
 {
     struct eventlog_stuff *es = (struct eventlog_stuff *)estuff;
 
@@ -2739,3 +2747,31 @@ void logevent_dlg(void *estuff, char *string)
     }
     es->nevents++;
 }
+
+int askappend(void *frontend, Filename filename)
+{
+    static const char msgtemplate[] =
+	"The session log file \"%.*s\" already exists. "
+	"You can overwrite it with a new session log, "
+	"append your session log to the end of it, "
+	"or disable session logging for this session.";
+    char *message;
+    char *mbtitle;
+    int mbret;
+
+    message = dupprintf(msgtemplate, FILENAME_MAX, filename.path);
+    mbtitle = dupprintf("%s Log to File", appname);
+
+    mbret = messagebox(get_window(frontend), mbtitle, message,
+		       string_width("LINE OF TEXT SUITABLE FOR THE"
+				    " ASKAPPEND WIDTH"),
+		       "Overwrite", 'o', 1, 2,
+		       "Append", 'a', 0, 1,
+		       "Disable", 'd', -1, 0,
+		       NULL);
+
+    sfree(message);
+    sfree(mbtitle);
+
+    return mbret;
+}