tDon't use deprecated GTK_OBJECT - vaccinewars - be a doctor and try to vaccina… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit c0752d6ea58b28c7eaa1c5531088a98a88060f06 | |
parent d6e52c734b27b6bf953796f84c88ea334623af04 | |
Author: Ben Webb <[email protected]> | |
Date: Fri, 20 Nov 2020 00:08:31 -0800 | |
Don't use deprecated GTK_OBJECT | |
Use G_OBJECT instead of the deprecated GTK_OBJECT. | |
Diffstat: | |
M src/gui_client/gtk_client.c | 94 ++++++++++++++++-------------… | |
M src/gui_client/newgamedia.c | 18 +++++++++--------- | |
M src/gui_client/optdialog.c | 34 ++++++++++++++++-------------… | |
3 files changed, 73 insertions(+), 73 deletions(-) | |
--- | |
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(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(window), 0); | |
+ G_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,12 +791,12 @@ void CompleteHighScoreDialog(gboolean AtEnd) | |
hbbox = my_hbbox_new(); | |
button = NewStockButton(GTK_STOCK_CLOSE, HiScoreDialog.accel_group); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
+ G_OBJECT(dialog), 0); | |
if (AtEnd) { | |
InGame = FALSE; | |
- g_signal_connect_object(GTK_OBJECT(dialog), "destroy", | |
+ g_signal_connect_object(G_OBJECT(dialog), "destroy", | |
G_CALLBACK(EndHighScore), NULL, 0); | |
} | |
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
t@@ -886,7 +886,7 @@ static GtkWidget *AddFightButton(gchar *Text, GtkAccelGrou… | |
button = gtk_button_new_with_label(""); | |
SetAccelerator(button, Text, button, "clicked", accel_group, FALSE); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(FightCallback), | |
GINT_TO_POINTER(Answer)); | |
gtk_box_pack_start(box, button, TRUE, TRUE, 0); | |
t@@ -914,7 +914,7 @@ static void CreateFightDialog(void) | |
FightDialog = dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_window_set_default_size(GTK_WINDOW(dialog), 350, 250); | |
- g_signal_connect(GTK_OBJECT(dialog), "delete_event", | |
+ g_signal_connect(G_OBJECT(dialog), "delete_event", | |
G_CALLBACK(DisallowDelete), NULL); | |
accel_group = gtk_accel_group_new(); | |
gtk_window_add_accel_group(GTK_WINDOW(dialog), accel_group); | |
t@@ -1518,7 +1518,7 @@ void Jet(GtkWidget *parent) | |
} | |
gtk_widget_set_sensitive(button, i != ClientData.Play->IsAt); | |
g_object_set_data(G_OBJECT(button), "dialog", dialog); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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@@ -1711,7 +1711,7 @@ 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); | |
- g_signal_connect(GTK_OBJECT(menuitem), "activate", | |
+ g_signal_connect(G_OBJECT(menuitem), "activate", | |
G_CALLBACK(DealSelectCallback), | |
GINT_TO_POINTER(i)); | |
gtk_menu_append(GTK_MENU(menu), menuitem); | |
t@@ -1754,7 +1754,7 @@ 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); | |
- g_signal_connect(GTK_OBJECT(spinner), "activate", | |
+ g_signal_connect(G_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@@ -1764,16 +1764,16 @@ void DealDrugs(GtkWidget *widget, gpointer data) | |
hbbox = my_hbbox_new(); | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
+ G_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@@ -1900,7 +1900,7 @@ void QuestionDialog(char *Data, Player *From) | |
dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
accel_group = gtk_accel_group_new(); | |
- g_signal_connect(GTK_OBJECT(dialog), "delete_event", | |
+ g_signal_connect(G_OBJECT(dialog), "delete_event", | |
G_CALLBACK(DisallowDelete), NULL); | |
g_object_set_data(G_OBJECT(dialog), "From", (gpointer)From); | |
t@@ -1951,7 +1951,7 @@ void QuestionDialog(char *Data, Player *From) | |
break; | |
} | |
g_object_set_data(G_OBJECT(button), "dialog", (gpointer)dialog); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(QuestionCallback), | |
GINT_TO_POINTER((gint)Responses[i])); | |
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
t@@ -2262,9 +2262,9 @@ 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); | |
- g_signal_connect(GTK_OBJECT(window), "delete_event", | |
+ g_signal_connect(G_OBJECT(window), "delete_event", | |
G_CALLBACK(MainDelete), NULL); | |
- g_signal_connect(GTK_OBJECT(window), "destroy", | |
+ g_signal_connect(G_OBJECT(window), "destroy", | |
G_CALLBACK(DestroyGtk), NULL); | |
accel_group = gtk_accel_group_new(); | |
t@@ -2314,12 +2314,12 @@ 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); | |
- g_signal_connect(GTK_OBJECT(clist), "click-column", | |
+ g_signal_connect(G_OBJECT(clist), "click-column", | |
G_CALLBACK(ChangeDrugSort), NULL); | |
button = ClientData.JetButton = gtk_button_new_with_label(""); | |
ClientData.JetAccel = 0; | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(JetButtonPressed), NULL); | |
gtk_box_pack_start(GTK_BOX(ClientData.Drug.vbbox), button, TRUE, TRUE, 0); | |
SetJetButtonTitle(accel_group); | |
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(GTK_OBJECT(OKButton), "clicked", | |
+ g_signal_connect_object(G_OBJECT(OKButton), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
+ G_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@@ -2574,7 +2574,7 @@ void TransferDialog(gboolean Debt) | |
accel_group = gtk_accel_group_new(); | |
gtk_window_add_accel_group(GTK_WINDOW(dialog), accel_group); | |
- g_signal_connect(GTK_OBJECT(dialog), "destroy", | |
+ g_signal_connect(G_OBJECT(dialog), "destroy", | |
G_CALLBACK(SendDoneMessage), NULL); | |
if (Debt) { | |
/* Title of loan shark dialog - (%Tde="The Loan Shark" by default) */ | |
t@@ -2632,7 +2632,7 @@ void TransferDialog(gboolean Debt) | |
entry = gtk_entry_new(); | |
gtk_entry_set_text(GTK_ENTRY(entry), "0"); | |
g_object_set_data(G_OBJECT(dialog), "entry", entry); | |
- g_signal_connect(GTK_OBJECT(entry), "activate", | |
+ g_signal_connect(G_OBJECT(entry), "activate", | |
G_CALLBACK(TransferOK), dialog); | |
if (Currency.Prefix) { | |
t@@ -2650,21 +2650,21 @@ void TransferDialog(gboolean Debt) | |
hbbox = my_hbbox_new(); | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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")); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(TransferPayAll), dialog); | |
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
} | |
button = NewStockButton(GTK_STOCK_CANCEL, accel_group); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
+ G_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@@ -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(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
+ G_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@@ -2832,7 +2832,7 @@ void TalkDialog(gboolean TalkToAll) | |
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); | |
entry = TalkData.entry = gtk_entry_new(); | |
- g_signal_connect(GTK_OBJECT(entry), "activate", | |
+ g_signal_connect(G_OBJECT(entry), "activate", | |
G_CALLBACK(TalkSend), (gpointer)&TalkData); | |
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); | |
t@@ -2844,14 +2844,14 @@ void TalkDialog(gboolean TalkToAll) | |
/* Button to send a message to other players */ | |
button = gtk_button_new_with_label(_("Send")); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
+ G_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@@ -3012,13 +3012,13 @@ void ErrandDialog(gint ErrandType) | |
g_object_set_data(G_OBJECT(button), "dialog", dialog); | |
g_object_set_data(G_OBJECT(button), "errandtype", | |
GINT_TO_POINTER(ErrandType)); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
+ G_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@@ -3127,7 +3127,7 @@ void CreateInventory(GtkWidget *hbox, gchar *Objects, | |
SetAccelerator(button[i], _(button_text[i]), button[i], | |
"clicked", accel_group, FALSE); | |
if (CallBack) { | |
- g_signal_connect(GTK_OBJECT(button[i]), "clicked", | |
+ g_signal_connect(G_OBJECT(button[i]), "clicked", | |
G_CALLBACK(CallBack), button_type[i]); | |
} | |
gtk_box_pack_start(GTK_BOX(vbbox), button[i], TRUE, TRUE, 0); | |
t@@ -3149,7 +3149,7 @@ void SetShowing(GtkWidget *window, gboolean *showing) | |
g_assert(showing); | |
*showing = TRUE; | |
- g_signal_connect(GTK_OBJECT(window), "destroy", | |
+ g_signal_connect(G_OBJECT(window), "destroy", | |
G_CALLBACK(DestroyShowing), (gpointer)showing); | |
} | |
t@@ -3195,7 +3195,7 @@ void NewNameDialog(void) | |
gtk_window_set_transient_for(GTK_WINDOW(window), | |
GTK_WINDOW(ClientData.window)); | |
gtk_container_set_border_width(GTK_CONTAINER(window), 7); | |
- g_signal_connect(GTK_OBJECT(window), "delete_event", | |
+ g_signal_connect(G_OBJECT(window), "delete_event", | |
G_CALLBACK(DisallowDelete), NULL); | |
vbox = gtk_vbox_new(FALSE, 7); | |
t@@ -3207,7 +3207,7 @@ void NewNameDialog(void) | |
entry = gtk_entry_new(); | |
g_object_set_data(G_OBJECT(window), "entry", entry); | |
- g_signal_connect(GTK_OBJECT(entry), "activate", | |
+ g_signal_connect(G_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@@ -3216,7 +3216,7 @@ void NewNameDialog(void) | |
gtk_box_pack_start(GTK_BOX(vbox), hsep, FALSE, FALSE, 0); | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
t@@ -3239,7 +3239,7 @@ void GunShopDialog(void) | |
window = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
gtk_window_set_default_size(GTK_WINDOW(window), 600, 190); | |
- g_signal_connect(GTK_OBJECT(window), "destroy", | |
+ g_signal_connect(G_OBJECT(window), "destroy", | |
G_CALLBACK(SendDoneMessage), NULL); | |
accel_group = gtk_accel_group_new(); | |
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); | |
t@@ -3270,9 +3270,9 @@ void GunShopDialog(void) | |
hbbox = my_hbbox_new(); | |
button = NewStockButton(GTK_STOCK_CLOSE, accel_group); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(window), 0); | |
+ G_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@@ -3320,7 +3320,7 @@ 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); | |
- g_signal_connect(GTK_OBJECT(window), "destroy", | |
+ g_signal_connect(G_OBJECT(window), "destroy", | |
G_CALLBACK(DestroySpyReports), NULL); | |
vbox = gtk_vbox_new(FALSE, 5); | |
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(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(window), 0); | |
+ G_OBJECT(window), 0); | |
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); | |
gtk_container_add(GTK_CONTAINER(window), vbox); | |
diff --git a/src/gui_client/newgamedia.c b/src/gui_client/newgamedia.c | |
t@@ -480,7 +480,7 @@ void NewGameDialog(Player *play) | |
stgam.play = play; | |
stgam.dialog = dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); | |
- g_signal_connect(GTK_OBJECT(dialog), "destroy", | |
+ g_signal_connect(G_OBJECT(dialog), "destroy", | |
G_CALLBACK(CloseNewGameDia), NULL); | |
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); | |
t@@ -560,7 +560,7 @@ 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); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
t@@ -590,7 +590,7 @@ void NewGameDialog(Player *play) | |
SetAccelerator(button, _("_Start single-player game"), button, | |
"clicked", accel_group, TRUE); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
t@@ -616,13 +616,13 @@ void NewGameDialog(Player *play) | |
/* Button to update metaserver information */ | |
button = NewStockButton(GTK_STOCK_REFRESH, accel_group); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(MetaServerConnect), NULL); | |
gtk_widget_set_sensitive(button, FALSE); | |
treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(clist)); | |
t@@ -705,7 +705,7 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpointe… | |
accel_group = gtk_accel_group_new(); | |
gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); | |
- g_signal_connect(GTK_OBJECT(window), "destroy", | |
+ g_signal_connect(G_OBJECT(window), "destroy", | |
G_CALLBACK(DestroySocksAuth), NULL); | |
g_object_set_data(G_OBJECT(window), "netbuf", (gpointer)netbuf); | |
t@@ -753,14 +753,14 @@ static void SocksAuthDialog(NetworkBuffer *netbuf, gpoin… | |
hbbox = my_hbbox_new(); | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(window), 0); | |
+ G_OBJECT(window), 0); | |
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |
gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 0); | |
diff --git a/src/gui_client/optdialog.c b/src/gui_client/optdialog.c | |
t@@ -653,9 +653,9 @@ static GtkWidget *CreateList(gchar *structname, struct Con… | |
titles[0] = structname; | |
clist = gtk_scrolled_clist_new_with_titles(1, titles, &scrollwin); | |
- g_signal_connect(GTK_OBJECT(clist), "select_row", | |
+ g_signal_connect(G_OBJECT(clist), "select_row", | |
G_CALLBACK(list_row_select), structname); | |
- g_signal_connect(GTK_OBJECT(clist), "unselect_row", | |
+ g_signal_connect(G_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); | |
t@@ -673,7 +673,7 @@ static GtkWidget *CreateList(gchar *structname, struct Con… | |
button = gtk_button_new_with_label(_("New")); | |
g_object_set_data(G_OBJECT(button), "clist", clist); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(list_new), structname); | |
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0); | |
t@@ -683,7 +683,7 @@ static GtkWidget *CreateList(gchar *structname, struct Con… | |
g_object_set_data(G_OBJECT(clist), "delete", button); | |
g_object_set_data(G_OBJECT(clist), "minlistlength", | |
GINT_TO_POINTER(minlistlength)); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(list_delete), structname); | |
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0); | |
t@@ -691,7 +691,7 @@ static GtkWidget *CreateList(gchar *structname, struct Con… | |
gtk_widget_set_sensitive(button, FALSE); | |
g_object_set_data(G_OBJECT(button), "clist", clist); | |
g_object_set_data(G_OBJECT(clist), "up", button); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(list_up), structname); | |
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0); | |
t@@ -699,7 +699,7 @@ static GtkWidget *CreateList(gchar *structname, struct Con… | |
gtk_widget_set_sensitive(button, FALSE); | |
g_object_set_data(G_OBJECT(button), "clist", clist); | |
g_object_set_data(G_OBJECT(clist), "down", button); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_OBJECT(button), "clicked", | |
G_CALLBACK(list_down), structname); | |
gtk_box_pack_start(GTK_BOX(hbbox), button, TRUE, TRUE, 0); | |
t@@ -947,9 +947,9 @@ 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)); | |
- g_signal_connect(GTK_OBJECT(clist), "select_row", | |
+ g_signal_connect(G_OBJECT(clist), "select_row", | |
G_CALLBACK(sound_row_select), NULL); | |
- g_signal_connect(GTK_OBJECT(clist), "unselect_row", | |
+ g_signal_connect(G_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...")); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
- G_CALLBACK(BrowseSound), GTK_OBJECT(entry), 0); | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
+ G_CALLBACK(BrowseSound), G_OBJECT(entry), 0); | |
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); | |
button = gtk_button_new_with_label(_("Play")); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
- G_CALLBACK(TestPlaySound), GTK_OBJECT(entry), 0); | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
+ G_CALLBACK(TestPlaySound), G_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,20 +989,20 @@ void OptDialog(GtkWidget *widget, gpointer data) | |
hbbox = my_hbbox_new(); | |
button = NewStockButton(GTK_STOCK_OK, accel_group); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
- g_signal_connect(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect(G_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); | |
- g_signal_connect_object(GTK_OBJECT(button), "clicked", | |
+ g_signal_connect_object(G_OBJECT(button), "clicked", | |
G_CALLBACK(gtk_widget_destroy), | |
- GTK_OBJECT(dialog), 0); | |
- g_signal_connect(GTK_OBJECT(dialog), "destroy", | |
+ G_OBJECT(dialog), 0); | |
+ g_signal_connect(G_OBJECT(dialog), "destroy", | |
G_CALLBACK(FinishOptDialog), NULL); | |
my_gtk_box_pack_start_defaults(GTK_BOX(hbbox), button); | |