diff audacious/util.c @ 86:2d8234ea45e8 trunk

[svn] - Add a few things to the main menu. - Bring back classic XMMS behaviour of ``Play Location''.

--- a/audacious/util.c	Mon Oct 31 21:16:49 2005 -0800
+++ b/audacious/util.c	Mon Oct 31 23:46:59 2005 -0800
@@ -624,9 +624,10 @@
 }
 
 GtkWidget *
-util_add_url_dialog_new(const gchar * caption, GCallback enqueue_func)
+util_add_url_dialog_new(const gchar * caption, GCallback ok_func,
+    GCallback enqueue_func)
 {
-    GtkWidget *win, *vbox, *bbox, *enqueue, *cancel, *combo, *entry;
+    GtkWidget *win, *vbox, *bbox, *enqueue, *ok, *cancel, *combo, *entry;
     GList *url;
 
     win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -653,7 +654,7 @@
                      G_CALLBACK(util_add_url_callback),
                      entry);
     g_signal_connect(entry, "activate",
-                     G_CALLBACK(enqueue_func),
+                     G_CALLBACK(ok_func),
                      entry);
     g_signal_connect_swapped(entry, "activate",
                              G_CALLBACK(gtk_widget_destroy),
@@ -664,6 +665,16 @@
     gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
+    ok = gtk_button_new_from_stock(GTK_STOCK_OPEN);
+    g_signal_connect(ok, "clicked",
+		     G_CALLBACK(util_add_url_callback), entry);
+    g_signal_connect(ok, "clicked",
+		     G_CALLBACK(ok_func), entry);
+    g_signal_connect_swapped(ok, "clicked",
+                             G_CALLBACK(gtk_widget_destroy),
+                             win);
+    gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 0);
+
     enqueue = gtk_button_new_from_stock(GTK_STOCK_ADD);
     gtk_box_pack_start(GTK_BOX(bbox), enqueue, FALSE, FALSE, 0);