[geary/pantheon_mail: 14/32] move data into data directory



commit cb17f0e973bb41124761cceda5b29ebba57cdd62
Author: Daniel Foré <daniel elementary io>
Date:   Thu Nov 19 19:19:18 2015 -0800

    move data into data directory

 CMakeLists.txt                                     |    5 +----
 {desktop => data}/CMakeLists.txt                   |    4 ++++
 {desktop => data}/geary-attach                     |    0
 {desktop => data}/geary-attach.contract.in         |    0
 {desktop => data}/geary-autostart.desktop.in       |    0
 {desktop => data}/geary.appdata.xml                |    0
 {desktop => data}/geary.desktop.in                 |    0
 {icons => data/icons}/CMakeLists.txt               |    0
 .../format-text-clear-formatting-symbolic.svg      |    0
 {icons => data/icons}/mail-archive-symbolic.svg    |    0
 {icons => data/icons}/window-pop-out-symbolic.svg  |    0
 {desktop => data}/org.yorba.geary.gschema.xml      |    0
 {theming => data/theming}/CMakeLists.txt           |    0
 {theming => data/theming}/message-viewer.css       |    0
 {theming => data/theming}/message-viewer.html      |    0
 {ui => data/ui}/CMakeLists.txt                     |    0
 {ui => data/ui}/accelerators.ui                    |    0
 {ui => data/ui}/account_cannot_remove.glade        |    0
 {ui => data/ui}/account_list.glade                 |    0
 {ui => data/ui}/account_spinner.glade              |    0
 {ui => data/ui}/app_menu.interface                 |    0
 {ui => data/ui}/certificate_warning_dialog.glade   |    0
 {ui => data/ui}/composer.glade                     |    0
 {ui => data/ui}/composer_accelerators.ui           |    0
 {ui => data/ui}/edit_alternate_emails.glade        |    0
 {ui => data/ui}/find_bar.glade                     |    0
 {ui => data/ui}/login.glade                        |    0
 {ui => data/ui}/message.glade                      |    0
 {ui => data/ui}/password-dialog.glade              |    0
 {ui => data/ui}/preferences.glade                  |    0
 {ui => data/ui}/remove_confirm.glade               |    0
 {ui => data/ui}/toolbar_empty_menu.ui              |    0
 {ui => data/ui}/toolbar_mark_menu.ui               |    0
 {ui => data/ui}/upgrade_dialog.glade               |    0
 34 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 342e60c..8b60ad4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,12 +112,9 @@ add_custom_target(
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
 
-add_subdirectory(desktop)
+add_subdirectory(data)
 add_subdirectory(help)
-add_subdirectory(icons)
 add_subdirectory(po)
 add_subdirectory(sql)
 add_subdirectory(src)
-add_subdirectory(theming)
-add_subdirectory(ui)
 
diff --git a/desktop/CMakeLists.txt b/data/CMakeLists.txt
similarity index 96%
rename from desktop/CMakeLists.txt
rename to data/CMakeLists.txt
index 127911f..cc3e9d2 100644
--- a/desktop/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -62,3 +62,7 @@ else (DISABLE_CONTRACT)
     endif (INTLTOOL_MERGE_FOUND)
     install (PROGRAMS geary-attach DESTINATION bin)
 endif (DISABLE_CONTRACT)
+
+add_subdirectory(icons)
+add_subdirectory(theming)
+add_subdirectory(ui)
diff --git a/desktop/geary-attach b/data/geary-attach
similarity index 100%
rename from desktop/geary-attach
rename to data/geary-attach
diff --git a/desktop/geary-attach.contract.in b/data/geary-attach.contract.in
similarity index 100%
rename from desktop/geary-attach.contract.in
rename to data/geary-attach.contract.in
diff --git a/desktop/geary-autostart.desktop.in b/data/geary-autostart.desktop.in
similarity index 100%
rename from desktop/geary-autostart.desktop.in
rename to data/geary-autostart.desktop.in
diff --git a/desktop/geary.appdata.xml b/data/geary.appdata.xml
similarity index 100%
rename from desktop/geary.appdata.xml
rename to data/geary.appdata.xml
diff --git a/desktop/geary.desktop.in b/data/geary.desktop.in
similarity index 100%
rename from desktop/geary.desktop.in
rename to data/geary.desktop.in
diff --git a/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
similarity index 100%
rename from icons/CMakeLists.txt
rename to data/icons/CMakeLists.txt
diff --git a/icons/format-text-remove-symbolic.svg b/data/icons/format-text-clear-formatting-symbolic.svg
similarity index 100%
rename from icons/format-text-remove-symbolic.svg
rename to data/icons/format-text-clear-formatting-symbolic.svg
diff --git a/icons/mail-archive-symbolic.svg b/data/icons/mail-archive-symbolic.svg
similarity index 100%
rename from icons/mail-archive-symbolic.svg
rename to data/icons/mail-archive-symbolic.svg
diff --git a/icons/window-pop-out-symbolic.svg b/data/icons/window-pop-out-symbolic.svg
similarity index 100%
rename from icons/window-pop-out-symbolic.svg
rename to data/icons/window-pop-out-symbolic.svg
diff --git a/desktop/org.yorba.geary.gschema.xml b/data/org.yorba.geary.gschema.xml
similarity index 100%
rename from desktop/org.yorba.geary.gschema.xml
rename to data/org.yorba.geary.gschema.xml
diff --git a/theming/CMakeLists.txt b/data/theming/CMakeLists.txt
similarity index 100%
rename from theming/CMakeLists.txt
rename to data/theming/CMakeLists.txt
diff --git a/theming/message-viewer.css b/data/theming/message-viewer.css
similarity index 100%
rename from theming/message-viewer.css
rename to data/theming/message-viewer.css
diff --git a/theming/message-viewer.html b/data/theming/message-viewer.html
similarity index 100%
rename from theming/message-viewer.html
rename to data/theming/message-viewer.html
diff --git a/ui/CMakeLists.txt b/data/ui/CMakeLists.txt
similarity index 100%
rename from ui/CMakeLists.txt
rename to data/ui/CMakeLists.txt
diff --git a/ui/accelerators.ui b/data/ui/accelerators.ui
similarity index 100%
rename from ui/accelerators.ui
rename to data/ui/accelerators.ui
diff --git a/ui/account_cannot_remove.glade b/data/ui/account_cannot_remove.glade
similarity index 100%
rename from ui/account_cannot_remove.glade
rename to data/ui/account_cannot_remove.glade
diff --git a/ui/account_list.glade b/data/ui/account_list.glade
similarity index 100%
rename from ui/account_list.glade
rename to data/ui/account_list.glade
diff --git a/ui/account_spinner.glade b/data/ui/account_spinner.glade
similarity index 100%
rename from ui/account_spinner.glade
rename to data/ui/account_spinner.glade
diff --git a/ui/app_menu.interface b/data/ui/app_menu.interface
similarity index 100%
rename from ui/app_menu.interface
rename to data/ui/app_menu.interface
diff --git a/ui/certificate_warning_dialog.glade b/data/ui/certificate_warning_dialog.glade
similarity index 100%
rename from ui/certificate_warning_dialog.glade
rename to data/ui/certificate_warning_dialog.glade
diff --git a/ui/composer.glade b/data/ui/composer.glade
similarity index 100%
rename from ui/composer.glade
rename to data/ui/composer.glade
diff --git a/ui/composer_accelerators.ui b/data/ui/composer_accelerators.ui
similarity index 100%
rename from ui/composer_accelerators.ui
rename to data/ui/composer_accelerators.ui
diff --git a/ui/edit_alternate_emails.glade b/data/ui/edit_alternate_emails.glade
similarity index 100%
rename from ui/edit_alternate_emails.glade
rename to data/ui/edit_alternate_emails.glade
diff --git a/ui/find_bar.glade b/data/ui/find_bar.glade
similarity index 100%
rename from ui/find_bar.glade
rename to data/ui/find_bar.glade
diff --git a/ui/login.glade b/data/ui/login.glade
similarity index 100%
rename from ui/login.glade
rename to data/ui/login.glade
diff --git a/ui/message.glade b/data/ui/message.glade
similarity index 100%
rename from ui/message.glade
rename to data/ui/message.glade
diff --git a/ui/password-dialog.glade b/data/ui/password-dialog.glade
similarity index 100%
rename from ui/password-dialog.glade
rename to data/ui/password-dialog.glade
diff --git a/ui/preferences.glade b/data/ui/preferences.glade
similarity index 100%
rename from ui/preferences.glade
rename to data/ui/preferences.glade
diff --git a/ui/remove_confirm.glade b/data/ui/remove_confirm.glade
similarity index 100%
rename from ui/remove_confirm.glade
rename to data/ui/remove_confirm.glade
diff --git a/ui/toolbar_empty_menu.ui b/data/ui/toolbar_empty_menu.ui
similarity index 100%
rename from ui/toolbar_empty_menu.ui
rename to data/ui/toolbar_empty_menu.ui
diff --git a/ui/toolbar_mark_menu.ui b/data/ui/toolbar_mark_menu.ui
similarity index 100%
rename from ui/toolbar_mark_menu.ui
rename to data/ui/toolbar_mark_menu.ui
diff --git a/ui/upgrade_dialog.glade b/data/ui/upgrade_dialog.glade
similarity index 100%
rename from ui/upgrade_dialog.glade
rename to data/ui/upgrade_dialog.glade


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]