diff src/audacious/pluginenum.c @ 4354:168479ee6aab

Automated merge with ssh://hg.atheme.org//hg/audacious

--- a/src/audacious/pluginenum.c	Mon Mar 17 00:13:57 2008 +0200
+++ b/src/audacious/pluginenum.c	Mon Mar 17 00:14:21 2008 +0200
@@ -39,7 +39,6 @@
 
 #include "main.h"
 #include "dock.h"
-#include "ui_main.h"
 #include "playback.h"
 #include "playlist.h"
 #include "strings.h"
@@ -62,6 +61,7 @@
 
 #include "effect.h"
 #include "volumecontrol.h"
+#include "ui_plugin_menu.h"
 
 const gchar *plugin_dir_list[] = {
     PLUGINSUBS,
@@ -227,7 +227,7 @@
     .playlist_fileinfo = playlist_fileinfo,
 
     .playlist_delete_index = playlist_delete_index,
-    .playlist_delete_filenames = playlist_delete_filenames,
+    .playlist_delete_filenames = NULL, /* remove eventually --mf0102 */
 
     .playlist_get_entry_to_play = playlist_get_entry_to_play,
 
@@ -551,7 +551,7 @@
        - descender */
     p->set_info = (void (*)(gchar *, gint, gint, gint, gint)) playlist_set_info_old_abi;
     p->set_info_text = input_set_info_text;
-    p->set_status_buffering = input_set_status_buffering;
+    p->set_status_buffering = NULL; /* XXX: remove this someday --mf0102 */
 
     ip_data.input_list = g_list_append(ip_data.input_list, p);