Patch from Robert de Bath to substantially simplify timing.c.

[u/mdw/putty] / unix / gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 334decb..616a69a 100644 (file)
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -2725,6 +2725,24 @@ void uxsel_input_remove(int id) {
     gdk_input_remove(id);
 }
 
+int frontend_net_pending_error_idle_id;
+int frontend_got_net_pending_errors = FALSE;
+gboolean frontend_net_pending_errors(gpointer data)
+{
+    net_pending_errors();
+    gtk_idle_remove(frontend_net_pending_error_idle_id);
+    frontend_got_net_pending_errors = FALSE;
+    return FALSE;
+}
+void frontend_net_error_pending(void)
+{
+    if (!frontend_got_net_pending_errors) {
+        frontend_got_net_pending_errors = TRUE;
+        frontend_net_pending_error_idle_id =
+            gtk_idle_add(frontend_net_pending_errors, NULL);
+    }
+}
+
 void setup_fonts_ucs(struct gui_data *inst)
 {
     int shadowbold = conf_get_int(inst->conf, CONF_shadowbold);
@@ -2971,6 +2989,8 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
                   conf_get_fontspec(newconf, CONF_wideboldfont)->name) ||
            strcmp(conf_get_str(oldconf, CONF_line_codepage),
                   conf_get_str(newconf, CONF_line_codepage)) ||
+           conf_get_int(oldconf, CONF_utf8_override) !=
+           conf_get_int(newconf, CONF_utf8_override) ||
            conf_get_int(oldconf, CONF_vtmode) !=
            conf_get_int(newconf, CONF_vtmode) ||
            conf_get_int(oldconf, CONF_shadowbold) !=