Mercurial > hg > xmms-sid
diff src/xs_fileinfo.c @ 626:248aa59cb6a3
XS_SIGNAL_CONNECT() macro added and used.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 03 Sep 2007 02:41:04 +0000 |
| parents | 547f4d35f56a |
| children | ea06356d792b |
line wrap: on
line diff
--- 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);