mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 08:34:34 +02:00
Code Issues Releases Wiki Activity

Only do setenv on linux, that's theonly time we'll have unity anyway

Browse Source
This commit is contained in:
Leo Franchi
2011-11-11 17:04:53 -05:00
parent d49a43709d
commit 09a7d790ad
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@@ -44,7 +44,15 @@ main( int argc, char *argv[] )
AEInstallEventHandler( 'GURL', 'GURL', h, 0, false ); AEInstallEventHandler( 'GURL', 'GURL', h, 0, false );
#endif #endif
// Unity hack taken from Clementine's main.cpp
#ifdef Q_OS_LINUX
// In 11.04 Ubuntu decided that the system tray should be reserved for certain
// whitelisted applications. Tomahawk will override this setting and insert
// itself into the list of whitelisted apps.
setenv("QT_X11_NO_NATIVE_MENUBAR", "1", true); setenv("QT_X11_NO_NATIVE_MENUBAR", "1", true);
UbuntuUnityHack hack;
#endif
TomahawkApp a( argc, argv ); TomahawkApp a( argc, argv );
new BreakPad( QDir::tempPath() ); new BreakPad( QDir::tempPath() );
@@ -61,14 +69,6 @@ main( int argc, char *argv[] )
translator.load( QString( ":/lang/tomahawk_" ) + locale ); translator.load( QString( ":/lang/tomahawk_" ) + locale );
a.installTranslator( &translator ); a.installTranslator( &translator );
// Unity hack taken from Clementine's main.cpp
#ifdef Q_OS_LINUX
// In 11.04 Ubuntu decided that the system tray should be reserved for certain
// whitelisted applications. Tomahawk will override this setting and insert
// itself into the list of whitelisted apps.
UbuntuUnityHack hack;
#endif
if ( argc > 1 ) if ( argc > 1 )
{ {
QString arg = a.arguments()[ 1 ]; QString arg = a.arguments()[ 1 ];