      bbox = gtk_hbutton_box_new();
 diff -ru audacious-plugins-1.5.1-original/src/vorbis/Makefile audacious-plugins-1.5.1/src/vorbis/Makefile
 --- audacious-plugins-1.5.1-original/src/vorbis/Makefile	2008-05-23 23:44:20.000000000 +0100
-+++ audacious-plugins-1.5.1/src/vorbis/Makefile	2008-07-18 20:32:40.000000000 +0100
++++ audacious-plugins-1.5.1/src/vorbis/Makefile	2008-07-20 20:00:38.000000000 +0100
 @@ -11,5 +11,5 @@
  plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
  
  CFLAGS += ${PLUGIN_CFLAGS}
 -CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
 -LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
-+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS}  ${OGG_VORBIS_CFLAGS} ${KATE_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
-+LIBS += ${OGG_VORBIS_LIBS} ${KATE_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
++CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${KATE_CFLAGS} ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../..
++LIBS += ${KATE_LIBS} ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS}
 diff -ru audacious-plugins-1.5.1-original/src/vorbis/vcedit.c audacious-plugins-1.5.1/src/vorbis/vcedit.c
 --- audacious-plugins-1.5.1-original/src/vorbis/vcedit.c	2008-05-23 23:44:20.000000000 +0100
 +++ audacious-plugins-1.5.1/src/vorbis/vcedit.c	2008-07-19 08:36:42.000000000 +0100

 
     return tuple;
 }
@@ -691,7 +907,8 @@
                                         "Jorn Baayen <jorn@nl.linux.org>\n"
                                         "Haavard Kvaalen <havardk@xmms.org>\n"
                                         "Gian-Carlo Pascutto <gcp@sjeng.org>\n"

     } /* main loop */
 
     if (!playback->error) {
@@ -620,7 +832,11 @@
      * machine initialization.  If it returns zero, the stream
      * *is* Vorbis and we're fully ready to decode.
      */
