Mercurial > hg > xmms-sid

comparison src/xs_fileinfo.c @ 626:248aa59cb6a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
625:547f4d35f56a 626:248aa59cb6a3
198 if (xs_fileinfowin) 198 if (xs_fileinfowin)
199 gdk_window_raise(xs_fileinfowin->window); 199 gdk_window_raise(xs_fileinfowin->window);
200 else { 200 else {
201 xs_fileinfowin = create_xs_fileinfowin(); 201 xs_fileinfowin = create_xs_fileinfowin();
202 #ifndef AUDACIOUS_PLUGIN 202 #ifndef AUDACIOUS_PLUGIN
203 gtk_signal_connect(GTK_OBJECT( 203 XS_SIGNAL_CONNECT(gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj"))),
204 gtk_range_get_adjustment(GTK_RANGE(LUW("fileinfo_subctrl_adj")))), 204 "value_changed", xs_fileinfo_setsong, NULL);
205 "value_changed", GTK_SIGNAL_FUNC(xs_fileinfo_setsong), NULL);
206 #endif 205 #endif
207 } 206 }
208 207
209 /* Delete current items */ 208 /* Delete current items */
210 tmpOptionMenu = LUW("fileinfo_sub_tune"); 209 tmpOptionMenu = LUW("fileinfo_sub_tune");
225 224
226 /* Main tune - the pseudo tune */ 225 /* Main tune - the pseudo tune */
227 tmpMenuItem = gtk_menu_item_new_with_label(_("General info")); 226 tmpMenuItem = gtk_menu_item_new_with_label(_("General info"));
228 gtk_widget_show(tmpMenuItem); 227 gtk_widget_show(tmpMenuItem);
229 gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem); 228 gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
230 #ifdef AUDACIOUS_PLUGIN 229 XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpMenu);
231 g_signal_connect(G_OBJECT(tmpMenuItem), "activate",
232 G_CALLBACK(xs_fileinfo_subtune), tmpMenu);
233 #else
234 gtk_signal_connect(GTK_OBJECT(tmpMenuItem), "activate",
235 GTK_SIGNAL_FUNC(xs_fileinfo_subtune), tmpMenu);
236 #endif
237 230
238 /* Other menu items */ 231 /* Other menu items */
239 for (n = 1; n <= tmpInfo->nsubTunes; n++) { 232 for (n = 1; n <= tmpInfo->nsubTunes; n++) {
240 if (xs_fileinfostil && n <= xs_fileinfostil->nsubTunes && xs_fileinfostil->subTunes[n]) { 233 if (xs_fileinfostil && n <= xs_fileinfostil->nsubTunes && xs_fileinfostil->subTunes[n]) {
241 t_xs_stil_subnode *tmpNode = xs_fileinfostil->subTunes[n]; 234 t_xs_stil_subnode *tmpNode = xs_fileinfostil->subTunes[n];
255 } 248 }
256 249
257 tmpMenuItem = gtk_menu_item_new_with_label(tmpStr); 250 tmpMenuItem = gtk_menu_item_new_with_label(tmpStr);
258 gtk_widget_show(tmpMenuItem); 251 gtk_widget_show(tmpMenuItem);
259 gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem); 252 gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem);
260 #ifdef AUDACIOUS_PLUGIN 253 XS_SIGNAL_CONNECT(tmpMenuItem, "activate", xs_fileinfo_subtune, tmpMenu);
261 g_signal_connect(G_OBJECT(tmpMenuItem), "activate",
262 G_CALLBACK(xs_fileinfo_subtune), tmpMenu);
263 #else
264 gtk_signal_connect(GTK_OBJECT(tmpMenuItem), "activate",
265 GTK_SIGNAL_FUNC(xs_fileinfo_subtune), tmpMenu);
266 #endif
267 } 254 }
268 255
269 gtk_option_menu_set_menu(GTK_OPTION_MENU(tmpOptionMenu), tmpMenu); 256 gtk_option_menu_set_menu(GTK_OPTION_MENU(tmpOptionMenu), tmpMenu);
270 gtk_widget_show(tmpOptionMenu); 257 gtk_widget_show(tmpOptionMenu);
271 258