diff src/skins/ui_main.c @ 2793:14a58e80ecfe

merge

--- a/src/skins/ui_main.c	Wed Jul 09 21:53:42 2008 +0200
+++ b/src/skins/ui_main.c	Wed Jul 09 22:25:31 2008 +0200
@@ -68,7 +68,6 @@
 #include "ui_dock.h"
 #include "ui_main_evlisteners.h"
 #include "ui_skinselector.h"
-#include "ui_urlopener.h"
 #include "util.h"
 #include "visualization.h"
 #endif
@@ -1073,30 +1072,6 @@
 }
 
 static void
-on_add_url_add_clicked(GtkWidget * widget,
-                       GtkWidget * entry)
-{
-    const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry));
-    if (text && *text)
-        aud_playlist_add_url(aud_playlist_get_active(), text);
-}
-
-static void
-on_add_url_ok_clicked(GtkWidget * widget,
-                      GtkWidget * entry)
-{
-    Playlist *playlist = aud_playlist_get_active();
-
-    const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry));
-    if (text && *text)
-    {
-        aud_playlist_clear(playlist);
-        aud_playlist_add_url(playlist, text);
-        audacious_drct_initiate();
-    }
-}
-
-static void
 on_visibility_warning_toggle(GtkToggleButton *tbt, gpointer unused)
 {
     config.warn_about_win_visibility = !gtk_toggle_button_get_active(tbt);
@@ -1220,28 +1195,6 @@
     g_free(theme);
 }
 
-void
-mainwin_show_add_url_window(void)
-{
-#if 0
-    static GtkWidget *url_window = NULL;
-
-    if (!url_window) {
-        url_window =
-            util_add_url_dialog_new(_("Enter location to play:"),
-                                    G_CALLBACK(on_add_url_ok_clicked),
-                                    G_CALLBACK(on_add_url_add_clicked));
-        gtk_window_set_transient_for(GTK_WINDOW(url_window),
-                                     GTK_WINDOW(mainwin));
-        g_signal_connect(url_window, "destroy",
-                         G_CALLBACK(gtk_widget_destroyed),
-                         &url_window);
-    }
-
-    gtk_window_present(GTK_WINDOW(url_window));
-#endif
-}
-
 static void
 check_set( GtkActionGroup * action_group ,
            const gchar * action_name ,
@@ -1749,7 +1702,7 @@
             break;
         }
         case MAINWIN_GENERAL_PLAYLOCATION:
-            mainwin_show_add_url_window();
+            action_play_location();
             break;
         case MAINWIN_GENERAL_FILEINFO:
             aud_playlist_fileinfo_current(playlist);
@@ -2756,7 +2709,7 @@
 void
 action_play_location( void )
 {
-    mainwin_show_add_url_window();
+    aud_hook_call("urlopener show", NULL);
 }
 
 void