[vlc-commits] Qt4: don't ruin RC interface fallback when preferences are saved

[Rémi Denis-Courmont]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 15 20:59:45 2011 +0200| [d897d7f02fe5b37abc5e6aaead9bcc1737ddd39a] | committer: Rémi Denis-Courmont

Qt4: don't ruin RC interface fallback when preferences are saved

With just "skins" and "qt", only those specific interfaces would be
probed. Thus VLC could not be started from X-less command line.
(cherry picked from commit 727b24988dd766eac2f8a63f93cf841aba826a92)

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

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

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index cdf76b2..1c0ac7b 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -801,9 +801,10 @@ void SPrefsPanel::apply()
     case SPrefsInterface:
     {
         if( qobject_cast<QRadioButton *>(optionWidgets[skinRB])->isChecked() )
-            config_PutPsz( p_intf, "intf", "skins2" );
-        if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
-            config_PutPsz( p_intf, "intf", "qt" );
+            config_PutPsz( p_intf, "intf", "skins2,any" );
+        else
+        //if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
+            config_PutPsz( p_intf, "intf", "" );
         if( qobject_cast<QComboBox *>(optionWidgets[styleCB]) )
             getSettings()->setValue( "MainWindow/QtStyle",
                 qobject_cast<QComboBox *>(optionWidgets[styleCB])->currentText() );