From 8d2027b4396e2063478234e3720ba5fcee2eca3a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 25 Sep 2022 04:59:07 +0300 Subject: [PATCH 26/26] gtk: Drop editbar.player_properties_button See osdn #45711 Signed-off-by: Marko Lindqvist --- client/gui-gtk-2.0/editgui.c | 1 - client/gui-gtk-2.0/editgui.h | 2 +- client/gui-gtk-3.0/editgui.c | 1 - client/gui-gtk-3.0/editgui.h | 1 - client/gui-gtk-3.22/editgui.c | 1 - client/gui-gtk-3.22/editgui.h | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/client/gui-gtk-2.0/editgui.c b/client/gui-gtk-2.0/editgui.c index aeb0da0b39..6aab46655e 100644 --- a/client/gui-gtk-2.0/editgui.c +++ b/client/gui-gtk-2.0/editgui.c @@ -597,7 +597,6 @@ static struct editbar *editbar_create(void) g_signal_connect(button, "clicked", G_CALLBACK(editbar_player_properties_button_clicked), eb); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); - eb->player_properties_button = button; return eb; } diff --git a/client/gui-gtk-2.0/editgui.h b/client/gui-gtk-2.0/editgui.h index e84fa50c4d..63c1585345 100644 --- a/client/gui-gtk-2.0/editgui.h +++ b/client/gui-gtk-2.0/editgui.h @@ -15,6 +15,7 @@ #include +/* client */ #include "editor.h" #include "editgui_g.h" @@ -28,7 +29,6 @@ struct editbar { GtkWidget *mode_buttons[NUM_EDITOR_TOOL_MODES]; GtkWidget *tool_buttons[NUM_EDITOR_TOOL_TYPES]; - GtkWidget *player_properties_button; struct tool_value_selector *tool_selectors[NUM_EDITOR_TOOL_TYPES]; GtkListStore *player_pov_store; diff --git a/client/gui-gtk-3.0/editgui.c b/client/gui-gtk-3.0/editgui.c index 981ad2f766..0be8b2da93 100644 --- a/client/gui-gtk-3.0/editgui.c +++ b/client/gui-gtk-3.0/editgui.c @@ -601,7 +601,6 @@ static struct editbar *editbar_create(void) g_signal_connect(button, "clicked", G_CALLBACK(editbar_player_properties_button_clicked), eb); gtk_container_add(GTK_CONTAINER(hbox), button); - eb->player_properties_button = button; return eb; } diff --git a/client/gui-gtk-3.0/editgui.h b/client/gui-gtk-3.0/editgui.h index 04405d6d85..6bd944a8b8 100644 --- a/client/gui-gtk-3.0/editgui.h +++ b/client/gui-gtk-3.0/editgui.h @@ -29,7 +29,6 @@ struct editbar { GtkWidget *mode_buttons[NUM_EDITOR_TOOL_MODES]; GtkWidget *tool_buttons[NUM_EDITOR_TOOL_TYPES]; - GtkWidget *player_properties_button; struct tool_value_selector *tool_selectors[NUM_EDITOR_TOOL_TYPES]; GtkListStore *player_pov_store; diff --git a/client/gui-gtk-3.22/editgui.c b/client/gui-gtk-3.22/editgui.c index 757208267b..ee4f54951f 100644 --- a/client/gui-gtk-3.22/editgui.c +++ b/client/gui-gtk-3.22/editgui.c @@ -601,7 +601,6 @@ static struct editbar *editbar_create(void) g_signal_connect(button, "clicked", G_CALLBACK(editbar_player_properties_button_clicked), eb); gtk_container_add(GTK_CONTAINER(hbox), button); - eb->player_properties_button = button; return eb; } diff --git a/client/gui-gtk-3.22/editgui.h b/client/gui-gtk-3.22/editgui.h index 04405d6d85..6bd944a8b8 100644 --- a/client/gui-gtk-3.22/editgui.h +++ b/client/gui-gtk-3.22/editgui.h @@ -29,7 +29,6 @@ struct editbar { GtkWidget *mode_buttons[NUM_EDITOR_TOOL_MODES]; GtkWidget *tool_buttons[NUM_EDITOR_TOOL_TYPES]; - GtkWidget *player_properties_button; struct tool_value_selector *tool_selectors[NUM_EDITOR_TOOL_TYPES]; GtkListStore *player_pov_store; -- 2.35.1