Navigation Menu

Skip to content

Commit

Permalink
Only do setenv on linux, that's theonly time we'll have unity anyway
Browse files Browse the repository at this point in the history
  • Loading branch information
lfranchi committed Nov 11, 2011
1 parent d49a437 commit 09a7d79
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/main.cpp
Expand Up @@ -44,7 +44,15 @@ main( int argc, char *argv[] )
AEInstallEventHandler( 'GURL', 'GURL', h, 0, false );
#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);
UbuntuUnityHack hack;
#endif

TomahawkApp a( argc, argv );
new BreakPad( QDir::tempPath() );
Expand All @@ -61,14 +69,6 @@ main( int argc, char *argv[] )
translator.load( QString( ":/lang/tomahawk_" ) + locale );
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 )
{
QString arg = a.arguments()[ 1 ];
Expand Down

0 comments on commit 09a7d79

Please sign in to comment.