Commit 2c7642c9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Correctly save the privacy dialog modifications.

parent eede8ebe
......@@ -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();
......
......@@ -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++;
......
......@@ -108,7 +108,7 @@ private:
void handleMainUi( QSettings* );
void askForPrivacy();
int privacyDialog( QList<ConfigControl *> controls );
int privacyDialog( QList<ConfigControl *> *controls );
/* Systray */
void handleSystray();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment