From 469156003765c476deacd624e264a06c3f3fd0fc Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 4 Sep 2026 19:02:58 +0300 Subject: [PATCH 66/66] gtk: Drop unused timer_id See RM #2176 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/gui_main.c | 5 ++--- client/gui-gtk-4.0/gui_main.c | 5 ++--- client/gui-gtk-5.0/gui_main.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/client/gui-gtk-3.22/gui_main.c b/client/gui-gtk-3.22/gui_main.c index f3aed82439..47ab66505e 100644 --- a/client/gui-gtk-3.22/gui_main.c +++ b/client/gui-gtk-3.22/gui_main.c @@ -178,7 +178,6 @@ GtkTextView *main_message_area; 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; @@ -253,7 +252,7 @@ static gboolean timer_callback(gpointer data) } } - timer_id = g_timeout_add(seconds * 1000, timer_callback, NULL); + g_timeout_add(seconds * 1000, timer_callback, NULL); return FALSE; } @@ -1989,7 +1988,7 @@ int ui_main(int argc, char **argv) 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(); diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 18e3ddc0f7..0913e68d22 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -170,7 +170,6 @@ GtkTextView *main_message_area; 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; @@ -257,7 +256,7 @@ static gboolean timer_callback(gpointer data) } } - timer_id = g_timeout_add(seconds * 1000, timer_callback, NULL); + g_timeout_add(seconds * 1000, timer_callback, NULL); return FALSE; } @@ -2037,7 +2036,7 @@ static void activate_gui(GtkApplication *app, gpointer data) 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); } /**********************************************************************//** diff --git a/client/gui-gtk-5.0/gui_main.c b/client/gui-gtk-5.0/gui_main.c index a1f38ba751..67c77e744f 100644 --- a/client/gui-gtk-5.0/gui_main.c +++ b/client/gui-gtk-5.0/gui_main.c @@ -170,7 +170,6 @@ GtkTextView *main_message_area; 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; @@ -258,7 +257,7 @@ static gboolean timer_callback(gpointer data) } } - timer_id = g_timeout_add(seconds * 1000, timer_callback, NULL); + g_timeout_add(seconds * 1000, timer_callback, NULL); return FALSE; } @@ -2096,7 +2095,7 @@ static void activate_gui(GtkApplication *app, gpointer data) 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); } /**********************************************************************//** -- 2.53.0