Commit 1600a925 authored by Rafaël Carré's avatar Rafaël Carré

Fixes commit [21610]

parent c0fa5361
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#ifndef WIN32 #ifndef WIN32
# include <signal.h> # include <signal.h>
# include <QStyle>
#endif #endif
#include <QApplication> #include <QApplication>
...@@ -197,20 +198,27 @@ static void Init( intf_thread_t *p_intf ) ...@@ -197,20 +198,27 @@ static void Init( intf_thread_t *p_intf )
char *argv[] = { dummy }; char *argv[] = { dummy };
int argc = 1; int argc = 1;
Q_INIT_RESOURCE( vlc );
QApplication *app = new QApplication( argc, argv , true );
app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
p_intf->p_sys->p_app = app;
#ifndef WIN32 #ifndef WIN32
/* unblocks SIGCHLD as that makes the app hang when cleanlooks style is used /* Ugly klugde
* ( when launching gconftool-2 to get the icon theme ) */ * Remove SIGCHLD from the ignored signal the time to initialise
* Qt because it executes gconftool-2 to get the icon theme when using
* cleanlooks theme. */
sigset_t set; sigset_t set;
sigemptyset( &set ); sigemptyset( &set );
sigaddset( &set, SIGCHLD ); sigaddset( &set, SIGCHLD );
pthread_sigmask( SIG_UNBLOCK, &set, NULL ); pthread_sigmask( SIG_UNBLOCK, &set, NULL );
#endif
Q_INIT_RESOURCE( vlc ); /* that forces the execution of QCleanlooksStylePrivate::lookupIconTheme() */
QApplication *app = new QApplication( argc, argv , true ); app->style()->standardIcon( QStyle::SP_TitleBarMenuButton );
app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
p_intf->p_sys->p_app = app; pthread_sigmask( SIG_BLOCK, &set, NULL );
#endif
// Initialize timers // Initialize timers
DialogsProvider::getInstance( p_intf ); DialogsProvider::getInstance( p_intf );
......
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