[vlc-devel] commit: Don't use Simple Open, it can be broken. Workaround it. Close #1917 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug 25 13:23:48 2008 -0700| [2048555f794685091e00febab567ddc883d82d8c] | committer: Christophe Mutricy 

Don't use Simple Open, it can be broken. Workaround it. Close  #1917
(cherry picked from commit 41e490d185f91018286b78649a8549fd89406cfc)

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2048555f794685091e00febab567ddc883d82d8c
---

 .../gui/qt4/components/playlist/standardpanel.cpp  |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 65e4e51..de809f2 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -20,6 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -252,8 +253,7 @@ void StandardPLPanel::popupAdd()
     if( currentRootId == THEPL->p_local_category->i_id ||
         currentRootId == THEPL->p_local_onelevel->i_id )
     {
-        popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(simplePLAppendDialog()));
-        popup.addAction( qtr(I_PL_ADVADD), THEDP, SLOT(PLAppendDialog()) );
+        popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(PLAppendDialog()) );
         popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) );
     }
     else if( ( THEPL->p_ml_category &&
@@ -261,8 +261,7 @@ void StandardPLPanel::popupAdd()
              ( THEPL->p_ml_onelevel &&
                 currentRootId == THEPL->p_ml_onelevel->i_id ) )
     {
-        popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(simpleMLAppendDialog()));
-        popup.addAction( qtr(I_PL_ADVADD), THEDP, SLOT( MLAppendDialog() ) );
+        popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( MLAppendDialog() ) );
         popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
     }
     popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() )