Fixed Cairo-Dock on Ubuntu Vivid with GTK 3.14

data/desktop-manager/gnome-session-3.10/CMakeLists.txt

@@ -3,6 +3,7 @@
 # Nautilus or GThumb interface which are not really compatible with Compiz)
 
 set (DESKTOP_NAME "GNOME")
+set (SETTINGS_DAEMON "gnome")
 
 get_filename_component(ISSUE_NET "/etc/issue.net" ABSOLUTE)
 if (EXISTS ${ISSUE_NET})
@@ -12,14 +13,18 @@ if (EXISTS ${ISSUE_NET})
 		message(STATUS ${DISTRO_ID})
 		if ("${DISTRO_ID}" STREQUAL "Ubuntu")
 			set (DESKTOP_NAME "Unity")
+			if(${GTK_MAJOR} GREATER 3 OR (${GTK_MAJOR} EQUAL 3 AND ${GTK_MINOR} GREATER 12))
+				set (SETTINGS_DAEMON "unity")
+			endif()
 		endif()
 	endif()
 endif()
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cairo-dock.session.in ${CMAKE_CURRENT_BINARY_DIR}/cairo-dock.session)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cairo-dock.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/cairo-dock.desktop)
 
 install (FILES
-	${CMAKE_CURRENT_SOURCE_DIR}/cairo-dock.desktop
+	${CMAKE_CURRENT_BINARY_DIR}/cairo-dock.desktop
 	DESTINATION /usr/share/xsessions)
 
 install (FILES

data/desktop-manager/gnome-session-3.10/cairo-dock.desktop → data/desktop-manager/gnome-session-3.10/cairo-dock.desktop.in

@@ -5,3 +5,4 @@ Exec=gnome-session --session=cairo-dock
 TryExec=gnome-session
 Icon=
 Type=Application
+DesktopNames=@DESKTOP_NAME@

data/desktop-manager/gnome-session-3.10/cairo-dock.session.in

@@ -1,4 +1,4 @@
 [GNOME Session]
 Name=Cairo-Dock
-RequiredComponents=gnome-settings-daemon;compiz;cairo-dock;
+RequiredComponents=@SETTINGS_DAEMON@-settings-daemon;compiz;cairo-dock;
 DesktopName=@DESKTOP_NAME@