Disable "qt-updates-notif" when update checking is not enabled

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index a7827c0126ece9e3691c0bf58b53b1da1d37c941..8c6eaba67726e59fa845953fd31ada71f1e22fa6 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -421,7 +421,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
             CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher );
             CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
+#ifdef UPDATE_CHECK
             CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates );
+#endif
             CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
             CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo );
             CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 6be82ff13334ce2445155c6fad24e3607df032c6..0c8022d086018decd47b3c0dc0b6bb1df3108e3d 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -514,8 +514,9 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
 
     CONFIG_GENERIC( "album-art", IntegerList ); line++;
     CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++;
+#ifdef UPDATE_CHECK
     CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool );
-
+#endif
     QPushButton *ok = new QPushButton( qtr( "Ok" ) );
 
     gLayout->addWidget( ok, 2, 2 );

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 4db396fdf38830273069e6bd1bf531600b08b9fc..6d87172bcc254b6d681a50e0d1d8dcbc1ac421bb 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -104,7 +104,7 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define ERROR_TEXT N_( "Show unimportant error and warnings dialogs" )
 #define MINIMAL_TEXT N_( "Start in minimal view (menus hidden)." )
 
-#define UPDATER_TEXT N_( "Activate the new updates notification" )
+#define UPDATER_TEXT N_( "Activate the updates availability notification" )
 #define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \
                             "versions of the software. It runs once a week." )
 
@@ -165,8 +165,10 @@ vlc_module_begin();
                 ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
         add_bool( "qt-error-dialogs", VLC_TRUE, NULL, ERROR_TEXT,
                 ERROR_TEXT, VLC_FALSE );
+#ifdef UPDATE_CHECK
         add_bool( "qt-updates-notif", VLC_TRUE, NULL, UPDATER_TEXT,
                 UPDATER_LONGTEXT, VLC_FALSE );
+#endif
 
         add_integer( "qt-pl-showflags",
                 VLC_META_ENGINE_ARTIST|VLC_META_ENGINE_TITLE|