tSwitch from GTK to GLib signal functions - 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 343c6d2eec86318786bfa09425785bd6affb1a71
(DIR) parent 83ede151188835547470fd04c3e7f7de93fa7d04
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Thu, 19 Nov 2020 23:53:58 -0800
Switch from GTK to GLib signal functions
Replace gtk_signal_connect() with g_signal_connect(),
for example. The former is removed from GTK+3 but
both work in GTK+2.
Diffstat:
M src/gui_client/gtk_client.c | 174 ++++++++++++++++----------------
M src/gui_client/newgamedia.c | 34 ++++++++++++++++----------------
M src/gui_client/optdialog.c | 58 +++++++++++++++---------------
M src/serverside.c | 8 ++++----
4 files changed, 137 insertions(+), 137 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);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(window));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(window), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -791,13 +791,13 @@ void CompleteHighScoreDialog(gboolean AtEnd)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_CLOSE, HiScoreDialog.accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
if (AtEnd) {
InGame = FALSE;
- gtk_signal_connect_object(GTK_OBJECT(dialog), "destroy",
- G_CALLBACK(EndHighScore), NULL);
+ g_signal_connect_object(GTK_OBJECT(dialog), "destroy",
+ G_CALLBACK(EndHighScore), NULL, 0);
}
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(HiScoreDialog.vbox), hbbox, FALSE, FALSE, 0);
t@@ -886,9 +886,9 @@ static GtkWidget *AddFightButton(gchar *Text, GtkAccelGroup *accel_group,
button = gtk_button_new_with_label("");
SetAccelerator(button, Text, button, "clicked", accel_group, FALSE);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(FightCallback),
- GINT_TO_POINTER(Answer));
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(FightCallback),
+ GINT_TO_POINTER(Answer));
gtk_box_pack_start(box, button, TRUE, TRUE, 0);
return button;
}
t@@ -914,8 +914,8 @@ static void CreateFightDialog(void)
FightDialog = dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 350, 250);
- gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
- G_CALLBACK(DisallowDelete), NULL);
+ g_signal_connect(GTK_OBJECT(dialog), "delete_event",
+ G_CALLBACK(DisallowDelete), NULL);
accel_group = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(dialog), accel_group);
gtk_window_set_title(GTK_WINDOW(dialog), _("Fight"));
t@@ -1519,8 +1519,8 @@ void Jet(GtkWidget *parent)
}
gtk_widget_set_sensitive(button, i != ClientData.Play->IsAt);
gtk_object_set_data(GTK_OBJECT(button), "dialog", dialog);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(JetCallback), GINT_TO_POINTER(i));
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(JetCallback), GINT_TO_POINTER(i));
gtk_table_attach_defaults(GTK_TABLE(table), button, col, col + 1, row,
row + 1);
}
t@@ -1712,9 +1712,9 @@ void DealDrugs(GtkWidget *widget, gpointer data)
|| (data == BT_BUY && Play->Drugs[i].Price != 0)) {
dpg_string_printf(text, _("%/DealDrugs drug name/%tde"), Drug[i].Name);
menuitem = gtk_menu_item_new_with_label(text->str);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- G_CALLBACK(DealSelectCallback),
- GINT_TO_POINTER(i));
+ g_signal_connect(GTK_OBJECT(menuitem), "activate",
+ G_CALLBACK(DealSelectCallback),
+ GINT_TO_POINTER(i));
gtk_menu_append(GTK_MENU(menu), menuitem);
if (DrugInd >= i) {
SelIndex++;
t@@ -1755,8 +1755,8 @@ void DealDrugs(GtkWidget *widget, gpointer data)
spin_adj = (GtkAdjustment *)gtk_adjustment_new(1.0, 0.0, 2.0,
1.0, 10.0, 0.0);
spinner = DealDialog.amount = gtk_spin_button_new(spin_adj, 1.0, 0);
- gtk_signal_connect(GTK_OBJECT(spinner), "activate",
- G_CALLBACK(DealOKCallback), data);
+ g_signal_connect(GTK_OBJECT(spinner), "activate",
+ G_CALLBACK(DealOKCallback), data);
gtk_box_pack_start(GTK_BOX(hbox), spinner, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
t@@ -1765,16 +1765,16 @@ void DealDrugs(GtkWidget *widget, gpointer data)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_OK, accel_group);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(DealOKCallback), data);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(DealOKCallback), data);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
defbutton = button;
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -1901,8 +1901,8 @@ void QuestionDialog(char *Data, Player *From)
dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
accel_group = gtk_accel_group_new();
- gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
- G_CALLBACK(DisallowDelete), NULL);
+ g_signal_connect(GTK_OBJECT(dialog), "delete_event",
+ G_CALLBACK(DisallowDelete), NULL);
gtk_object_set_data(GTK_OBJECT(dialog), "From", (gpointer)From);
/* Title of the 'ask player a question' dialog */
t@@ -1952,9 +1952,9 @@ void QuestionDialog(char *Data, Player *From)
break;
}
gtk_object_set_data(GTK_OBJECT(button), "dialog", (gpointer)dialog);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(QuestionCallback),
- GINT_TO_POINTER((gint)Responses[i]));
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(QuestionCallback),
+ GINT_TO_POINTER((gint)Responses[i]));
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
}
gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 0);
t@@ -2263,10 +2263,10 @@ gboolean GtkLoop(int *argc, char **argv[],
/* Title of main window in GTK+ client */
gtk_window_set_title(GTK_WINDOW(window), _("dopewars"));
gtk_window_set_default_size(GTK_WINDOW(window), 450, 390);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- G_CALLBACK(MainDelete), NULL);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- G_CALLBACK(DestroyGtk), NULL);
+ g_signal_connect(GTK_OBJECT(window), "delete_event",
+ G_CALLBACK(MainDelete), NULL);
+ g_signal_connect(GTK_OBJECT(window), "destroy",
+ G_CALLBACK(DestroyGtk), NULL);
accel_group = gtk_accel_group_new();
gtk_object_set_data(GTK_OBJECT(window), "accel_group", accel_group);
t@@ -2315,13 +2315,13 @@ gboolean GtkLoop(int *argc, char **argv[],
clist = ClientData.Drug.HereList;
gtk_clist_column_titles_active(GTK_CLIST(clist));
gtk_clist_set_compare_func(GTK_CLIST(clist), DrugSortFunc);
- gtk_signal_connect(GTK_OBJECT(clist), "click-column",
- G_CALLBACK(ChangeDrugSort), NULL);
+ g_signal_connect(GTK_OBJECT(clist), "click-column",
+ G_CALLBACK(ChangeDrugSort), NULL);
button = ClientData.JetButton = gtk_button_new_with_label("");
ClientData.JetAccel = 0;
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(JetButtonPressed), NULL);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(JetButtonPressed), NULL);
gtk_box_pack_start(GTK_BOX(ClientData.Drug.vbbox), button, TRUE, TRUE, 0);
SetJetButtonTitle(accel_group);
t@@ -2482,9 +2482,9 @@ void display_intro(GtkWidget *widget, gpointer data)
hbbox = my_hbbox_new();
OKButton = NewStockButton(GTK_STOCK_OK, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(OKButton), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
+ g_signal_connect_object(GTK_OBJECT(OKButton), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), OKButton);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -2575,8 +2575,8 @@ void TransferDialog(gboolean Debt)
accel_group = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(dialog), accel_group);
- gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
- G_CALLBACK(SendDoneMessage), NULL);
+ g_signal_connect(GTK_OBJECT(dialog), "destroy",
+ G_CALLBACK(SendDoneMessage), NULL);
if (Debt) {
/* Title of loan shark dialog - (%Tde="The Loan Shark" by default) */
dpg_string_printf(text, _("%/LoanShark window title/%Tde"),
t@@ -2633,8 +2633,8 @@ void TransferDialog(gboolean Debt)
entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(entry), "0");
gtk_object_set_data(GTK_OBJECT(dialog), "entry", entry);
- gtk_signal_connect(GTK_OBJECT(entry), "activate",
- G_CALLBACK(TransferOK), dialog);
+ g_signal_connect(GTK_OBJECT(entry), "activate",
+ G_CALLBACK(TransferOK), dialog);
if (Currency.Prefix) {
gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 2, 4);
t@@ -2651,21 +2651,21 @@ void TransferDialog(gboolean Debt)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_OK, accel_group);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(TransferOK), dialog);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(TransferOK), dialog);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
if (Debt && ClientData.Play->Cash >= ClientData.Play->Debt) {
/* Button to pay back the entire loan/debt */
button = gtk_button_new_with_label(_("Pay all"));
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(TransferPayAll), dialog);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(TransferPayAll), dialog);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
}
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -2710,9 +2710,9 @@ void ListPlayers(GtkWidget *widget, gpointer data)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -2833,8 +2833,8 @@ void TalkDialog(gboolean TalkToAll)
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
entry = TalkData.entry = gtk_entry_new();
- gtk_signal_connect(GTK_OBJECT(entry), "activate",
- G_CALLBACK(TalkSend), (gpointer)&TalkData);
+ g_signal_connect(GTK_OBJECT(entry), "activate",
+ G_CALLBACK(TalkSend), (gpointer)&TalkData);
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
hsep = gtk_hseparator_new();
t@@ -2845,14 +2845,14 @@ void TalkDialog(gboolean TalkToAll)
/* Button to send a message to other players */
button = gtk_button_new_with_label(_("Send"));
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(TalkSend), (gpointer)&TalkData);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(TalkSend), (gpointer)&TalkData);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -3013,13 +3013,13 @@ void ErrandDialog(gint ErrandType)
gtk_object_set_data(GTK_OBJECT(button), "dialog", dialog);
gtk_object_set_data(GTK_OBJECT(button), "errandtype",
GINT_TO_POINTER(ErrandType));
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(ErrandOK), (gpointer)clist);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(ErrandOK), (gpointer)clist);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -3128,8 +3128,8 @@ void CreateInventory(GtkWidget *hbox, gchar *Objects,
SetAccelerator(button[i], _(button_text[i]), button[i],
"clicked", accel_group, FALSE);
if (CallBack) {
- gtk_signal_connect(GTK_OBJECT(button[i]), "clicked",
- G_CALLBACK(CallBack), button_type[i]);
+ g_signal_connect(GTK_OBJECT(button[i]), "clicked",
+ G_CALLBACK(CallBack), button_type[i]);
}
gtk_box_pack_start(GTK_BOX(vbbox), button[i], TRUE, TRUE, 0);
}
t@@ -3150,8 +3150,8 @@ void SetShowing(GtkWidget *window, gboolean *showing)
g_assert(showing);
*showing = TRUE;
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- G_CALLBACK(DestroyShowing), (gpointer)showing);
+ g_signal_connect(GTK_OBJECT(window), "destroy",
+ G_CALLBACK(DestroyShowing), (gpointer)showing);
}
void DestroyShowing(GtkWidget *widget, gpointer data)
t@@ -3196,8 +3196,8 @@ void NewNameDialog(void)
gtk_window_set_transient_for(GTK_WINDOW(window),
GTK_WINDOW(ClientData.window));
gtk_container_set_border_width(GTK_CONTAINER(window), 7);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- G_CALLBACK(DisallowDelete), NULL);
+ g_signal_connect(GTK_OBJECT(window), "delete_event",
+ G_CALLBACK(DisallowDelete), NULL);
vbox = gtk_vbox_new(FALSE, 7);
t@@ -3208,8 +3208,8 @@ void NewNameDialog(void)
entry = gtk_entry_new();
gtk_object_set_data(GTK_OBJECT(window), "entry", entry);
- gtk_signal_connect(GTK_OBJECT(entry), "activate",
- G_CALLBACK(NewNameOK), window);
+ g_signal_connect(GTK_OBJECT(entry), "activate",
+ G_CALLBACK(NewNameOK), window);
gtk_entry_set_text(GTK_ENTRY(entry), GetPlayerName(ClientData.Play));
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
t@@ -3217,8 +3217,8 @@ void NewNameDialog(void)
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
button = NewStockButton(GTK_STOCK_OK, accel_group);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(NewNameOK), window);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(NewNameOK), window);
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(button);
t@@ -3240,8 +3240,8 @@ void GunShopDialog(void)
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(window), 600, 190);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- G_CALLBACK(SendDoneMessage), NULL);
+ g_signal_connect(GTK_OBJECT(window), "destroy",
+ G_CALLBACK(SendDoneMessage), NULL);
accel_group = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
t@@ -3271,9 +3271,9 @@ void GunShopDialog(void)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(window));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(window), 0);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -3321,8 +3321,8 @@ static void CreateSpyReports(void)
gtk_window_set_transient_for(GTK_WINDOW(window),
GTK_WINDOW(ClientData.window));
gtk_container_set_border_width(GTK_CONTAINER(window), 7);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- G_CALLBACK(DestroySpyReports), NULL);
+ g_signal_connect(GTK_OBJECT(window), "destroy",
+ G_CALLBACK(DestroySpyReports), NULL);
vbox = gtk_vbox_new(FALSE, 5);
notebook = gtk_notebook_new();
t@@ -3331,9 +3331,9 @@ static void CreateSpyReports(void)
gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
button = NewStockButton(GTK_STOCK_CLOSE, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(window));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(window), 0);
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@@ -480,8 +480,8 @@ void NewGameDialog(Player *play)
stgam.play = play;
stgam.dialog = dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
- G_CALLBACK(CloseNewGameDia), NULL);
+ g_signal_connect(GTK_OBJECT(dialog), "destroy",
+ G_CALLBACK(CloseNewGameDia), NULL);
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(MainWindow));
t@@ -560,8 +560,8 @@ void NewGameDialog(Player *play)
button = gtk_button_new_with_label("");
/* Button to connect to a named dopewars server */
SetAccelerator(button, _("_Connect"), button, "clicked", accel_group, TRUE);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(ConnectToServer), NULL);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(ConnectToServer), NULL);
gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
t@@ -590,8 +590,8 @@ void NewGameDialog(Player *play)
SetAccelerator(button, _("_Start single-player game"), button,
"clicked", accel_group, TRUE);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(StartSinglePlayer), NULL);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(StartSinglePlayer), NULL);
gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
label = gtk_label_new(_("Single player"));
t@@ -616,14 +616,14 @@ void NewGameDialog(Player *play)
/* Button to update metaserver information */
button = NewStockButton(GTK_STOCK_REFRESH, accel_group);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(UpdateMetaServerList), NULL);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(UpdateMetaServerList), NULL);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = gtk_button_new_with_label("");
SetAccelerator(button, _("_Connect"), button, "clicked", accel_group, TRUE);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(MetaServerConnect), NULL);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(MetaServerConnect), NULL);
gtk_widget_set_sensitive(button, FALSE);
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(clist));
g_signal_connect(treesel, "changed", G_CALLBACK(metalist_changed), button);
t@@ -705,8 +705,8 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpointer data)
accel_group = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- G_CALLBACK(DestroySocksAuth), NULL);
+ g_signal_connect(GTK_OBJECT(window), "destroy",
+ G_CALLBACK(DestroySocksAuth), NULL);
gtk_object_set_data(GTK_OBJECT(window), "netbuf", (gpointer)netbuf);
/* Title of dialog for authenticating with a SOCKS server */
t@@ -753,14 +753,14 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpointer data)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_OK, accel_group);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(OKSocksAuth), (gpointer)window);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(OKSocksAuth), (gpointer)window);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(window));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(window), 0);
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@@ -653,10 +653,10 @@ static GtkWidget *CreateList(gchar *structname, struct ConfigMembers *members)
titles[0] = structname;
clist = gtk_scrolled_clist_new_with_titles(1, titles, &scrollwin);
- gtk_signal_connect(GTK_OBJECT(clist), "select_row",
- G_CALLBACK(list_row_select), structname);
- gtk_signal_connect(GTK_OBJECT(clist), "unselect_row",
- G_CALLBACK(list_row_unselect), structname);
+ g_signal_connect(GTK_OBJECT(clist), "select_row",
+ G_CALLBACK(list_row_select), structname);
+ g_signal_connect(GTK_OBJECT(clist), "unselect_row",
+ G_CALLBACK(list_row_unselect), structname);
gtk_clist_column_titles_passive(GTK_CLIST(clist));
gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_SINGLE);
gtk_clist_set_auto_sort(GTK_CLIST(clist), FALSE);
t@@ -673,8 +673,8 @@ static GtkWidget *CreateList(gchar *structname, struct ConfigMembers *members)
button = gtk_button_new_with_label(_("New"));
gtk_object_set_data(GTK_OBJECT(button), "clist", clist);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(list_new), structname);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(list_new), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Delete"));
t@@ -683,24 +683,24 @@ static GtkWidget *CreateList(gchar *structname, struct ConfigMembers *members)
gtk_object_set_data(GTK_OBJECT(clist), "delete", button);
gtk_object_set_data(GTK_OBJECT(clist), "minlistlength",
GINT_TO_POINTER(minlistlength));
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(list_delete), structname);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(list_delete), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Up"));
gtk_widget_set_sensitive(button, FALSE);
gtk_object_set_data(GTK_OBJECT(button), "clist", clist);
gtk_object_set_data(GTK_OBJECT(clist), "up", button);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(list_up), structname);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(list_up), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label(_("Down"));
gtk_widget_set_sensitive(button, FALSE);
gtk_object_set_data(GTK_OBJECT(button), "clist", clist);
gtk_object_set_data(GTK_OBJECT(clist), "down", button);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(list_down), structname);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(list_down), structname);
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
t@@ -947,10 +947,10 @@ void OptDialog(GtkWidget *widget, gpointer data)
gtk_clist_column_titles_passive(GTK_CLIST(clist));
gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_SINGLE);
FillSoundsList(GTK_CLIST(clist));
- gtk_signal_connect(GTK_OBJECT(clist), "select_row",
- G_CALLBACK(sound_row_select), NULL);
- gtk_signal_connect(GTK_OBJECT(clist), "unselect_row",
- G_CALLBACK(sound_row_unselect), NULL);
+ g_signal_connect(GTK_OBJECT(clist), "select_row",
+ G_CALLBACK(sound_row_select), NULL);
+ g_signal_connect(GTK_OBJECT(clist), "unselect_row",
+ G_CALLBACK(sound_row_unselect), NULL);
clists = g_slist_append(clists, clist);
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..."));
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(BrowseSound), GTK_OBJECT(entry));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(BrowseSound), GTK_OBJECT(entry), 0);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
button = gtk_button_new_with_label(_("Play"));
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(TestPlaySound), GTK_OBJECT(entry));
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(TestPlaySound), GTK_OBJECT(entry), 0);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
t@@ -989,21 +989,21 @@ void OptDialog(GtkWidget *widget, gpointer data)
hbbox = my_hbbox_new();
button = NewStockButton(GTK_STOCK_OK, accel_group);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(OKCallback), (gpointer)dialog);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(OKCallback), (gpointer)dialog);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_HELP, accel_group);
- gtk_signal_connect(GTK_OBJECT(button), "clicked",
- G_CALLBACK(HelpCallback), (gpointer)notebook);
+ g_signal_connect(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(HelpCallback), (gpointer)notebook);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
button = NewStockButton(GTK_STOCK_CANCEL, accel_group);
- gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
- G_CALLBACK(gtk_widget_destroy),
- GTK_OBJECT(dialog));
- gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
- G_CALLBACK(FinishOptDialog), NULL);
+ g_signal_connect_object(GTK_OBJECT(button), "clicked",
+ G_CALLBACK(gtk_widget_destroy),
+ GTK_OBJECT(dialog), 0);
+ g_signal_connect(GTK_OBJECT(dialog), "destroy",
+ G_CALLBACK(FinishOptDialog), NULL);
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button);
gtk_box_pack_start(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
(DIR) diff --git a/src/serverside.c b/src/serverside.c
t@@ -1661,8 +1661,8 @@ void GuiServerLoop(struct CMDLINE *cmdline, gboolean is_service)
}
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(GuiRequestDelete), NULL);
+ g_signal_connect(GTK_OBJECT(window), "delete_event",
+ G_CALLBACK(GuiRequestDelete), NULL);
gtk_window_set_default_size(GTK_WINDOW(window), 500, 250);
/* Title of dopewars server window (if used) */
t@@ -1680,8 +1680,8 @@ void GuiServerLoop(struct CMDLINE *cmdline, gboolean is_service)
label = gtk_label_new(_("Command:"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
entry = gtk_entry_new();
- gtk_signal_connect(GTK_OBJECT(entry), "activate",
- GTK_SIGNAL_FUNC(GuiDoCommand), NULL);
+ g_signal_connect(GTK_OBJECT(entry), "activate",
+ G_CALLBACK(GuiDoCommand), NULL);
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);