X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/b4c61ce2c6c9c8e1cf02260ac993676013c12c73..fb9bf82f3a8a2a0b767639044234764460a0cca7:/unix/gtkdlg.c

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index a961ba50..a9383e75 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -489,6 +489,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));
@@ -1967,7 +1969,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);
@@ -2718,7 +2720,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;