Move GnomeShortcutHandler into linux/

src/tomahawk/CMakeLists.linux.cmake

@@ -7,7 +7,14 @@ ENDFOREACH( _file )
 
 IF( WITH_UPOWER )
     qt_add_dbus_interface(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/org.freedesktop.UPower.xml" linux/UPowerProxy)
+    SET( tomahawkSources ${tomahawkSources} linux/UPowerHandler.cpp  )
 ENDIF( WITH_UPOWER )
+
+IF( WITH_GNOMESHORTCUTHANDLER )
+    qt_add_dbus_interface(tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/linux/GnomeSettingsDaemonMediaKeys.xml" linux/GnomeSettingsDaemonMediaKeysProxy)
+    SET( tomahawkSources ${tomahawkSources} linux/GnomeShortcutHandler.cpp )
+ENDIF( WITH_GNOMESHORTCUTHANDLER )
+
 ADD_SUBDIRECTORY( "${CMAKE_CURRENT_SOURCE_DIR}/linux" )
 
 INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon.svg RENAME tomahawk.svg  DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )

src/tomahawk/CMakeLists.txt

@@ -26,11 +26,6 @@ SET( tomahawkSources ${tomahawkSources}
      main.cpp
 )
 
-IF( WITH_GNOMESHORTCUTHANDLER )
-    SET( tomahawkSources ${tomahawkSources} GnomeShortcutHandler.cpp )
-    qt_add_dbus_interface(tomahawkSources GnomeSettingsDaemonMediaKeys.xml GnomeSettingsDaemonMediaKeysProxy)
-ENDIF( WITH_GNOMESHORTCUTHANDLER )
-
 IF( LIBLASTFM_FOUND )
     SET(tomahawkSources ${tomahawkSources}
         Scrobbler.cpp

src/tomahawk/TomahawkApp.cpp

@@ -87,6 +87,10 @@
     #include "linux/UPowerHandler.h"
 #endif
 
+#ifdef WITH_GNOMESHORTCUTHANDLER
+    #include "linux/GnomeShortcutHandler.h"
+#endif
+
 #ifndef ENABLE_HEADLESS
     #include <QMessageBox>
 #endif
@@ -98,10 +102,6 @@
 #include <sys/sysctl.h>
 #endif
 
-#ifdef WITH_GNOMESHORTCUTHANDLER
-#include "GnomeShortcutHandler.h"
-#endif
-
 #include <QPluginLoader>
 #include <QDir>
 #include <QMetaType>

src/tomahawk/linux/CMakeLists.txt

@@ -1,3 +0,0 @@
-IF( WITH_UPOWER )
-    SET( tomahawkSources ${tomahawkSources} "${CMAKE_CURRENT_SOURCE_DIR}/UPowerHandler.cpp" PARENT_SCOPE )
-ENDIF( WITH_UPOWER )

src/tomahawk/linux/GnomeShortcutHandler.h

@@ -20,7 +20,7 @@
 #define GNOMESHORTCUTHANDLER_H
 
 #include "ShortcutHandler.h"
-#include "GnomeSettingsDaemonMediaKeysProxy.h"
+#include "linux/GnomeSettingsDaemonMediaKeysProxy.h"
 
 #include <QObject>
 
@@ -38,7 +38,6 @@ public:
     static const char* kGsdPath;
     static const char* kGsdInterface;
 
-
 public slots:
     void RegisterFinished(QDBusPendingCallWatcher* watcher);
     void GnomeMediaKeyPressed( const QString& application, const QString& key );

src/tomahawk/linux/UPowerHandler.cpp

@@ -17,8 +17,8 @@
  */
 
 #include "accounts/AccountManager.h"
-#include "UPowerHandler.h"
 #include "utils/Logger.h"
+#include "UPowerHandler.h"
 
 #include <QTimer>