robert/alsa-scarlett-gui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace deprecated gtk_widget_{show,hide} calls

Browse Source 
The replacement, gtk_widget_set_visible(), is available since 2.18.
There is some code duplication in menu.c that could eventually be
unified.
This commit is contained in:
fenugrec
2023-11-16 17:42:43 -05:00
committed by Geoffrey D. Bennett
parent fb3429ba6c
commit 2936f110be
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/error.c
View File

@@ -17,7 +17,7 @@ void show_error(GtkWindow *w, char *s) {
"%s", "%s",
s s
); );
gtk_widget_show(dialog); gtk_widget_set_visible(dialog, TRUE);
g_signal_connect(dialog, "response", G_CALLBACK(gtk_window_destroy), NULL); g_signal_connect(dialog, "response", G_CALLBACK(gtk_window_destroy), NULL);
} }

2
src/iface-none.c
View File

@@ -24,7 +24,7 @@ GtkWidget *create_window_iface_none(GtkApplication *app) {
GTK_APPLICATION_WINDOW(w), TRUE GTK_APPLICATION_WINDOW(w), TRUE
); );
add_window_action_map(GTK_WINDOW(w)); add_window_action_map(GTK_WINDOW(w));
gtk_widget_show(w); gtk_widget_set_visible(w, TRUE);
return w; return w;
} }

35
src/menu.c
View File

@@ -13,13 +13,10 @@ static void activate_hardware(
) { ) {
GVariant *state = g_action_get_state(G_ACTION(action)); 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)); g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
if (new_state) gtk_widget_set_visible(window_hardware, new_state);
gtk_widget_show(window_hardware);
else
gtk_widget_hide(window_hardware);
} }
static void activate_quit( static void activate_quit(
@@ -39,13 +36,10 @@ static void activate_routing(
GVariant *state = g_action_get_state(G_ACTION(action)); 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)); g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
if (new_state) gtk_widget_set_visible(card->window_routing, new_state);
gtk_widget_show(card->window_routing);
else
gtk_widget_hide(card->window_routing);
} }
static void activate_mixer( static void activate_mixer(
@@ -57,13 +51,10 @@ static void activate_mixer(
GVariant *state = g_action_get_state(G_ACTION(action)); 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)); g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
if (new_state) gtk_widget_set_visible(card->window_mixer, new_state);
gtk_widget_show(card->window_mixer);
else
gtk_widget_hide(card->window_mixer);
} }
static void activate_levels( static void activate_levels(
@@ -75,13 +66,10 @@ static void activate_levels(
GVariant *state = g_action_get_state(G_ACTION(action)); 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)); g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
if (new_state) gtk_widget_set_visible(card->window_levels, new_state);
gtk_widget_show(card->window_levels);
else
gtk_widget_hide(card->window_levels);
} }
static void activate_startup( static void activate_startup(
@@ -93,13 +81,10 @@ static void activate_startup(
GVariant *state = g_action_get_state(G_ACTION(action)); 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)); g_action_change_state(G_ACTION(action), g_variant_new_boolean(new_state));
if (new_state) gtk_widget_set_visible(card->window_startup, new_state);
gtk_widget_show(card->window_startup);
else
gtk_widget_hide(card->window_startup);
} }
static const GActionEntry app_entries[] = { static const GActionEntry app_entries[] = {

2
src/window-iface.c
View File

@@ -67,7 +67,7 @@ void create_card_window(struct alsa_card *card) {
GTK_WINDOW(card->window_main), GTK_WINDOW(card->window_main),
card->window_main_contents card->window_main_contents
); );
gtk_widget_show(card->window_main); gtk_widget_set_visible(card->window_main, TRUE);
} }
void create_no_card_window(void) { void create_no_card_window(void) {