Project

General

Profile

Bug #2176 » 0066-gtk-Drop-unused-timer_id.patch

main - Marko Lindqvist, 09/04/2026 07:05 PM

View differences:

client/gui-gtk-3.22/gui_main.c
GtkTextBuffer *message_buffer = NULL;
static GtkWidget *allied_chat_toggle_button;
static gint timer_id; /* ditto */
static GIOChannel *srv_channel;
static guint srv_id;
gint cur_x, cur_y;
......
}
}
timer_id = g_timeout_add(seconds * 1000, timer_callback, NULL);
g_timeout_add(seconds * 1000, timer_callback, NULL);
return FALSE;
}
......
set_client_state(C_S_DISCONNECTED);
/* Assumes client_state is set */
timer_id = g_timeout_add(TIMER_INTERVAL, timer_callback, NULL);
g_timeout_add(TIMER_INTERVAL, timer_callback, NULL);
gui_up = TRUE;
gtk_main();
client/gui-gtk-4.0/gui_main.c
GtkTextBuffer *message_buffer = NULL;
static GtkWidget *allied_chat_toggle_button;
static gint timer_id; /* Ditto */
static GIOChannel *srv_channel;
static guint srv_id;
gint cur_x, cur_y;
......
}
}
timer_id = g_timeout_add(seconds * 1000, timer_callback, NULL);
g_timeout_add(seconds * 1000, timer_callback, NULL);
return FALSE;
}
......
set_client_state(C_S_DISCONNECTED);
/* Assumes client_state is set */
timer_id = g_timeout_add(TIMER_INTERVAL, timer_callback, NULL);
g_timeout_add(TIMER_INTERVAL, timer_callback, NULL);
}
/**********************************************************************//**
client/gui-gtk-5.0/gui_main.c
GtkTextBuffer *message_buffer = NULL;
static GtkWidget *allied_chat_toggle_button;
static gint timer_id; /* Ditto */
static GIOChannel *srv_channel;
static guint srv_id;
gint cur_x, cur_y;
......
}
}
timer_id = g_timeout_add(seconds * 1000, timer_callback, NULL);
g_timeout_add(seconds * 1000, timer_callback, NULL);
return FALSE;
}
......
set_client_state(C_S_DISCONNECTED);
/* Assumes client_state is set */
timer_id = g_timeout_add(TIMER_INTERVAL, timer_callback, NULL);
g_timeout_add(TIMER_INTERVAL, timer_callback, NULL);
}
/**********************************************************************//**
(1-1/2)