# HG changeset patch # User Matti Hamalainen # Date 1188763713 -10800 # Node ID 88878ed02ca02f0903f2833d9562b59a673701d3 # Parent e5a0c508c025e40c5f1ac06a5bb6b12fbdeb6def Few minor changes, to amend differences between XMMS-SID and this. diff -r e5a0c508c025 -r 88878ed02ca0 src/sid/xs_fileinfo.c --- a/src/sid/xs_fileinfo.c Sun Sep 02 23:00:33 2007 +0300 +++ b/src/sid/xs_fileinfo.c Sun Sep 02 23:08:33 2007 +0300 @@ -228,10 +228,7 @@ tmpText = LUW("fileinfo_sub_info"); /* Get subtune information */ - if (widget) - tmpIndex = gtk_option_menu_get_history(GTK_OPTION_MENU(widget)); - else - tmpIndex = 0; + tmpIndex = g_list_index(GTK_MENU_SHELL(data)->children, gtk_menu_get_active(GTK_MENU(data))); if (xs_fileinfostil && tmpIndex <= xs_fileinfostil->nsubTunes) tmpNode = xs_fileinfostil->subTunes[tmpIndex]; @@ -311,6 +308,8 @@ tmpMenuItem = gtk_menu_item_new_with_label(_("General info")); gtk_widget_show(tmpMenuItem); gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem); + g_signal_connect(G_OBJECT(tmpMenuItem), "activate", + G_CALLBACK(xs_fileinfo_subtune), tmpMenu); /* Other menu items */ for (n = 1; n <= tmpInfo->nsubTunes; n++) { @@ -334,10 +333,11 @@ tmpMenuItem = gtk_menu_item_new_with_label(tmpStr); gtk_widget_show(tmpMenuItem); gtk_menu_append(GTK_MENU(tmpMenu), tmpMenuItem); + g_signal_connect(G_OBJECT(tmpMenuItem), "activate", + G_CALLBACK(xs_fileinfo_subtune), tmpMenu); } gtk_option_menu_set_menu(GTK_OPTION_MENU(tmpOptionMenu), tmpMenu); - g_signal_connect(G_OBJECT(tmpOptionMenu), "changed", G_CALLBACK(xs_fileinfo_subtune), tmpMenu); gtk_widget_show(tmpOptionMenu); /* Set the subtune information */