Move .desktop and GSettings schema file

Previous commit exposed a bug caused by moving some of the client's
resources in the source tree.  Since much of the client's resources
are stored off the source root directory, it doesn't make sense to
special case the .desktop file and the GSettings file and place them
in the client source itself.  This moves them out and makes the
appropriate changes in the CMake files and source code.

CMakeLists.txt

@@ -42,6 +42,7 @@ add_subdirectory(sql)
 add_subdirectory(theming)
 add_subdirectory(ui)
 add_subdirectory(help)
+add_subdirectory(desktop)
 
 #
 # Uninstall target

desktop/CMakeLists.txt

@@ -3,7 +3,7 @@
 #
 install(
     FILES
-        misc/geary.desktop
+        geary.desktop
     DESTINATION
         share/applications
 )

src/CMakeLists.txt

@@ -338,7 +338,7 @@ set(DBUSSERVICE_PACKAGES
     gee-1.0 glib-2.0
 )
 
-set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/src/client/misc)
+set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/desktop)
 
 set(CFLAGS 
     ${DEPS_CFLAGS}
@@ -408,13 +408,11 @@ add_custom_command(
 )
 
 # GSettings
-# This needs to be here and not in client/CMakeLists.txt in order for Geary to run in the build
+# This needs to be here and not in desktop/CMakeLists.txt in order for Geary to run in the build
 # directory
 include(GSettings)
 add_schemas(geary ${GSETTINGS_DIR})
 
-add_subdirectory(client)
-
 # Console app
 #################################################
 vala_precompile(CONSOLE_VALA_C geary-console

src/client/geary-application.vala

@@ -484,7 +484,7 @@ along with Geary; if not, write to the Free Software Foundation, Inc.,
     public File? get_desktop_file() {
         File desktop_file = is_installed()
             ? File.new_for_path(INSTALL_PREFIX).get_child("share/applications/geary.desktop")
-            : File.new_for_path(SOURCE_ROOT_DIR).get_child("src/client/misc/geary.desktop");
+            : File.new_for_path(SOURCE_ROOT_DIR).get_child("desktop/geary.desktop");
         
         return desktop_file.query_exists() ? desktop_file : null;
     }