From 2936f110be8b1693fda7e5ba0e7a4f889c2380f9 Mon Sep 17 00:00:00 2001
From: fenugrec <fenugrec@users.sourceforge.net>
Date: Thu, 16 Nov 2023 17:42:43 -0500
Subject: [PATCH] Replace deprecated gtk_widget_{show,hide} calls

The replacement, gtk_widget_set_visible(), is available since 2.18.
There is some code duplication in menu.c that could eventually be
unified.
---
 src/error.c        |  2 +-
 src/iface-none.c   |  2 +-
 src/menu.c         | 35 ++++++++++-------------------------
 src/window-iface.c |  2 +-
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/error.c b/src/error.c
index b8d5c56..63d6b09 100644
--- a/src/error.c
+++ b/src/error.c
@@ -17,7 +17,7 @@ void show_error(GtkWindow *w, char *s) {
     "%s",
     s
   );
-  gtk_widget_show(dialog);
+  gtk_widget_set_visible(dialog, TRUE);
 
   g_signal_connect(dialog, "response", G_CALLBACK(gtk_window_destroy), NULL);
 }
diff --git a/src/iface-none.c b/src/iface-none.c
index f08eafa..34252d4 100644
--- a/src/iface-none.c
+++ b/src/iface-none.c
@@ -24,7 +24,7 @@ GtkWidget *create_window_iface_none(GtkApplication *app) {
     GTK_APPLICATION_WINDOW(w), TRUE
   );
   add_window_action_map(GTK_WINDOW(w));
-  gtk_widget_show(w);
+  gtk_widget_set_visible(w, TRUE);
 
   return w;
 }
diff --git a/src/menu.c b/src/menu.c
index baa38ff..6128c33 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -13,13 +13,10 @@ static void activate_hardware(
 ) {
   GVariant *state = g_action_get_state(G_ACTION(action));
 
-  int new_state = !g_variant_get_boolean(state);
+  gboolean new_state = !g_variant_get_boolean(state);
   g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
 
-  if (new_state)
-    gtk_widget_show(window_hardware);
-  else
-    gtk_widget_hide(window_hardware);
+  gtk_widget_set_visible(window_hardware, new_state);
 }
 
 static void activate_quit(
@@ -39,13 +36,10 @@ static void activate_routing(
 
   GVariant *state = g_action_get_state(G_ACTION(action));
 
-  int new_state = !g_variant_get_boolean(state);
+  gboolean new_state = !g_variant_get_boolean(state);
   g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
 
-  if (new_state)
-    gtk_widget_show(card->window_routing);
-  else
-    gtk_widget_hide(card->window_routing);
+  gtk_widget_set_visible(card->window_routing, new_state);
 }
 
 static void activate_mixer(
@@ -57,13 +51,10 @@ static void activate_mixer(
 
   GVariant *state = g_action_get_state(G_ACTION(action));
 
-  int new_state = !g_variant_get_boolean(state);
+  gboolean new_state = !g_variant_get_boolean(state);
   g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
 
-  if (new_state)
-    gtk_widget_show(card->window_mixer);
-  else
-    gtk_widget_hide(card->window_mixer);
+  gtk_widget_set_visible(card->window_mixer, new_state);
 }
 
 static void activate_levels(
@@ -75,13 +66,10 @@ static void activate_levels(
 
   GVariant *state = g_action_get_state(G_ACTION(action));
 
-  int new_state = !g_variant_get_boolean(state);
+  gboolean new_state = !g_variant_get_boolean(state);
   g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
 
-  if (new_state)
-    gtk_widget_show(card->window_levels);
-  else
-    gtk_widget_hide(card->window_levels);
+  gtk_widget_set_visible(card->window_levels, new_state);
 }
 
 static void activate_startup(
@@ -93,13 +81,10 @@ static void activate_startup(
 
   GVariant *state = g_action_get_state(G_ACTION(action));
 
-  int new_state = !g_variant_get_boolean(state);
+  gboolean new_state = !g_variant_get_boolean(state);
   g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
 
-  if (new_state)
-    gtk_widget_show(card->window_startup);
-  else
-    gtk_widget_hide(card->window_startup);
+  gtk_widget_set_visible(card->window_startup, new_state);
 }
 
 static const GActionEntry app_entries[] = {
diff --git a/src/window-iface.c b/src/window-iface.c
index 7dc9e4d..b7becfd 100644
--- a/src/window-iface.c
+++ b/src/window-iface.c
@@ -67,7 +67,7 @@ void create_card_window(struct alsa_card *card) {
     GTK_WINDOW(card->window_main),
     card->window_main_contents
   );
-  gtk_widget_show(card->window_main);
+  gtk_widget_set_visible(card->window_main, TRUE);
 }
 
 void create_no_card_window(void) {