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

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index a961ba50..ea39c5ed 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -374,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) {
@@ -436,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
@@ -448,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;
@@ -470,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. */
@@ -489,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));
@@ -1967,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);
@@ -2718,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;