-(YarTour)replaced deprecated GTK_SIGNAL_FUNC() with G_CALLBACK(). (Patch #8258).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@63288 e17a0e51-4ae3-4d35-97c3-1a29b211df97

12 files changed, 162 insertions, 162 deletions

diff --git a/gui/Cheat.c b/gui/Cheat.c
index 4047e2f2..3848e9f2 100644
--- a/gui/Cheat.c
+++ b/gui/Cheat.c
@@ -112,7 +112,7 @@ static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) {
 
 	gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	label = gtk_label_new(_("Cheat Description:"));
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
@@ -197,7 +197,7 @@ static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) {
 
 	gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	label = gtk_label_new(_("Cheat Description:"));
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
@@ -424,27 +424,27 @@ void RunCheatListDialog() {
 
 	widget = glade_xml_get_widget(xml, "addbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_AddClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_AddClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "editbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_EditClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_EditClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "delbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_DelClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_DelClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "loadbutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_OpenClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_OpenClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "savebutton1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_SaveClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_SaveClicked), xml, NULL, G_CONNECT_AFTER);
 
 	// Setup a handler for when Close or Cancel is clicked
 	g_signal_connect_data(GTK_OBJECT(CheatListDlg), "response",
-			GTK_SIGNAL_FUNC(OnCheatListDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnCheatListDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "savebutton1")), NumCheats);
 	gtk_widget_set_sensitive(GTK_WIDGET(glade_xml_get_widget(xml, "editbutton1")), FALSE);
@@ -631,7 +631,7 @@ static void OnCheatSearchDlg_FreezeClicked(GtkWidget *widget, gpointer user_data
 		GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	label = gtk_label_new(_("Description:"));
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
@@ -730,7 +730,7 @@ static void OnCheatSearchDlg_ModifyClicked(GtkWidget *widget, gpointer user_data
 		GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
 
@@ -1145,32 +1145,32 @@ void RunCheatSearchDialog() {
 
 	widget = glade_xml_get_widget(xml, "btn_freeze");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_FreezeClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_FreezeClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_modify");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_ModifyClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_ModifyClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_copy");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_CopyClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_CopyClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_start");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_SearchClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_SearchClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_restart");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_RestartClicked), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_RestartClicked), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "combo_searchfor");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_SearchForChanged), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_SearchForChanged), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "combo_database");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_DataBaseChanged), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_DataBaseChanged), xml, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(CheatSearchDlg), "response",
-		GTK_SIGNAL_FUNC(OnCheatSearchDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+		G_CALLBACK(OnCheatSearchDlg_CloseClicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index 6b2aee4f..3f1ed47a 100644
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -127,55 +127,55 @@ void ConfigurePlugins() {
 
 	widget = glade_xml_get_widget(xml, "btn_ConfGpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_configure_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_ConfSpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_configure_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
 
 	/* ADB TODO Does pad 1 and 2 need to be different? */
 	widget = glade_xml_get_widget(xml, "btn_ConfPad1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-						  GTK_SIGNAL_FUNC(OnConfConf_Pad1Conf), xml, NULL, G_CONNECT_AFTER);
+						  G_CALLBACK(OnConfConf_Pad1Conf), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_ConfPad2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfConf_Pad2Conf), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfConf_Pad2Conf), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_ConfCdr");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_configure_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_configure_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_AboutGpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_about_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_GPU, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_AboutSpu");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_about_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_SPU, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_AboutPad1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfConf_Pad1About), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfConf_Pad1About), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_AboutPad2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfConf_Pad2About), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfConf_Pad2About), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_AboutCdr");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_about_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_about_plugin), (gpointer) PSE_LT_CDR, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "GtkFileChooser_Bios");
 	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
-			GTK_SIGNAL_FUNC(OnBiosPath_Changed), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnBiosPath_Changed), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "GtkFileChooser_Plugin");
 	g_signal_connect_data(GTK_OBJECT(widget), "current_folder_changed",
-			GTK_SIGNAL_FUNC(OnPluginPath_Changed), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnPluginPath_Changed), xml, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(ConfDlg), "response",
-			GTK_SIGNAL_FUNC(OnConf_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
 
 void OnNet_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
@@ -207,15 +207,15 @@ void OnConf_Net() {
 
 	/* Setup a handler for when Close or Cancel is clicked */
 	g_signal_connect_data(GTK_OBJECT(NetDlg), "response",
-			GTK_SIGNAL_FUNC(OnNet_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnNet_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_ConfNet");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnNet_Conf), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnNet_Conf), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_AboutNet");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnNet_About), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnNet_About), xml, NULL, G_CONNECT_AFTER);
 }
 
 void OnConf_Graphics() {
@@ -854,36 +854,36 @@ void OnConf_Cpu() {
 	gtk_combo_box_set_active(GTK_COMBO_BOX (PsxCombo), Config.PsxType);
 	gtk_widget_set_sensitive(GTK_WIDGET (PsxCombo), !Config.PsxAuto);
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Xa")), Config.Xa);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")), Config.Sio);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")), Config.Mdec);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")), Config.Cdda);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Xa")), Config.Xa);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")), Config.Sio);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")), Config.Mdec);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")), Config.Cdda);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
 
 	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), "toggled",
-			GTK_SIGNAL_FUNC(OnCpu_PsxAutoClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCpu_PsxAutoClicked), xml, NULL, G_CONNECT_AFTER);
 
 #ifdef PSXREC
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), Config.Cpu);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), Config.Cpu);
 
 	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), "toggled",
-			GTK_SIGNAL_FUNC(OnCpu_CpuClicked), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnCpu_CpuClicked), xml, NULL, G_CONNECT_AFTER);
 #else
 	Config.Cpu = CPU_INTERPRETER;
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), TRUE);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), TRUE);
 	gtk_widget_set_sensitive(GTK_WIDGET (glade_xml_get_widget(xml, "GtkCheckButton_Cpu")), FALSE);
 #endif
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Dbg")), Config.Cpu && Config.Debug);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "GtkCheckButton_Dbg")), Config.Cpu && Config.Debug);
 	gtk_widget_set_sensitive(GTK_WIDGET (glade_xml_get_widget(xml, "GtkCheckButton_Dbg")), Config.Cpu);
 
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxOut")), Config.PsxOut);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SpuIrq")), Config.SpuIrq);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_RCntFix")), Config.RCntFix);
-	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_VSyncWA")), Config.VSyncWA);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxOut")), Config.PsxOut);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SpuIrq")), Config.SpuIrq);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_RCntFix")), Config.RCntFix);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_VSyncWA")), Config.VSyncWA);
 
 	// Setup a handler for when Close or Cancel is clicked
 	g_signal_connect_data(GTK_OBJECT(CpuDlg), "response",
-			GTK_SIGNAL_FUNC(OnCpu_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnCpu_Clicked), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index e001057b..239aeed0 100644
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -104,7 +104,7 @@ static void MemView_Dump() {
 		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	table = gtk_table_new(2, 2, FALSE);
 
@@ -181,7 +181,7 @@ static void MemView_Patch() {
 		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 
-	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+	box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg)));
 
 	table = gtk_table_new(2, 2, FALSE);
 
@@ -297,16 +297,16 @@ void RunDebugMemoryDialog() {
 
 	widget = glade_xml_get_widget(xml, "btn_dump");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(MemView_Dump), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Dump), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_patch");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(MemView_Patch), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Patch), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "btn_go");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(MemView_Go), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Go), xml, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(MemViewDlg), "response",
-		GTK_SIGNAL_FUNC(MemView_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+		G_CALLBACK(MemView_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 }
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 059598bd..c7448163 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -228,181 +228,181 @@ void StartGui() {
 
 	// Set up callbacks
 	g_signal_connect_data(GTK_OBJECT(Window), "delete-event",
-			GTK_SIGNAL_FUNC(OnDestroy), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnDestroy), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	// File menu
 	widget = glade_xml_get_widget(xml, "RunCd");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "RunBios");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunBios), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnFile_RunBios), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "RunExe");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunExe), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnFile_RunExe), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "RunImage");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "exit2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnFile_Exit), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnFile_Exit), NULL, NULL, G_CONNECT_AFTER);
 
 	// States
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 0, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_load), (gpointer) 0, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 1, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_load), (gpointer) 1, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot3");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 2, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_load), (gpointer) 2, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot4");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 3, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_load), (gpointer) 3, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot5");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 4, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_load), (gpointer) 4, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot6");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 5, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_load), (gpointer) 5, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot7");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 6, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_load), (gpointer) 6, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot8");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 7, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_load), (gpointer) 7, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot9");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 8, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_load), (gpointer) 8, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "other1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_load_other), NULL, NULL, G_CONNECT_AFTER);			
+			G_CALLBACK(on_states_load_other), NULL, NULL, G_CONNECT_AFTER);			
 
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 0, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_save), (gpointer) 0, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 1, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_save), (gpointer) 1, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot3");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 2, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_save), (gpointer) 2, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot4");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 3, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_save), (gpointer) 3, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot5");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 4, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_save), (gpointer) 4, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot6");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 5, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_save), (gpointer) 5, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot7");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 6, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_save), (gpointer) 6, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot8");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 7, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_save), (gpointer) 7, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot9");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 8, NULL, G_CONNECT_AFTER);	
+			G_CALLBACK(on_states_save), (gpointer) 8, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "other2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(on_states_save_other), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_states_save_other), NULL, NULL, G_CONNECT_AFTER);
 
 	// Emulation menu
 	widget = glade_xml_get_widget(xml, "run1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "reset1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnEmu_Reset), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnEmu_Reset), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "SwitchImage");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
 
 	// Configuration menu
 	widget = glade_xml_get_widget(xml, "plugins_bios");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(ConfigurePlugins), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(ConfigurePlugins), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "graphics1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "sound1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "cdrom1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "pad1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "cpu1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "memory_cards1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "net1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Net), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Net), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "memorydump1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(RunDebugMemoryDialog), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(RunDebugMemoryDialog), NULL, NULL, G_CONNECT_AFTER);
 
 	// Cheat menu
 	widget = glade_xml_get_widget(xml, "browse1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(RunCheatListDialog), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(RunCheatListDialog), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "search1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
 
 	// Help menu
 	widget = glade_xml_get_widget(xml, "about_pcsx1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
 
 	// Toolbar
 	widget = glade_xml_get_widget(xml, "toolbutton_runcd");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnFile_RunCd), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_runimage");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnFile_RunImage), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_run");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnEmu_Run), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnEmu_SwitchImage), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_memcards");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_graphics");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Graphics), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_sound");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Sound), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_cdrom");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "toolbutton_controllers");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
 
 	gtk_main();
 }
@@ -939,7 +939,7 @@ void SysMessage(const char *fmt, ...) {
 
 	Txt = gtk_label_new (msg);
 	gtk_label_set_line_wrap(GTK_LABEL(Txt), TRUE);
-	gtk_container_add (GTK_CONTAINER (GTK_DIALOG(MsgDlg)->vbox), Txt);
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area(GTK_DIALOG(MsgDlg))), Txt);
 
 	gtk_widget_show (Txt);
 	gtk_widget_show_all (MsgDlg);
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c
index 31ec6922..aa7538f7 100644
--- a/gui/MemcardDlg.c
+++ b/gui/MemcardDlg.c
@@ -90,7 +90,7 @@ static GdkPixbuf *SetIcon(GtkWidget *dialog, short *icon, int i) {
 	GdkGC     *gc;
 	int x, y, c;
 
-	visual = gdk_window_get_visual(dialog->window);
+	visual = gdk_window_get_visual(gtk_widget_get_window(dialog));
 
 	if (visual->depth == 8) return NULL;
 
@@ -109,7 +109,7 @@ static GdkPixbuf *SetIcon(GtkWidget *dialog, short *icon, int i) {
 		}
 	}
 
-	pixmap = gdk_pixmap_new(dialog->window, 32, 32, visual->depth);
+	pixmap = gdk_pixmap_new(gtk_widget_get_window(dialog), 32, 32, visual->depth);
 
 	gc = gdk_gc_new(pixmap);
 	gdk_draw_image(pixmap, gc, image, 0, 0, 0, 0, 32, 32);
@@ -700,50 +700,50 @@ void OnConf_Mcds() {
 
 	// Setup a handler for when Close or Cancel is clicked
 	g_signal_connect_data(GTK_OBJECT(dialog), "response",
-			GTK_SIGNAL_FUNC(OnMcd_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_Close), xml, (GClosureNotify)g_object_unref, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_Format1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_Format), (gpointer)1, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_Format), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_Format2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_Format), (gpointer)2, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_Format), (gpointer)2, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "Mcd1Button");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_FileChange), (gpointer)1, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_FileChange), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "Mcd2Button");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_FileChange), (gpointer)2, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_FileChange), (gpointer)2, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_New1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_New), (gpointer)1, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_New), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_New2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_New), (gpointer)2, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_New), (gpointer)2, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_CopyTo1");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_CopyTo), (gpointer)1, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_CopyTo), (gpointer)1, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_CopyTo2");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMcd_CopyTo), (gpointer)2, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMcd_CopyTo), (gpointer)2, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_Delete1");
 	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMemcardDelete), (gpointer)1, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMemcardDelete), (gpointer)1, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	widget = glade_xml_get_widget(xml, "GtkButton_Delete2");
 	g_signal_connect_data (GTK_OBJECT (widget), "clicked",
-			GTK_SIGNAL_FUNC(OnMemcardDelete), (gpointer)2, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnMemcardDelete), (gpointer)2, NULL, G_CONNECT_AFTER);
 	gtk_widget_set_sensitive(GTK_WIDGET(widget), FALSE);
 
 	quit = FALSE;
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index c6111207..3d3b89b7 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -179,7 +179,7 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
 	xml = glade_get_widget_tree(MainWindow);
 
 	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
-	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(GTK_BIN(widget)->child)), 255);
+	strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255);
 	CdromDev[255] = '\0';
 
 	widget = glade_xml_get_widget(xml, "readmode_combobox");
@@ -220,15 +220,15 @@ long CDRconfigure() {
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "cfg_closebutton");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
 	fill_drives_list(widget);
-	gtk_entry_set_text(GTK_ENTRY(GTK_BIN(widget)->child), CdromDev);
+	gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev);
 
 	widget = glade_xml_get_widget(xml, "readmode_combobox");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode);
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index 54d8b482..fba94719 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -625,11 +625,11 @@ long PADconfigure() {
 
 	widget = gtk_builder_get_object(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnclose");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
 	PopulateDevList();
 	UpdateKeyList();
@@ -637,47 +637,47 @@ long PADconfigure() {
 	widget = gtk_builder_get_object(xml, "checkmt");
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), g.cfg.Threaded);
 	g_signal_connect_data(GTK_OBJECT(widget), "toggled",
-		GTK_SIGNAL_FUNC(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnThreadedToggled), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combodev1");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnDeviceChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combodev2");
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnDeviceChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combotype1");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
 		g.cfg.PadDef[0].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnTypeChanged), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "combotype2");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget),
 		g.cfg.PadDef[1].Type == PSE_PAD_TYPE_ANALOGPAD ? 1 : 0);
 	g_signal_connect_data(GTK_OBJECT(widget), "changed",
-		GTK_SIGNAL_FUNC(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnTypeChanged), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnchange1");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnChangeClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnreset1");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnResetClicked), (gpointer)0, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnchange2");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnChangeClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(xml, "btnreset2");
 	gtk_widget_set_sensitive(widget, FALSE);
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnResetClicked), (gpointer)1, NULL, G_CONNECT_AFTER);
 
 	gtk_widget_show(MainWindow);
 	gtk_main();
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
index 181fecb4..b1438995 100644
--- a/plugins/dfnet/gui.c
+++ b/plugins/dfnet/gui.c
@@ -113,7 +113,7 @@ long CFGopen() {
 
 	widget = gtk_builder_get_object(builder, "btnCopyIP");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
 
 	widget = gtk_builder_get_object(builder, "tbServerIP");
 	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index 870e65ca..ce2efbaf 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
 		g_signal_connect_data(GTK_OBJECT(widget), "response",
-			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show (widget);
 		gtk_main();
@@ -223,11 +223,11 @@ int main(int argc, char *argv[])
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
-		GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
+		G_CALLBACK(SaveConfig), xml, NULL, 0);
 
 	widget = glade_xml_get_widget(xml, "btn_close");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
+		G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
 
     gtk_main();
     return 0;
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index ddc99296..7a0e2327 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
 		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
 	g_signal_connect_data(GTK_OBJECT(widget), "response",
-			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show (widget);
 		gtk_main();
@@ -312,27 +312,27 @@ main (int argc, char *argv[])
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
 	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
-			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
+			G_CALLBACK(SaveConfig), xml, NULL, 0);
 
 	widget = glade_xml_get_widget(xml, "btn_close");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkFullscreen");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fullscreen_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkUseFixes");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_use_fixes_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkSetFPS");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkAutoFPSLimit");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), xml, NULL, G_CONNECT_AFTER);
 
 	on_fullscreen_toggled(widget, (gpointer) xml);
 	on_fps_toggled(widget, (gpointer) xml);
diff --git a/plugins/gxvideo/gpucfg/main.c b/plugins/gxvideo/gpucfg/main.c
index 844d6ec5..b224f959 100644
--- a/plugins/gxvideo/gpucfg/main.c
+++ b/plugins/gxvideo/gpucfg/main.c
@@ -172,7 +172,7 @@ int main(int argc, char *argv[]) {
 				"http://pcsx-df.sourceforge.net/");
 
 		g_signal_connect_data(GTK_OBJECT(widget), "response",
-				GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
+				G_CALLBACK(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
 
 		gtk_widget_show(widget);
 		gtk_main();
@@ -266,22 +266,22 @@ int main(int argc, char *argv[]) {
 	}
 
 	g_signal_connect_data(GTK_OBJECT(w->config_window), "destroy",
-			GTK_SIGNAL_FUNC(on_destroy_window), w, NULL, 0);
+			G_CALLBACK(on_destroy_window), w, NULL, 0);
 	g_signal_connect_data(GTK_OBJECT(w->save_button), "clicked",
-			GTK_SIGNAL_FUNC(on_click_save_button), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_click_save_button), w, NULL, G_CONNECT_AFTER);
 	g_signal_connect_data(GTK_OBJECT(w->cancel_button), "clicked",
-			GTK_SIGNAL_FUNC(on_click_cancel_button), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_click_cancel_button), w, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(w->fullscreen_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_fullscreen_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fullscreen_toggled), w, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(w->use_game_fixes_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_use_fixes_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_use_fixes_toggled), w, NULL, G_CONNECT_AFTER);
 	g_signal_connect_data(GTK_OBJECT(w->set_fps_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
 
 	g_signal_connect_data(GTK_OBJECT(w->auto_fps_limit_checkbutton), "clicked",
-			GTK_SIGNAL_FUNC(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
+			G_CALLBACK(on_fps_toggled), w, NULL, G_CONNECT_AFTER);
 
 	on_fullscreen_toggled(0, w);
 	on_fps_toggled(0, w);
diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c
index 521d02c4..a5d5163b 100644
--- a/plugins/peopsxgl/gpucfg/main.c
+++ b/plugins/peopsxgl/gpucfg/main.c
@@ -711,15 +711,15 @@ int main( int argc, char **argv ) {
     g_object_unref( G_OBJECT( builder ) );
 
     // Connect callbacks to signals
-    gtk_signal_connect( GTK_OBJECT( window ),            "destroy", GTK_SIGNAL_FUNC( gtk_main_quit ),                NULL );
-    gtk_signal_connect( GTK_OBJECT( btnCancel ),         "clicked", GTK_SIGNAL_FUNC( gtk_main_quit ),                NULL );
-    gtk_signal_connect( GTK_OBJECT( btnSave ),           "clicked", GTK_SIGNAL_FUNC( on_btnSave_clicked ),           NULL );
-    gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ),   "toggled", GTK_SIGNAL_FUNC( on_chkUseGameFixes_toggled ),   NULL );
-    gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ),    "toggled", GTK_SIGNAL_FUNC( on_chkUseFPSLimit_toggled ),    NULL );
-    gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", GTK_SIGNAL_FUNC( on_radFPSLimitManual_toggled ), NULL );
-    gtk_signal_connect( GTK_OBJECT( chkScanLines ),      "toggled", GTK_SIGNAL_FUNC( on_chkScanLines_toggled ),      NULL );
-    gtk_signal_connect( GTK_OBJECT( btnFast ),           "clicked", GTK_SIGNAL_FUNC( on_btnFast_clicked ),           NULL );
-    gtk_signal_connect( GTK_OBJECT( btnBeautiful ),      "clicked", GTK_SIGNAL_FUNC( on_btnBeautiful_clicked ),      NULL );
+    gtk_signal_connect( GTK_OBJECT( window ),            "destroy", G_CALLBACK( gtk_main_quit ),                NULL );
+    gtk_signal_connect( GTK_OBJECT( btnCancel ),         "clicked", G_CALLBACK( gtk_main_quit ),                NULL );
+    gtk_signal_connect( GTK_OBJECT( btnSave ),           "clicked", G_CALLBACK( on_btnSave_clicked ),           NULL );
+    gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ),   "toggled", G_CALLBACK( on_chkUseGameFixes_toggled ),   NULL );
+    gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ),    "toggled", G_CALLBACK( on_chkUseFPSLimit_toggled ),    NULL );
+    gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", G_CALLBACK( on_radFPSLimitManual_toggled ), NULL );
+    gtk_signal_connect( GTK_OBJECT( chkScanLines ),      "toggled", G_CALLBACK( on_chkScanLines_toggled ),      NULL );
+    gtk_signal_connect( GTK_OBJECT( btnFast ),           "clicked", G_CALLBACK( on_btnFast_clicked ),           NULL );
+    gtk_signal_connect( GTK_OBJECT( btnBeautiful ),      "clicked", G_CALLBACK( on_btnBeautiful_clicked ),      NULL );
 
     // Call some callbacks to ensure widget state consistency
     on_chkUseGameFixes_toggled(   GTK_OBJECT( chkUseGameFixes   ), NULL );