Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-19 04:52:30 +01:00
Code Issues Releases Wiki Activity

revert last commit.

Browse Source
This commit is contained in:
Andreas 2013-10-30 22:36:44 +01:00
parent 9bc605dc58
commit 10369cdbbb
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@ -263,6 +263,14 @@ int main(int argc, char *argv[]) {
QCoreApplication::setOrganizationName("Clementine"); QCoreApplication::setOrganizationName("Clementine");
QCoreApplication::setOrganizationDomain("clementine-player.org"); QCoreApplication::setOrganizationDomain("clementine-player.org");
// This makes us show up nicely in gnome-volume-control
#if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init(); // Deprecated in glib 2.36.0
#endif
g_set_application_name(QCoreApplication::applicationName().toLocal8Bit());
RegisterMetaTypes();
CommandlineOptions options(argc, argv); CommandlineOptions options(argc, argv);
{ {
@ -290,15 +298,6 @@ int main(int argc, char *argv[]) {
} }
} }
// This makes us show up nicely in gnome-volume-control
#if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init(); // Deprecated in glib 2.36.0
#endif
g_set_application_name(QCoreApplication::applicationName().toLocal8Bit());
RegisterMetaTypes();
#ifdef Q_OS_DARWIN #ifdef Q_OS_DARWIN
// Must happen after QCoreApplication::setOrganizationName(). // Must happen after QCoreApplication::setOrganizationName().
setenv("XDG_CONFIG_HOME", Utilities::GetConfigPath(Utilities::Path_Root).toLocal8Bit().constData(), 1); setenv("XDG_CONFIG_HOME", Utilities::GetConfigPath(Utilities::Path_Root).toLocal8Bit().constData(), 1);