changeset 2640:dd255ad225f3

use more hooks

--- a/src/skins/Makefile	Fri May 23 12:36:47 2008 +0200
+++ b/src/skins/Makefile	Fri May 23 13:47:15 2008 +0200
@@ -4,7 +4,6 @@
        skins_cfg.c \
        pixbuf_effects.c \
        dnd.c \
-       ui_fileopener.c \
        ui_skin.c \
        ui_skinned_window.c \
        ui_dock.c \

--- a/src/skins/ui_fileopener.c	Fri May 23 12:36:47 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,489 +0,0 @@
-/*  Audacious - Cross-platform multimedia player
- *  Copyright (C) 2005-2007  Audacious development team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; under version 3 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses>.
- *
- *  The Audacious team does not consider modular code linking to
- *  Audacious or using our public API to be a derived work.
- */
-
-#include "ui_fileopener.h"
-
-#include <glib/gi18n.h>
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <audacious/input.h>
-#include <audacious/main.h>
-#include <audacious/playback.h>
-#include <audacious/playlist.h>
-#include <audacious/strings.h>
-#include "ui_playlist.h"
-#include "skins_cfg.h"
-
-static void
-filebrowser_add_files(GtkFileChooser * browser,
-                      GSList * files)
-{
-    GSList *cur;
-    gchar *ptr;
-    Playlist *playlist = aud_playlist_get_active();
-
-    for (cur = files; cur; cur = g_slist_next(cur)) {
-        gchar *filename = g_filename_to_uri((const gchar *) cur->data, NULL, NULL);
-
-        if (aud_vfs_file_test(cur->data, G_FILE_TEST_IS_DIR)) {
-            aud_playlist_add_dir(playlist, filename ? filename : (const gchar *) cur->data);
-        } else {
-            aud_playlist_add(playlist, filename ? filename : (const gchar *) cur->data);
-        }
-
-        g_free(filename);
-    }
-
-    playlistwin_update_list(playlist);
-
-    ptr = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(browser));
-
-    g_free(config.filesel_path);
-    config.filesel_path = ptr;
-}
-
-static void
-action_button_cb(GtkWidget *widget, gpointer data)
-{
-    GtkWidget *window = g_object_get_data(data, "window");
-    GtkWidget *chooser = g_object_get_data(data, "chooser");
-    GtkWidget *toggle = g_object_get_data(data, "toggle-button");
-    gboolean play_button;
-    GSList *files;
-    config.close_dialog_open =
-        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
-
-    play_button =
-        GPOINTER_TO_INT(g_object_get_data(data, "play-button"));
-
-    files = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(chooser));
-    if (!files) return;
-
-    if (play_button)
-        aud_playlist_clear(aud_playlist_get_active());
-
-    filebrowser_add_files(GTK_FILE_CHOOSER(chooser), files);
-    g_slist_foreach(files, (GFunc) g_free, NULL);
-    g_slist_free(files);
-
-    if (play_button)
-        audacious_drct_initiate();
-
-    if (config.close_dialog_open)
-        gtk_widget_destroy(window);
-}
-
-
-static void
-close_button_cb(GtkWidget *widget, gpointer data)
-{
-    gtk_widget_destroy(GTK_WIDGET(data));
-}
-
-static gboolean
-filebrowser_on_keypress(GtkWidget * browser,
-                        GdkEventKey * event,
-                        gpointer data)
-{
-    if (event->keyval == GDK_Escape) {
-        gtk_widget_destroy(browser);
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-static void
-util_run_filebrowser_gtk2style(gboolean play_button, gboolean show)
-{
-    static GtkWidget *window = NULL;
-    GtkWidget *vbox, *hbox, *bbox;
-    GtkWidget *chooser;
-    GtkWidget *action_button, *close_button;
-    GtkWidget *toggle;
-    gchar *window_title, *toggle_text;
-    gpointer action_stock, storage;
-
-    if(!show) {
-        if(window){
-            gtk_widget_hide(window);
-            return;
-        }
-        else
-            return;
-    }
-    else {
-        if(window) {
-            gtk_window_present(GTK_WINDOW(window)); /* raise filebrowser */
-            return;
-        }
-    }
-    
-    window_title = play_button ? _("Open Files") : _("Add Files");
-    toggle_text = play_button ?
-        _("Close dialog on Open") : _("Close dialog on Add");
-    action_stock = play_button ? GTK_STOCK_OPEN : GTK_STOCK_ADD;
-
-    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title(GTK_WINDOW(window), window_title);
-    gtk_window_set_default_size(GTK_WINDOW(window), 700, 450);
-    gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-    gtk_container_set_border_width(GTK_CONTAINER(window), 10);
-
-    vbox = gtk_vbox_new(FALSE, 0);
-    gtk_container_add(GTK_CONTAINER(window), vbox);
-
-    chooser = gtk_file_chooser_widget_new(GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(chooser), TRUE);
-    if (config.filesel_path)
-        gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser),
-                                            config.filesel_path);
-    gtk_box_pack_start(GTK_BOX(vbox), chooser, TRUE, TRUE, 3);
-
-    hbox = gtk_hbox_new(TRUE, 0);
-    gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
-
-    toggle = gtk_check_button_new_with_label(toggle_text);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
-                                 config.close_dialog_open ? TRUE : FALSE);
-    gtk_box_pack_start(GTK_BOX(hbox), toggle, TRUE, TRUE, 3);
-
-    bbox = gtk_hbutton_box_new();
-    gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-    gtk_box_set_spacing(GTK_BOX(bbox), 6);
-    gtk_box_pack_end(GTK_BOX(hbox), bbox, TRUE, TRUE, 3);
-
-    close_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-    action_button = gtk_button_new_from_stock(action_stock);
-    gtk_container_add(GTK_CONTAINER(bbox), close_button);
-    gtk_container_add(GTK_CONTAINER(bbox), action_button);
-
-    /* this storage object holds several other objects which are used in the
-     * callback functions
-     */
-    storage = g_object_new(G_TYPE_OBJECT, NULL);
-    g_object_set_data(storage, "window", window);
-    g_object_set_data(storage, "chooser", chooser);
-    g_object_set_data(storage, "toggle-button", toggle);
-    g_object_set_data(storage, "play-button", GINT_TO_POINTER(play_button));
-
-    g_signal_connect(chooser, "file-activated",
-                     G_CALLBACK(action_button_cb), storage);
-    g_signal_connect(action_button, "clicked",
-                     G_CALLBACK(action_button_cb), storage);
-    g_signal_connect(close_button, "clicked",
-                     G_CALLBACK(close_button_cb), window);
-    g_signal_connect(window, "destroy",
-                     G_CALLBACK(gtk_widget_destroyed), &window);
-
-    g_signal_connect(window, "key_press_event",
-                     G_CALLBACK(filebrowser_on_keypress),
-                     NULL);
-
-    gtk_widget_show_all(window);
-}
-
-/*
- * Derived from Beep Media Player 0.9.6.1.
- * Which is (C) 2003 - 2006 Milosz Derezynski &c
- *
- * Although I changed it quite a bit. -nenolod
- */
-static void filebrowser_changed_classic(GtkFileSelection * filesel)
-{
-    GList *list;
-    GList *node;
-    char *filename = (char *)
-    gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel));
-    GtkListStore *store;
-    GtkTreeIter iter;
-
-#if 0
-    if ((list = input_scan_dir(filename)) != NULL)
-    {
-        /*
-         * We enter a directory that has been "hijacked" by an
-         * input-plugin. This is used by the CDDA plugin
-         */
-        store =
-            GTK_LIST_STORE(gtk_tree_view_get_model
-                   (GTK_TREE_VIEW(filesel->file_list)));
-        gtk_list_store_clear(store);
-
-        node = list;
-        while (node) {
-            gtk_list_store_append(store, &iter);
-            gtk_list_store_set(store, &iter, 0, node->data, -1);
-            g_free(node->data);
-            node = g_list_next(node);
-        }
-
-        g_list_free(list);
-    }
-#endif
-}
-
-static void filebrowser_entry_changed_classic(GtkEditable * entry, gpointer data)
-{
-    filebrowser_changed_classic(GTK_FILE_SELECTION(data));
-}
-
-
-static gboolean
-util_filebrowser_is_dir_classic(GtkFileSelection * filesel)
-{
-    char *text;
-    struct stat buf;
-    gboolean retv = FALSE;
-
-    text = g_strdup(gtk_file_selection_get_filename(filesel));
-
-    if (stat(text, &buf) == 0 && S_ISDIR(buf.st_mode)) {
-    /* Selected directory */
-    int len = strlen(text);
-    if (len > 3 && !strcmp(text + len - 4, "/../")) {
-        if (len == 4)
-        /* At the root already */
-        *(text + len - 3) = '\0';
-        else {
-        char *ptr;
-        *(text + len - 4) = '\0';
-        ptr = strrchr(text, '/');
-        *(ptr + 1) = '\0';
-        }
-    } else if (len > 2 && !strcmp(text + len - 3, "/./"))
-        *(text + len - 2) = '\0';
-    gtk_file_selection_set_filename(filesel, text);
-    retv = TRUE;
-    }
-    g_free(text);
-    return retv;
-}
-
-static void filebrowser_add_files_classic(gchar ** files,
-                  GtkFileSelection * filesel)
-{
-    int ctr = 0;
-    char *ptr;
-    Playlist *playlist = aud_playlist_get_active();
-
-    while (files[ctr] != NULL) {
-        gchar *filename = g_filename_to_uri((const gchar *) files[ctr++], NULL, NULL);
-        aud_playlist_add(playlist, filename);
-        g_free(filename);
-    }
-    playlistwin_update_list(playlist);
-
-    gtk_label_get(GTK_LABEL(GTK_BIN(filesel->history_pulldown)->child),
-          &ptr);
-
-    /* This will give an extra slash if the current dir is the root. */
-    config.filesel_path = g_strconcat(ptr, "/", NULL);
-}
-
-static void filebrowser_ok_classic(GtkWidget * w, GtkWidget * filesel)
-{
-    gchar **files;
-
-    if (util_filebrowser_is_dir_classic(GTK_FILE_SELECTION(filesel)))
-    return;
-    files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
-    filebrowser_add_files_classic(files, GTK_FILE_SELECTION(filesel));
-    gtk_widget_destroy(filesel);
-}
-
-static void filebrowser_play_classic(GtkWidget * w, GtkWidget * filesel)
-{
-    gchar **files;
-
-    if (util_filebrowser_is_dir_classic
-    (GTK_FILE_SELECTION(GTK_FILE_SELECTION(filesel))))
-    return;
-    aud_playlist_clear(aud_playlist_get_active());
-    files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
-    filebrowser_add_files_classic(files, GTK_FILE_SELECTION(filesel));
-    gtk_widget_destroy(filesel);
-
-    audacious_drct_initiate();
-}
-
-static void filebrowser_add_selected_files_classic(GtkWidget * w, gpointer data)
-{
-    gchar **files;
-
-    GtkFileSelection *filesel = GTK_FILE_SELECTION(data);
-    files = gtk_file_selection_get_selections(filesel);
-
-    filebrowser_add_files_classic(files, filesel);
-    gtk_tree_selection_unselect_all(gtk_tree_view_get_selection
-                    (GTK_TREE_VIEW(filesel->file_list)));
-
-    gtk_entry_set_text(GTK_ENTRY(filesel->selection_entry), "");
-}
-
-static void filebrowser_add_all_files_classic(GtkWidget * w, gpointer data)
-{
-    gchar **files;
-    GtkFileSelection *filesel;
-
-    filesel = data;
-    gtk_tree_selection_select_all(gtk_tree_view_get_selection
-                  (GTK_TREE_VIEW(filesel->file_list)));
-    files = gtk_file_selection_get_selections(filesel);
-    filebrowser_add_files_classic(files, filesel);
-    gtk_tree_selection_unselect_all(gtk_tree_view_get_selection
-                    (GTK_TREE_VIEW(filesel->file_list)));
-    gtk_entry_set_text(GTK_ENTRY(filesel->selection_entry), "");
-}
-
-static void
-util_run_filebrowser_classic(gboolean play_button, gboolean show)
-{
-    static GtkWidget *dialog;
-    GtkWidget *button_add_selected, *button_add_all, *button_close,
-    *button_add;
-    char *title;
-
-    if (!show) {
-        if(dialog) {
-            gtk_widget_hide(dialog);
-            return;
-        }
-        else
-            return;
-    }
-    else {
-        if (dialog) {
-            gtk_window_present(GTK_WINDOW(dialog));
-            return;
-        }
-    }
-
-    if (play_button)
-    title = _("Play files");
-    else
-    title = _("Load files");
-
-    dialog = gtk_file_selection_new(title);
-
-    gtk_file_selection_set_select_multiple
-    (GTK_FILE_SELECTION(dialog), TRUE);
-
-    if (config.filesel_path)
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog),
-                    config.filesel_path);
-
-    gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(dialog));
-    gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
-
-    gtk_widget_hide(GTK_FILE_SELECTION(dialog)->ok_button);
-    gtk_widget_destroy(GTK_FILE_SELECTION(dialog)->cancel_button);
-
-    /*
-     * The mnemonics are quite unorthodox, but that should guarantee they're unique in any locale
-     * plus kinda easy to use
-     */
-    button_add_selected =
-    gtk_dialog_add_button(GTK_DIALOG(dialog), "Add selected",
-                  GTK_RESPONSE_NONE);
-    gtk_button_set_use_underline(GTK_BUTTON(button_add_selected), TRUE);
-    g_signal_connect(G_OBJECT(button_add_selected), "clicked",
-             G_CALLBACK(filebrowser_add_selected_files_classic), dialog);
-
-    button_add_all =
-    gtk_dialog_add_button(GTK_DIALOG(dialog), "Add all",
-                  GTK_RESPONSE_NONE);
-    gtk_button_set_use_underline(GTK_BUTTON(button_add_all), TRUE);
-    g_signal_connect(G_OBJECT(button_add_all), "clicked",
-             G_CALLBACK(filebrowser_add_all_files_classic), dialog);
-
-    if (play_button) {
-    button_add =
-        gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_MEDIA_PLAY,
-                  GTK_RESPONSE_NONE);
-    gtk_button_set_use_stock(GTK_BUTTON(button_add), TRUE);
-    g_signal_connect(G_OBJECT(button_add), "clicked",
-             G_CALLBACK(filebrowser_play_classic), dialog);
-    g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button),
-             "clicked", G_CALLBACK(filebrowser_play_classic), dialog);
-    } else {
-    button_add =
-        gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_ADD,
-                  GTK_RESPONSE_NONE);
-    gtk_button_set_use_stock(GTK_BUTTON(button_add), TRUE);
-    g_signal_connect(G_OBJECT(button_add), "clicked",
-             G_CALLBACK(filebrowser_ok_classic), dialog);
-    g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dialog)->ok_button),
-             "clicked", G_CALLBACK(filebrowser_ok_classic), dialog);
-    }
-
-    button_close =
-    gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE,
-                  GTK_RESPONSE_NONE);
-    gtk_button_set_use_stock(GTK_BUTTON(button_close), TRUE);
-    g_signal_connect_swapped(G_OBJECT(button_close), "clicked",
-                 G_CALLBACK(gtk_widget_destroy),
-                 G_OBJECT(dialog));
-
-    gtk_widget_set_size_request(dialog, 600, 450);
-    gtk_widget_realize(dialog);
-
-    g_signal_connect(G_OBJECT
-             (GTK_FILE_SELECTION(dialog)->history_pulldown),
-             "changed", G_CALLBACK(filebrowser_entry_changed_classic),
-             dialog);
-
-    g_signal_connect(G_OBJECT(dialog), "destroy",
-             G_CALLBACK(gtk_widget_destroyed), &dialog);
-
-    filebrowser_changed_classic(GTK_FILE_SELECTION(dialog));
-
-    gtk_widget_show(dialog);
-}
-
-/*
- * util_run_filebrowser(gboolean play_button)
- *
- * Inputs:
- *     - whether or not a play button should be used
- *
- * Outputs:
- *     - none
- *
- * Side Effects:
- *     - either a GTK1 or a GTK2 fileselector is launched
- */
-void
-run_filebrowser(gboolean play_button)
-{
-    if (!config.use_xmms_style_fileselector)
-        util_run_filebrowser_gtk2style(play_button, TRUE);
-    else
-        util_run_filebrowser_classic(play_button, TRUE);
-}
-
-void
-hide_filebrowser(void)
-{
-    if (!config.use_xmms_style_fileselector)
-        util_run_filebrowser_gtk2style(FALSE, FALSE);
-    else
-        util_run_filebrowser_classic(FALSE, FALSE);
-}

--- a/src/skins/ui_fileopener.h	Fri May 23 12:36:47 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*  Audacious - Cross-platform multimedia player
- *  Copyright (C) 2005-2007  Audacious development team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; under version 3 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses>.
- *
- *  The Audacious team does not consider modular code linking to
- *  Audacious or using our public API to be a derived work.
- */
-
-#ifndef AUDACIOUS_UI_FILEOPENER_H
-#define AUDACIOUS_UI_FILEOPENER_H
-
-#include <gtk/gtk.h>
-
-#define NO_PLAY_BUTTON  FALSE
-#define PLAY_BUTTON     TRUE
-
-void run_filebrowser(gboolean clear_pl_on_ok);
-void hide_filebrowser(void);
-
-#endif /* AUDACIOUS_UI_FILEOPENER_H */

--- a/src/skins/ui_main.c	Fri May 23 12:36:47 2008 +0200
+++ b/src/skins/ui_main.c	Fri May 23 13:47:15 2008 +0200
@@ -65,17 +65,13 @@
 #include "playlist.h"
 #include "pluginenum.h"
 #include "strings.h"
-#include "ui_credits.h"
 #include "ui_dock.h"
-#include "ui_jumptotrack.h"
 #include "ui_main_evlisteners.h"
-#include "ui_preferences.h"
 #include "ui_skinselector.h"
 #include "ui_urlopener.h"
 #include "util.h"
 #include "visualization.h"
 #endif
-#include "ui_fileopener.h"
 #include "ui_skinned_window.h"
 #include "ui_skinned_button.h"
 #include "ui_skinned_textbox.h"
@@ -874,9 +870,7 @@
             aud_playlist_next(playlist);
             break;
         case GDK_KP_Insert:
-#if 0
-            ui_jump_to_track();
-#endif
+            audacious_drct_jtf_show();
             break;
         case GDK_Return:
         case GDK_KP_Enter:
@@ -1285,7 +1279,7 @@
 void
 mainwin_eject_pushed(void)
 {
-    run_filebrowser(PLAY_BUTTON);
+    action_play_file();
 }
 
 void
@@ -1765,17 +1759,17 @@
     Playlist *playlist = aud_playlist_get_active();
 
     switch (action) {
-#if 0
         case MAINWIN_GENERAL_PREFS:
-            show_prefs_window();
+            action_preferences();
             break;
         case MAINWIN_GENERAL_ABOUT:
-            show_about_window();
+            action_about_audacious();
             break;
-#endif
-        case MAINWIN_GENERAL_PLAYFILE:
-            run_filebrowser(NO_PLAY_BUTTON);
+        case MAINWIN_GENERAL_PLAYFILE: {
+            gboolean button = FALSE; /* FALSE = NO_PLAY_BUTTON */
+            aud_hook_call("filebrowser show", &button);
             break;
+        }
         case MAINWIN_GENERAL_PLAYLOCATION:
             mainwin_show_add_url_window();
             break;
@@ -1834,9 +1828,7 @@
             mainwin_jump_to_time();
             break;
         case MAINWIN_GENERAL_JTF:
-#if 0
-            ui_jump_to_track();
-#endif
+            audacious_drct_jtf_show();
             break;
         case MAINWIN_GENERAL_EXIT:
             mainwin_quit_cb();
@@ -2370,9 +2362,8 @@
 
     mainwin_about = ui_skinned_button_new();
     ui_skinned_small_button_setup(mainwin_about, SKINNED_WINDOW(mainwin)->fixed, 247, 83, 20, 25);
-#if 0
-    g_signal_connect(mainwin_about, "clicked", show_about_window, NULL);
-#endif
+    g_signal_connect(mainwin_about, "clicked", G_CALLBACK(action_about_audacious), NULL);
+
     mainwin_vis = ui_vis_new(SKINNED_WINDOW(mainwin)->fixed, 24, 43, 76);
     g_signal_connect(mainwin_vis, "button-press-event", G_CALLBACK(mainwin_vis_cb), NULL);
     mainwin_svis = ui_svis_new(SKINNED_WINDOW(mainwin)->fixed, 79, 5);
@@ -2755,15 +2746,15 @@
 void
 action_about_audacious( void )
 {
-#if 0
-    show_about_window();
-#endif
+    gboolean show = TRUE;
+    aud_hook_call("aboutwin show", &show);
 }
 
 void
 action_play_file( void )
 {
-    run_filebrowser(PLAY_BUTTON);
+    gboolean button = TRUE; /* TRUE = PLAY_BUTTON */
+    aud_hook_call("filebrowser show", &button);
 }
 
 void
@@ -2820,9 +2811,7 @@
 void
 action_jump_to_file( void )
 {
-#if 0
-    ui_jump_to_track();
-#endif
+    audacious_drct_jtf_show();
 }
 
 void
@@ -2873,9 +2862,8 @@
 void
 action_preferences( void )
 {
-#if 0
-    show_prefs_window();
-#endif
+    gboolean show = TRUE;
+    aud_hook_call("prefswin show", &show);
 }
 
 void

--- a/src/skins/ui_main.h	Fri May 23 12:36:47 2008 +0200
+++ b/src/skins/ui_main.h	Fri May 23 13:47:15 2008 +0200
@@ -98,7 +98,6 @@
 extern gboolean mainwin_moving;
 extern gboolean mainwin_focus;
 
-extern GtkWidget *mainwin_jtf;
 extern GtkWidget *mainwin_eq, *mainwin_pl;
 extern GtkWidget *mainwin_info;
 

--- a/src/skins/ui_main_evlisteners.c	Fri May 23 12:36:47 2008 +0200
+++ b/src/skins/ui_main_evlisteners.c	Fri May 23 13:47:15 2008 +0200
@@ -32,13 +32,11 @@
 #include <audacious/plugin.h>
 #if 0
 #include "ui_credits.h"
+#endif
 #include "ui_equalizer.h"
-#include "ui_jumptotrack.h"
-#endif
-#include "ui_fileopener.h"
 #include "ui_main.h"
+#include "ui_playlist.h"
 #if 0
-#include "ui_playlist.h"
 #include "ui_preferences.h"
 #endif
 #include "ui_skinned_playstatus.h"
@@ -192,10 +190,9 @@
 ui_main_evlistener_playlist_end_reached(gpointer hook_data, gpointer user_data)
 {
     mainwin_clear_song_info();
-#if 0
-    if (cfg.stopaftersong)
+
+    if (aud_cfg->stopaftersong)
         mainwin_set_stopaftersong(FALSE);
-#endif
 }
 
 static void
@@ -228,60 +225,6 @@
 }
 
 static void
-ui_main_evlistener_prefswin_show(gpointer hook_data, gpointer user_data)
-{
-#if 0
-    gboolean *show = (gboolean*)hook_data;
-    if (*show == TRUE)
-        show_prefs_window();
-    else
-        hide_prefs_window();
-#endif
-}
-
-static void
-ui_main_evlistener_aboutwin_show(gpointer hook_data, gpointer user_data)
-{
-#if 0
-    gboolean *show = (gboolean*)hook_data;
-    if (*show == TRUE)
-        show_about_window();
-    else
-        hide_about_window();
-#endif
-}
-
-
-static void
-ui_main_evlistener_ui_jump_to_track_show(gpointer hook_data, gpointer user_data)
-{
-#if 0
-    gboolean *show = (gboolean*)hook_data;
-    if (*show == TRUE)
-        ui_jump_to_track();
-    else
-        ui_jump_to_track_hide();
-#endif
-}
-
-static void
-ui_main_evlistener_filebrowser_show(gpointer hook_data, gpointer user_data)
-{
-#if 0
-    gboolean *play_button = (gboolean*)hook_data;
-    run_filebrowser(*play_button);
-#endif
-}
-
-static void
-ui_main_evlistener_filebrowser_hide(gpointer hook_data, gpointer user_data)
-{
-#if 0
-    hide_filebrowser();
-#endif
-}
-
-static void
 ui_main_evlistener_visualization_timeout(gpointer hook_data, gpointer user_data)
 {
     if (config.player_shaded && config.player_visible)
@@ -323,13 +266,6 @@
     aud_hook_associate("mainwin set always on top", ui_main_evlistener_mainwin_set_always_on_top, NULL);
     aud_hook_associate("mainwin show", ui_main_evlistener_mainwin_show, NULL);
     aud_hook_associate("equalizerwin show", ui_main_evlistener_equalizerwin_show, NULL);
-#if 0
-    aud_hook_associate("prefswin show", ui_main_evlistener_prefswin_show, NULL);
-    aud_hook_associate("aboutwin show", ui_main_evlistener_aboutwin_show, NULL);
-    aud_hook_associate("ui jump to track show", ui_main_evlistener_ui_jump_to_track_show, NULL);
-    aud_hook_associate("filebrowser show", ui_main_evlistener_filebrowser_show, NULL);
-    aud_hook_associate("filebrowser hide", ui_main_evlistener_filebrowser_hide, NULL);
-#endif
     aud_hook_associate("visualization timeout", ui_main_evlistener_visualization_timeout, NULL);
     aud_hook_associate("config save", ui_main_evlistener_config_save, NULL);
 
@@ -360,8 +296,6 @@
     aud_hook_dissociate("prefswin show", ui_main_evlistener_prefswin_show);
     aud_hook_dissociate("aboutwin show", ui_main_evlistener_aboutwin_show);
     aud_hook_dissociate("ui jump to track show", ui_main_evlistener_ui_jump_to_track_show);
-    aud_hook_dissociate("filebrowser show", ui_main_evlistener_filebrowser_show);
-    aud_hook_dissociate("filebrowser hide", ui_main_evlistener_filebrowser_hide);
 #endif
     aud_hook_dissociate("visualization timeout", ui_main_evlistener_visualization_timeout);
     aud_hook_dissociate("config save", ui_main_evlistener_config_save);

--- a/src/skins/ui_playlist.c	Fri May 23 12:36:47 2008 +0200
+++ b/src/skins/ui_playlist.c	Fri May 23 13:47:15 2008 +0200
@@ -51,7 +51,6 @@
 #endif
 #include "ui_dock.h"
 #include "ui_equalizer.h"
-#include "ui_fileopener.h"
 #include "ui_main.h"
 #include "ui_manager.h"
 #include "ui_playlist_evlisteners.h"
@@ -700,7 +699,7 @@
 static void
 playlistwin_show_filebrowser(void)
 {
-    run_filebrowser(NO_PLAY_BUTTON);
+    action_playlist_add_files();
 }
 
 static void
@@ -1809,7 +1808,8 @@
 void
 action_playlist_add_files(void)
 {
-    run_filebrowser(NO_PLAY_BUTTON);
+    gboolean button = FALSE; /* FALSE = NO_PLAY_BUTTON */
+    aud_hook_call("filebrowser show", &button);
 }
 
 void