[vlc-devel] commit: Qt4: remove privacy dialog on Qt4 ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Oct 31 16:17:26 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 31 17:12:45 2009 +0200| [4452e098d6b8533e06277bab25781f5de9f2dccc] | committer: Rémi Denis-Courmont 

Qt4: remove privacy dialog on Qt4

Unparented dialogs are not supported by the window manager. This was
causing a deadlock during VLC startup (There may be other cases left).

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

 modules/gui/qt4/main_interface.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 986d9ae..05359a0 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -590,6 +590,7 @@ inline void MainInterface::initSystray()
 
 inline void MainInterface::askForPrivacy()
 {
+#ifndef HAVE_MAEMO
     /**
      * Ask for the network policy on FIRST STARTUP
      **/
@@ -610,6 +611,7 @@ inline void MainInterface::askForPrivacy()
             config_SaveConfigFile( p_intf, NULL );
         }
     }
+#endif
 }
 
 int MainInterface::privacyDialog( QList<ConfigControl *> *controls )




More information about the vlc-devel mailing list