changeset 246:acae8fa925c3 trunk

[svn] Add casts to callbacks in signal handlers to avoid warning. GCC would like a return statement too.
author chainsaw
date Fri, 02 Dec 2005 15:33:58 -0800
parents 1d8012046612
children 95f7737919b1
files Plugins/Output/alsa/audio.c Plugins/Output/alsa/configure.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Output/alsa/audio.c	Wed Nov 30 14:56:57 2005 -0800
+++ b/Plugins/Output/alsa/audio.c	Fri Dec 02 15:33:58 2005 -0800
@@ -851,6 +851,7 @@
 	g_free(thread_buffer);
 	thread_buffer = NULL;
 	g_thread_exit(NULL);
+	return(NULL);
 }
 
 /* open callback */
--- a/Plugins/Output/alsa/configure.c	Wed Nov 30 14:56:57 2005 -0800
+++ b/Plugins/Output/alsa/configure.c	Fri Dec 02 15:33:58 2005 -0800
@@ -345,7 +345,7 @@
 			 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
 
 	gtk_signal_connect(GTK_OBJECT(softvolume_toggle_button), "toggled",
-			   softvolume_toggle_cb, mixer_card_om);
+			   (GCallback)softvolume_toggle_cb, mixer_card_om);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(softvolume_toggle_button),
 				     alsa_cfg.soft_volume);
 
@@ -434,14 +434,14 @@
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
 	ok = gtk_button_new_with_label(_("OK"));
-	gtk_signal_connect(GTK_OBJECT(ok), "clicked", configure_win_ok_cb, NULL);
+	gtk_signal_connect(GTK_OBJECT(ok), "clicked", (GCallback)configure_win_ok_cb, NULL);
 	GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
 	gtk_widget_grab_default(ok);
 
 	cancel = gtk_button_new_with_label(_("Cancel"));
 	gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked",
-				  gtk_widget_destroy, GTK_OBJECT(configure_win));
+				  (GCallback)gtk_widget_destroy, GTK_OBJECT(configure_win));
 	GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
 	gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);