changeset 331:ac6389064cf9 trunk

[svn] Remove Add Directory option as it is broken. Patch by laci, closes bug #377.

--- a/audacious/mainwin.c	Sun Dec 25 08:49:09 2005 -0800
+++ b/audacious/mainwin.c	Sun Dec 25 12:34:53 2005 -0800
@@ -363,8 +363,6 @@
     {"/-", NULL, NULL, 0, "<Separator>"},
     {N_("/Play File"), "L", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYFILE, "<StockItem>", GTK_STOCK_OPEN},
-    {N_("/Play Directory"), "<shift>L", mainwin_general_menu_callback,
-     MAINWIN_GENERAL_PLAYDIRECTORY, "<Item>"},
     {N_("/Play Location"), "<control>L", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYLOCATION, "<StockItem>", GTK_STOCK_NETWORK},
     {"/-", NULL, NULL, 0, "<Separator>"},
@@ -386,11 +384,6 @@
 GtkItemFactoryEntry mainwin_add_menu_entries[] = {
     {N_("/Files..."), "f", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYFILE, "<StockItem>", GTK_STOCK_OPEN},
-/*
-    {N_("/Folders..."), "d",
-     mainwin_general_menu_callback,
-     MAINWIN_GENERAL_PLAYDIRECTORY, "<StockItem>", GTK_STOCK_OPEN},
-*/
     {N_("/Internet location..."), "<control>h", mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYLOCATION, "<StockItem>", GTK_STOCK_NETWORK},
 };
@@ -1921,24 +1914,6 @@
     return dialog;
 }
 
-void
-mainwin_run_dirbrowser(void)
-{
-    static GtkWidget *browser = NULL;
-
-    if (!browser) {
-        browser = dirbrowser_new(cfg.filesel_path);
-
-        g_signal_connect(browser, "destroy",
-                         G_CALLBACK(gtk_widget_destroyed),
-                         &browser);
-
-        gtk_widget_show(GTK_WIDGET(browser));
-    }
-
-    gtk_window_present(GTK_WINDOW(browser));
-}
-
 static void
 on_add_url_add_clicked(GtkWidget * widget,
                        GtkWidget * entry)
@@ -2500,9 +2475,6 @@
     case MAINWIN_GENERAL_PLAYFILE:
         util_run_filebrowser(NO_PLAY_BUTTON);
         break;
-    case MAINWIN_GENERAL_PLAYDIRECTORY:
-        mainwin_run_dirbrowser();
-        break;
     case MAINWIN_GENERAL_PLAYCD:
         play_medium();
         break;

--- a/audacious/mainwin.h	Sun Dec 25 08:49:09 2005 -0800
+++ b/audacious/mainwin.h	Sun Dec 25 12:34:53 2005 -0800
@@ -56,7 +56,6 @@
     MAINWIN_GENERAL_ABOUT,
     
     MAINWIN_GENERAL_PLAYFILE,
-    MAINWIN_GENERAL_PLAYDIRECTORY,
     MAINWIN_GENERAL_PLAYLOCATION,
 
     MAINWIN_GENERAL_FILEINFO,
@@ -163,7 +162,6 @@
 void mainwin_repeat_pushed(gboolean toggled);
 void mainwin_disable_seekbar(void);
 void mainwin_set_title(const gchar * text);
-void mainwin_run_dirbrowser(void);
 void mainwin_show_add_url_window(void);
 void mainwin_minimize_cb(void);
 void mainwin_general_menu_callback(gpointer cb_data,

--- a/audacious/playlistwin.c	Sun Dec 25 08:49:09 2005 -0800
+++ b/audacious/playlistwin.c	Sun Dec 25 12:34:53 2005 -0800
@@ -155,13 +155,6 @@
      mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYLOCATION, "<StockItem>", GTK_STOCK_NETWORK},
 
-    /* GtkFileChooser in SELECT_FOLDER mode is currently BROKEN! */
-#if 0
-    {N_("/Add Folders..."), "d",
-     mainwin_general_menu_callback,
-     MAINWIN_GENERAL_PLAYDIRECTORY, "<StockItem>", GTK_STOCK_OPEN},
-#endif
-
     {N_("/Add Files..."), "f",
      mainwin_general_menu_callback,
      MAINWIN_GENERAL_PLAYFILE, "<StockItem>", GTK_STOCK_OPEN},
@@ -956,12 +949,6 @@
     }
 }
 
-static void
-playlistwin_run_dirbrowser(void)
-{
-    mainwin_run_dirbrowser();
-}
-
 static gboolean
 inside_sensitive_widgets(gint x, gint y)
 {
@@ -1352,9 +1339,7 @@
             playlist_delete(FALSE);
         break;
     case GDK_Insert:
-        if (event->state & GDK_SHIFT_MASK)
-            playlistwin_run_dirbrowser();
-        else if (event->state & GDK_MOD1_MASK)
+        if (event->state & GDK_MOD1_MASK)
             mainwin_show_add_url_window();
         else
             playlistwin_show_filebrowser();
@@ -1964,9 +1949,6 @@
     case ADD_FILES:
         playlistwin_show_filebrowser();
         break;
-    case ADD_DIR:
-        playlistwin_run_dirbrowser();
-        break;
     case CLOSE_PL_WINDOW:
         playlistwin_hide();
         break;