# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1188787264 0
# Node ID 248aa59cb6a3d5b3aebe8c7fef509dc287ef5700
# Parent  547f4d35f56a2b8b4ad45e68e792f3fd6117d6f5
XS_SIGNAL_CONNECT() macro added and used.


diff -r 547f4d35f56a -r 248aa59cb6a3 src/xmms-sid.h
--- a/src/xmms-sid.h	Mon Sep 03 02:27:01 2007 +0000
+++ b/src/xmms-sid.h	Mon Sep 03 02:41:04 2007 +0000
@@ -219,6 +219,8 @@
 	xs_ ## MV = NULL;				\
 }
 
+#define XS_SIGNAL_CONNECT(SOBJ, SNAME, SFUNC, SDATA)		\
+	gtk_signal_connect(GTK_OBJECT(SOBJ), SNAME, GTK_SIGNAL_FUNC(SFUNC), SDATA)
 
 #ifdef __cplusplus
 }
diff -r 547f4d35f56a -r 248aa59cb6a3 src/xs_about.c
--- a/src/xs_about.c	Mon Sep 03 02:27:01 2007 +0000
+++ b/src/xs_about.c	Mon Sep 03 02:41:04 2007 +0000
@@ -84,8 +84,7 @@
 	gtk_window_set_title(GTK_WINDOW(xs_aboutwin), tmpStr);
 	gtk_window_set_default_size(GTK_WINDOW(xs_aboutwin), 350, -1);
 
-	gtk_signal_connect(GTK_OBJECT(xs_aboutwin), "delete_event",
-		GTK_SIGNAL_FUNC(xs_about_delete), NULL);
+	XS_SIGNAL_CONNECT(xs_aboutwin, "delete_event", xs_about_delete, NULL);
 
 	about_vbox1 = gtk_vbox_new(FALSE, 0);
 	gtk_widget_set_name(about_vbox1, "about_vbox1");
@@ -216,8 +215,7 @@
 	gtk_container_add(GTK_CONTAINER(alignment6), about_close);
 	GTK_WIDGET_SET_FLAGS(about_close, GTK_CAN_DEFAULT);
 
-	gtk_signal_connect(GTK_OBJECT(about_close), "clicked",
-		GTK_SIGNAL_FUNC(xs_about_ok), NULL);
+	XS_SIGNAL_CONNECT(about_close, "clicked", xs_about_ok, NULL);
 
 	gtk_widget_show(xs_aboutwin);
 }
diff -r 547f4d35f56a -r 248aa59cb6a3 src/xs_fileinfo.c
--- a/src/xs_fileinfo.c	Mon Sep 03 02:27:01 2007 +0000
+++ b/src/xs_fileinfo.c	Mon Sep 03 02:41:04 2007 +0000
@@ -200,9 +200,8 @@
 	else {
 		xs_fileinfowin = create_xs_fileinfowin();
 #ifndef AUDACIOUS_PLUGIN
-		gtk_signal_connect(GTK_OBJECT(
-			gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")))),
-			"value_changed", GTK_SIGNAL_FUNC(xs_fileinfo_setsong), NULL);
+		XS_SIGNAL_CONNECT(gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj"))),
+			"value_changed", xs_fileinfo_setsong, NULL);
 #endif
 	}
 
@@ -227,13 +226,7 @@
 	tmpMenuItem = gtk_menu_item_new_with_label(_("General info"));
 	gtk_widget_show(tmpMenuItem);
 	gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
-#ifdef AUDACIOUS_PLUGIN
-	g_signal_connect(G_OBJECT(tmpMenuItem), "activate",
-		G_CALLBACK(xs_fileinfo_subtune), tmpMenu);
-#else
-	gtk_signal_connect(GTK_OBJECT(tmpMenuItem), "activate",
-		GTK_SIGNAL_FUNC(xs_fileinfo_subtune), tmpMenu);
-#endif
+	XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpMenu);
 
 	/* Other menu items */
 	for (n = 1; n <= tmpInfo->nsubTunes; n++) {
@@ -257,13 +250,7 @@
 		tmpMenuItem = gtk_menu_item_new_with_label(tmpStr);
 		gtk_widget_show(tmpMenuItem);
 		gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
-#ifdef AUDACIOUS_PLUGIN
-		g_signal_connect(G_OBJECT(tmpMenuItem), "activate",
-			G_CALLBACK(xs_fileinfo_subtune), tmpMenu);
-#else
-		gtk_signal_connect(GTK_OBJECT(tmpMenuItem), "activate",
-			GTK_SIGNAL_FUNC(xs_fileinfo_subtune), tmpMenu);
-#endif
+		XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpMenu);
 	}
 
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(tmpOptionMenu), tmpMenu);