tFix behavior of swapped signals - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 459213547f2464bceeb0a2af5c562c0cb144c873
(DIR) parent c0752d6ea58b28c7eaa1c5531088a98a88060f06
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Fri, 20 Nov 2020 00:22:23 -0800
Fix behavior of swapped signals
Diffstat:
M src/gui_client/gtk_client.c | 60 ++++++++++++++++----------------
M src/gui_client/newgamedia.c | 6 +++---
M src/gui_client/optdialog.c | 14 +++++++-------
3 files changed, 40 insertions(+), 40 deletions(-)
---
(DIR) diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c
t@@ -355,9 +355,9 @@ void ListInventory(GtkWidget *widget, gpointer data)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(window), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(window));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -791,9 +791,9 @@ void CompleteHighScoreDialog(gboolean AtEnd)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_CLOSE, HiScoreDialog.accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
if (AtEnd) {
InGame = FALSE;
g_signal_connect_object(G_OBJECT(dialog), "destroy",
t@@ -1771,9 +1771,9 @@ void DealDrugs(GtkWidget *widget, gpointer data)
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -2481,9 +2481,9 @@ void display_intro(GtkWidget *widget, gpointer data)
hbbox = my_hbbox_new();
OKButton = NewStockButton(GTK_STOCK_OK, accel_group);
- g_signal_connect_object(G_OBJECT(OKButton), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(OKButton), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), OKButton);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -2662,9 +2662,9 @@ void TransferDialog(gboolean Debt)
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
}
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -2709,9 +2709,9 @@ void ListPlayers(GtkWidget *widget, gpointer data)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -2849,9 +2849,9 @@ void TalkDialog(gboolean TalkToAll)
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -3016,9 +3016,9 @@ void ErrandDialog(gint ErrandType)
G_CALLBACK(ErrandOK), (gpointer)clist);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -3270,9 +3270,9 @@ void GunShopDialog(void)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(window), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(window));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -3330,9 +3330,9 @@ static void CreateSpyReports(void)
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(window), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(window));
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
(DIR) diff --git a/src/gui_client/newgamedia.c b/src/gui_client/newgamedia.c
t@@ -758,9 +758,9 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpointer data)
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(window), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(window));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 0);
(DIR) diff --git a/src/gui_client/optdialog.c b/src/gui_client/optdialog.c
t@@ -965,13 +965,13 @@ void OptDialog(GtkWidget *widget, gpointer data)
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Browse..."));
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(BrowseSound), G_OBJECT(entry), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(BrowseSound), G_OBJECT(entry));
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label(_("Play"));
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(TestPlaySound), G_OBJECT(entry), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(TestPlaySound), G_OBJECT(entry));
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
t@@ -999,9 +999,9 @@ void OptDialog(GtkWidget *widget, gpointer data)
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- g_signal_connect_object(G_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- G_OBJECT(dialog), 0);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ G_OBJECT(dialog));
g_signal_connect(G_OBJECT(dialog), "destroy",
G_CALLBACK(FinishOptDialog), NULL);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);