Correctly save the privacy dialog modifications.

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 20190d1dc13f7c27f952f056823b3eb94c69659e..837e903811bb25121c2f59689c1bdabcc95d1ec9 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -241,10 +241,10 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     p_update = update_New( p_intf );
     b_checked = false;
 
-    setMinimumSize( 300, 100 );
+    setMinimumSize( 300, 300 );
     setMaximumSize( 400, 300 );
 
-    readSettings( "Update", QSize( 300, 100 ) );
+    readSettings( "Update", QSize( 300, 250 ) );
 
     /* Check for updates */
     UpdateOrDownload();

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 38b6feb4a1c2fa8856b423613209d9f96a46fad3..7846807eb9e0a0018586fcafd9c418ccdf236a58 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -449,9 +449,10 @@ inline void MainInterface::askForPrivacy()
     if( config_GetInt( p_intf, "qt-privacy-ask") )
     {
         QList<ConfigControl *> controls;
-        if( privacyDialog( controls ) == QDialog::Accepted )
+        if( privacyDialog( &controls ) == QDialog::Accepted )
         {
             QList<ConfigControl *>::Iterator i;
+            msg_Dbg( p_intf, "coin coin %i", controls.size() );
             for(  i = controls.begin() ; i != controls.end() ; i++ )
             {
                 ConfigControl *c = qobject_cast<ConfigControl *>(*i);
@@ -465,7 +466,7 @@ inline void MainInterface::askForPrivacy()
     }
 }
 
-int MainInterface::privacyDialog( QList<ConfigControl *> controls )
+int MainInterface::privacyDialog( QList<ConfigControl *> *controls )
 {
     QDialog *privacy = new QDialog();
 
@@ -505,7 +506,7 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
     {                                                             \
         control =  new type ## ConfigControl( VLC_OBJECT(p_intf), \
                 p_config, options, false, optionsLayout, line );  \
-        controls.append( control );                               \
+        controls->append( control );                               \
     }
 
 #define CONFIG_GENERIC_NOBOOL( option, type )                     \
@@ -514,7 +515,7 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
     {                                                             \
         control =  new type ## ConfigControl( VLC_OBJECT(p_intf), \
                 p_config, options, optionsLayout, line );  \
-        controls.append( control );                               \
+        controls->append( control );                               \
     }
 
     CONFIG_GENERIC( "album-art", IntegerList ); line++;

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 4f953df1411d116fc568fb4db9dc5144ccf99d5b..d4acacc78202dadd4be8b88fcf4051000c226193 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -108,7 +108,7 @@ private:
 
     void handleMainUi( QSettings* );
     void askForPrivacy();
-    int  privacyDialog( QList<ConfigControl *> controls );
+    int  privacyDialog( QList<ConfigControl *> *controls );
 
     /* Systray */
     void handleSystray();