From: Rémi Denis-Courmont <rem@videolan.org>
Date: Tue, 18 Mar 2008 19:37:19 +0000 (+0200)
Subject: Remove security-policy UI
X-Git-Tag: 0.9.0-test0~2015
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2db278fa3a9a53f1ab026acfd83672a405cb2e9f;p=vlc

Remove security-policy UI
---

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 69a19a8e94..8e850c5036 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -444,8 +444,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
                                                       artFetcher );
             CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
-            CONFIG_GENERIC( "security-policy", IntegerList,
-                            ui.netPolicyLabel, netPolicyBox );
 
             /* UPDATE options */
 #ifdef UPDATE_CHECK
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index b51980c8ff..490eb8083e 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -537,7 +537,6 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
     CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
     CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++;
 #endif
-    CONFIG_GENERIC( "security-policy", IntegerList ); line++;
 
     QPushButton *ok = new QPushButton( qtr( "Ok" ) );
 
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 23152ddb38..8a692841c6 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -215,7 +215,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
+   <item row="2" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
       <string>_("Privacy / Network Interaction")</string>
@@ -255,16 +255,6 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="netPolicyLabel" >
-        <property name="text" >
-         <string>_("Network policy")</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QComboBox" name="netPolicyBox" />
-      </item>
      </layout>
     </widget>
    </item>