diff audacious/playlistwin.c @ 331:ac6389064cf9 trunk

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

--- 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;