# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1188787562 0
# Node ID 109445214255a89ae09746eb02ba8947c3c165a6
# Parent  248aa59cb6a3d5b3aebe8c7fef509dc287ef5700
More gtk_signal_connect() -> XS_SIGNAL_CONNECT() changes.


diff -r 248aa59cb6a3 -r 109445214255 src/xmms-sid.c
--- a/src/xmms-sid.c	Mon Sep 03 02:41:04 2007 +0000
+++ b/src/xmms-sid.c	Mon Sep 03 02:46:02 2007 +0000
@@ -794,9 +794,8 @@
 	gtk_container_set_border_width(GTK_CONTAINER(xs_subctrl), 0);
 	gtk_window_set_policy(GTK_WINDOW(xs_subctrl), FALSE, FALSE, FALSE);
 
-	gtk_signal_connect(GTK_OBJECT(xs_subctrl), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &xs_subctrl);
-
-	gtk_signal_connect(GTK_OBJECT(xs_subctrl), "focus_out_event", GTK_SIGNAL_FUNC(xs_subctrl_close), NULL);
+	XS_SIGNAL_CONNECT(xs_subctrl, "destroy", gtk_widget_destroyed, &xs_subctrl);
+	XS_SIGNAL_CONNECT(xs_subctrl, "focus_out_event", xs_subctrl_close, NULL);
 
 	gtk_widget_realize(xs_subctrl);
 	gdk_window_set_decorations(xs_subctrl->window, (GdkWMDecoration) 0);
@@ -816,7 +815,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox15), subctrl_prev, FALSE, FALSE, 0);
 
 	xs_subctrl_adj = gtk_adjustment_new(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes, 1, 1, 0);
-	gtk_signal_connect(GTK_OBJECT(xs_subctrl_adj), "value_changed", GTK_SIGNAL_FUNC(xs_subctrl_setsong), NULL);
+	XS_SIGNAL_CONNECT(xs_subctrl_adj, "value_changed", xs_subctrl_setsong, NULL);
 
 	subctrl_current = gtk_hscale_new(GTK_ADJUSTMENT(xs_subctrl_adj));
 	gtk_widget_set_name(subctrl_current, "subctrl_current");
@@ -829,11 +828,9 @@
 	gtk_widget_set_name(subctrl_next, "subctrl_next");
 	gtk_box_pack_start(GTK_BOX(hbox15), subctrl_next, FALSE, FALSE, 0);
 
-	gtk_signal_connect(GTK_OBJECT(subctrl_prev), "clicked", GTK_SIGNAL_FUNC(xs_subctrl_prevsong), NULL);
-
-	gtk_signal_connect(GTK_OBJECT(subctrl_next), "clicked", GTK_SIGNAL_FUNC(xs_subctrl_nextsong), NULL);
-
-	gtk_signal_connect(GTK_OBJECT(xs_subctrl), "key_press_event", GTK_SIGNAL_FUNC(xs_subctrl_keypress), NULL);
+	XS_SIGNAL_CONNECT(subctrl_prev, "clicked", xs_subctrl_prevsong, NULL);
+	XS_SIGNAL_CONNECT(subctrl_next, "clicked", xs_subctrl_nextsong, NULL);
+	XS_SIGNAL_CONNECT(xs_subctrl, "key_press_event", xs_subctrl_keypress, NULL);
 
 	gtk_widget_show_all(xs_subctrl);