aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2014-06-28 12:44:22 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2014-06-28 12:44:22 +0000
commit85fb2095304920e74c5dfae6bf4403aca6c30caf (patch)
tree63629e9977badbd45b55020fd3b8d263eff37e48
parent292aaf5e026170529c4011e98de9a706ff4bbc8e (diff)
downloadqmmp-85fb2095304920e74c5dfae6bf4403aca6c30caf.tar.gz
qmmp-85fb2095304920e74c5dfae6bf4403aca6c30caf.tar.bz2
qmmp-85fb2095304920e74c5dfae6bf4403aca6c30caf.zip
fixed lxde integration
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4324 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/app/lxdesupport.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app/lxdesupport.cpp b/src/app/lxdesupport.cpp
index b1cc692ca..ac814b1de 100644
--- a/src/app/lxdesupport.cpp
+++ b/src/app/lxdesupport.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2010-2013 by Ilya Kotov *
+ * Copyright (C) 2010-2014 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -25,7 +25,7 @@
void LXDESupport::load()
{
- if(qgetenv("XDG_CURRENT_DESKTOP") != "LXDE")
+ if(qgetenv("XDG_CURRENT_DESKTOP") != "LXDE" && qgetenv("DESKTOP_SESSION") != "LXDE")
return;
QString config_dir = qgetenv("XDG_CONFIG_HOME");
@@ -40,7 +40,7 @@ void LXDESupport::load()
}
QSettings lxde_settings(config_file, QSettings::IniFormat);
- QString themeName = lxde_settings.value("GTK/sNet/IconThemeName").toString();
+ QString themeName = lxde_settings.value("GTK/sNet/IconThemeName", "nuoveXT2").toString();
if(!themeName.isEmpty())
QIcon::setThemeName(themeName);
}