reverted r6471

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6472 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 3 insertions, 78 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 329f2d486..c7986bf31 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -32,11 +32,10 @@ SET(app_SRCS
     main.cpp
     qmmpstarter.cpp
     lxdesupport.cpp
-    unitysupport.cpp
     qmmpapplication.cpp
 )
 
-SET(app_HDRS lxdesupport.h unitysupport.h)
+SET(app_HDRS lxdesupport.h)
 
 SET(app_RCCS images/images.qrc translations/qmmp_locales.qrc)
 
diff --git a/src/app/app.pro b/src/app/app.pro
index cf1e8e546..7b7a58e94 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -3,16 +3,14 @@ include(../../qmmp.pri)
 HEADERS += qmmpstarter.h \
            builtincommandlineoption.h \
     lxdesupport.h \
-    qmmpapplication.h \
-    unitysupport.h
+    qmmpapplication.h
 
 SOURCES += \
            qmmpstarter.cpp \
            builtincommandlineoption.cpp \
     lxdesupport.cpp \
     main.cpp \
-    qmmpapplication.cpp \
-    unitysupport.cpp
+    qmmpapplication.cpp
 
 
 
diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp
index eea15a242..ddbeabd56 100644
--- a/src/app/qmmpstarter.cpp
+++ b/src/app/qmmpstarter.cpp
@@ -38,7 +38,6 @@
 #include <qmmpui/qmmpuisettings.h>
 #include "qmmpstarter.h"
 #include "lxdesupport.h"
-#include "unitysupport.h"
 #include "builtincommandlineoption.h"
 
 #ifdef Q_OS_WIN
@@ -181,8 +180,6 @@ void QMMPStarter::startPlayer()
 
     //load lxde icons
     LXDESupport::load();
-    //Unity icons
-    UnitySupport::load();
 #endif
 
     //prepare libqmmp and libqmmpui libraries for usage
diff --git a/src/app/unitysupport.cpp b/src/app/unitysupport.cpp
deleted file mode 100644
index 40b16a45f..000000000
--- a/src/app/unitysupport.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2016 by Ilya Kotov                                      *
- *   forkotov02@hotmail.ru                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include <QProcess>
-#include <QIcon>
-#include "unitysupport.h"
-
-void UnitySupport::load()
-{
-    if(qgetenv("XDG_CURRENT_DESKTOP") != "Unity" && qgetenv("XDG_CURRENT_DESKTOP") != "GNOME")
-        return;
-
-    QProcess process;
-    process.start("dconf read /org/gnome/desktop/interface/icon-theme");
-    process.waitForFinished(3000);
-    QString iconTheme = QString::fromLocal8Bit(process.readAllStandardOutput().trimmed());
-    if(!iconTheme.isEmpty())
-        QIcon::setThemeName(iconTheme.remove("'"));
-}
diff --git a/src/app/unitysupport.h b/src/app/unitysupport.h
deleted file mode 100644
index ac49c2127..000000000
--- a/src/app/unitysupport.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2016 by Ilya Kotov                                      *
- *   forkotov02@hotmail.ru                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#ifndef UNITYSUPPORT_H
-#define UNITYSUPPORT_H
-
-/**
-    @author Ilya Kotov <forkotov02@hotmail.ru>
-*/
-class UnitySupport
-{
-public:
-    static void load();
-};
-
-#endif // UNITYSUPPORT_H