[vlc-devel] commit: Qt4: don' t show unsaveable playlist-enqueue option in the simple prefs ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Jan 17 20:36:03 CET 2010


vlc-1.0-bugfix | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 17 21:27:08 2010 +0200| [7bfc09431b6cc76bc9a54f3cb9d2de022d1f8b9d] | committer: Rémi Denis-Courmont 

Qt4: don't show unsaveable playlist-enqueue option in the simple prefs

This is silly. This option cannot be set from the configuration, so it
does not beling in the preferences.
(cherry picked from commit f2564c1124551c1e05098c9c756e17c0a83846b6)

Conflicts:

	modules/gui/qt4/components/simple_preferences.cpp

> http://git.videolan.org/gitweb.cgi/vlc-1.0-bugfix.git/?a=commit;h=7bfc09431b6cc76bc9a54f3cb9d2de022d1f8b9d
---

 modules/gui/qt4/components/simple_preferences.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index b4ad77f..1a861f0 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -519,8 +519,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             /* ONE INSTANCE options */
 #if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__)
             CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
+#if 0
             CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
                     EnqueueOneInterfaceMode );
+#endif
 #else
             ui.OneInterfaceBox->hide();
 #endif




More information about the vlc-devel mailing list