From 10369cdbbb5400e78d5defabaf71a1e08e220181 Mon Sep 17 00:00:00 2001 From: Andreas Date: Wed, 30 Oct 2013 22:36:44 +0100 Subject: [PATCH] revert last commit. --- src/main.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f33ff37b9..d164a95dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -263,6 +263,14 @@ int main(int argc, char *argv[]) { QCoreApplication::setOrganizationName("Clementine"); 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); { @@ -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 // Must happen after QCoreApplication::setOrganizationName(). setenv("XDG_CONFIG_HOME", Utilities::GetConfigPath(Utilities::Path_Root).toLocal8Bit().constData(), 1);