From 01efb7c0fe76b3084b4c94d7ede317b17c33a421 Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Mon, 27 Aug 2012 18:08:38 -0700
Subject: [PATCH] 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                                           | 1 +
 {src/client => desktop}/CMakeLists.txt                   | 2 +-
 {src/client/misc => desktop}/geary.desktop               | 0
 {src/client/misc => desktop}/org.yorba.geary.gschema.xml | 0
 src/CMakeLists.txt                                       | 6 ++----
 src/client/geary-application.vala                        | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename {src/client => desktop}/CMakeLists.txt (96%)
 rename {src/client/misc => desktop}/geary.desktop (100%)
 rename {src/client/misc => desktop}/org.yorba.geary.gschema.xml (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffcb3829..033b84e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ add_subdirectory(sql)
 add_subdirectory(theming)
 add_subdirectory(ui)
 add_subdirectory(help)
+add_subdirectory(desktop)
 
 #
 # Uninstall target
diff --git a/src/client/CMakeLists.txt b/desktop/CMakeLists.txt
similarity index 96%
rename from src/client/CMakeLists.txt
rename to desktop/CMakeLists.txt
index 6136713f..9bb4376c 100644
--- a/src/client/CMakeLists.txt
+++ b/desktop/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 install(
     FILES
-        misc/geary.desktop
+        geary.desktop
     DESTINATION
         share/applications
 )
diff --git a/src/client/misc/geary.desktop b/desktop/geary.desktop
similarity index 100%
rename from src/client/misc/geary.desktop
rename to desktop/geary.desktop
diff --git a/src/client/misc/org.yorba.geary.gschema.xml b/desktop/org.yorba.geary.gschema.xml
similarity index 100%
rename from src/client/misc/org.yorba.geary.gschema.xml
rename to desktop/org.yorba.geary.gschema.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eea8e1b8..6892668c 100644
--- a/src/CMakeLists.txt
+++ b/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
diff --git a/src/client/geary-application.vala b/src/client/geary-application.vala
index 18ce14c6..5b1ee3b3 100644
--- a/src/client/geary-application.vala
+++ b/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;
     }