GNOME.org
 

[geary] Reorganize src/client: Closes bug #713873

commit a95bc467fca1917b728fd49881f2e3d9932f495b
Author: Jim Nelson <jim yorba org>
Date:   Mon Nov 25 17:32:51 2013 -0800

    Reorganize src/client: Closes bug #713873
    
    This is purely code file deletion and moving with those changes
    reflected in CMakeLists.txt.  The .gitignore change should've
    happened some time back when we removed the DBus server app.
    
    This change is to make the client source code a bit more logical
    and hopefully make it easy for contributors to drill down and find
    the module they want to work on.
    
    In addition, unused client code was deleted.  src/common was intended
    to be code common to the various apps built here, but since that never
    panned out, it was moved into the client base.

 .gitignore                                         |    2 -
 src/CMakeLists.txt                                 |   64 +++++++++-----------
 .../{ => application}/geary-application.vala       |    0
 src/client/{ => application}/geary-args.vala       |    0
 src/client/{ => application}/geary-config.vala     |    0
 src/client/{ => application}/geary-controller.vala |    0
 src/client/{ => application}/main.vala             |    0
 src/client/{ => application}/secret-mediator.vala  |    0
 .../conversation-find-bar.vala                     |    0
 src/client/{ui => components}/count-badge.vala     |    0
 src/client/{ui => components}/folder-menu.vala     |    0
 src/client/{ui => components}/icon-factory.vala    |    0
 src/client/{ui => components}/main-toolbar.vala    |    0
 src/client/{ui => components}/main-window.vala     |    0
 .../{ui => components}/monitored-progress-bar.vala |    0
 .../{ui => components}/monitored-spinner.vala      |    0
 src/client/{ui => components}/pill-toolbar.vala    |    0
 src/client/{ui => components}/status-bar.vala      |    0
 src/client/{ui => components}/stock.vala           |    0
 .../conversation-list-cell-renderer.vala           |    0
 .../conversation-list-store.vala                   |    0
 .../conversation-list-view.vala                    |    0
 .../formatted-conversation-data.vala               |    0
 .../conversation-viewer.vala                       |    0
 .../conversation-web-view.vala                     |    0
 .../util/util-international.vala}                  |    0
 .../util/util-yorba-application.vala}              |    0
 src/common/common-arrays.vala                      |   36 -----------
 src/common/common-async.vala                       |   53 ----------------
 29 files changed, 29 insertions(+), 126 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 444284b..7bd279e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,8 @@
 /.stamp
 build/
 /geary
-/gearyd
 /geary-mailer
 /geary-console
-/geary-db-test
 *.xz
 *.swp
 bindings/vapi/gmime-2.6/gmime-2.6.gi
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6853191..204836f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,13 +1,6 @@
 # Geary build script
 # Copyright 2011-2013 Yorba Foundation
 
-set(COMMON_SRC
-common/common-arrays.vala
-common/common-async.vala
-common/common-international.vala
-common/common-yorba-application.vala
-)
-
 set(ENGINE_SRC
 engine/abstract/geary-abstract-account.vala
 engine/abstract/geary-abstract-folder.vala
@@ -297,12 +290,12 @@ engine/util/util-trillian.vala
 )
 
 set(CLIENT_SRC
-client/geary-application.vala
-client/geary-args.vala
-client/geary-config.vala
-client/geary-controller.vala
-client/main.vala
-client/secret-mediator.vala
+client/application/geary-application.vala
+client/application/geary-args.vala
+client/application/geary-config.vala
+client/application/geary-controller.vala
+client/application/main.vala
+client/application/secret-mediator.vala
 
 client/accounts/account-dialog.vala
 client/accounts/account-dialog-account-list-pane.vala
@@ -315,6 +308,18 @@ client/accounts/account-spinner-page.vala
 client/accounts/add-edit-page.vala
 client/accounts/login-dialog.vala
 
+client/components/conversation-find-bar.vala
+client/components/count-badge.vala
+client/components/folder-menu.vala
+client/components/icon-factory.vala
+client/components/main-toolbar.vala
+client/components/main-window.vala
+client/components/monitored-progress-bar.vala
+client/components/monitored-spinner.vala
+client/components/pill-toolbar.vala
+client/components/status-bar.vala
+client/components/stock.vala
+
 client/composer/composer-toolbar.vala
 client/composer/composer-window.vala
 client/composer/contact-entry-completion.vala
@@ -322,6 +327,14 @@ client/composer/contact-list-store.vala
 client/composer/email-entry.vala
 client/composer/webview-edit-fixer.vala
 
+client/conversation-list/conversation-list-cell-renderer.vala
+client/conversation-list/conversation-list-store.vala
+client/conversation-list/conversation-list-view.vala
+client/conversation-list/formatted-conversation-data.vala
+
+client/conversation-viewer/conversation-viewer.vala
+client/conversation-viewer/conversation-web-view.vala
+
 client/dialogs/alert-dialog.vala
 client/dialogs/attachment-dialog.vala
 client/dialogs/password-dialog.vala
@@ -337,8 +350,6 @@ client/folder-list/folder-list-inbox-folder-entry.vala
 client/folder-list/folder-list-search-branch.vala
 client/folder-list/folder-list-special-grouping.vala
 
-client/models/conversation-list-store.vala
-
 client/notification/libmessagingmenu.vala
 client/notification/libnotify.vala
 client/notification/new-messages-indicator.vala
@@ -352,30 +363,14 @@ client/sidebar/sidebar-count-cell-renderer.vala
 client/sidebar/sidebar-entry.vala
 client/sidebar/sidebar-tree.vala
 
-client/ui/count-badge.vala
-client/ui/folder-menu.vala
-client/ui/icon-factory.vala
-client/ui/main-toolbar.vala
-client/ui/main-window.vala
-client/ui/monitored-progress-bar.vala
-client/ui/monitored-spinner.vala
-client/ui/pill-toolbar.vala
-client/ui/status-bar.vala
-client/ui/stock.vala
-
 client/util/util-date.vala
 client/util/util-email.vala
 client/util/util-files.vala
 client/util/util-gravatar.vala
 client/util/util-gtk.vala
+client/util/util-international.vala
 client/util/util-webkit.vala
-
-client/views/formatted-conversation-data.vala
-client/views/conversation-find-bar.vala
-client/views/conversation-list-cell-renderer.vala
-client/views/conversation-list-view.vala
-client/views/conversation-viewer.vala
-client/views/conversation-web-view.vala
+client/util/util-yorba-application.vala
 )
 
 set(CONSOLE_SRC
@@ -561,7 +556,6 @@ set(VALAC_OPTIONS
 #################################################
 vala_precompile(ENGINE_VALA_C geary-static
     ${ENGINE_SRC}
-    ${COMMON_SRC}
 PACKAGES
     ${CONSOLE_PACKAGES}
     ${ENGINE_PACKAGES}
@@ -607,7 +601,7 @@ add_schemas(geary ${GSETTINGS_DIR} ${CMAKE_INSTALL_PREFIX})
 
 IF (XGETTEXT_FOUND)
     MESSAGE("Creating POT file")
-    GETTEXT_CREATE_POT(${GETTEXT_PACKAGE}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${CLIENT_SRC} ${ENGINE_SRC} 
${COMMON_SRC} GLADE ${GLADE_FILES})
+    GETTEXT_CREATE_POT(${GETTEXT_PACKAGE}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${CLIENT_SRC} ${ENGINE_SRC} 
GLADE ${GLADE_FILES})
 ELSE ()
     message(STATUS "xgettext not found")
 ENDIF()
diff --git a/src/client/geary-application.vala b/src/client/application/geary-application.vala
similarity index 100%
rename from src/client/geary-application.vala
rename to src/client/application/geary-application.vala
diff --git a/src/client/geary-args.vala b/src/client/application/geary-args.vala
similarity index 100%
rename from src/client/geary-args.vala
rename to src/client/application/geary-args.vala
diff --git a/src/client/geary-config.vala b/src/client/application/geary-config.vala
similarity index 100%
rename from src/client/geary-config.vala
rename to src/client/application/geary-config.vala
diff --git a/src/client/geary-controller.vala b/src/client/application/geary-controller.vala
similarity index 100%
rename from src/client/geary-controller.vala
rename to src/client/application/geary-controller.vala
diff --git a/src/client/main.vala b/src/client/application/main.vala
similarity index 100%
rename from src/client/main.vala
rename to src/client/application/main.vala
diff --git a/src/client/secret-mediator.vala b/src/client/application/secret-mediator.vala
similarity index 100%
rename from src/client/secret-mediator.vala
rename to src/client/application/secret-mediator.vala
diff --git a/src/client/views/conversation-find-bar.vala b/src/client/components/conversation-find-bar.vala
similarity index 100%
rename from src/client/views/conversation-find-bar.vala
rename to src/client/components/conversation-find-bar.vala
diff --git a/src/client/ui/count-badge.vala b/src/client/components/count-badge.vala
similarity index 100%
rename from src/client/ui/count-badge.vala
rename to src/client/components/count-badge.vala
diff --git a/src/client/ui/folder-menu.vala b/src/client/components/folder-menu.vala
similarity index 100%
rename from src/client/ui/folder-menu.vala
rename to src/client/components/folder-menu.vala
diff --git a/src/client/ui/icon-factory.vala b/src/client/components/icon-factory.vala
similarity index 100%
rename from src/client/ui/icon-factory.vala
rename to src/client/components/icon-factory.vala
diff --git a/src/client/ui/main-toolbar.vala b/src/client/components/main-toolbar.vala
similarity index 100%
rename from src/client/ui/main-toolbar.vala
rename to src/client/components/main-toolbar.vala
diff --git a/src/client/ui/main-window.vala b/src/client/components/main-window.vala
similarity index 100%
rename from src/client/ui/main-window.vala
rename to src/client/components/main-window.vala
diff --git a/src/client/ui/monitored-progress-bar.vala b/src/client/components/monitored-progress-bar.vala
similarity index 100%
rename from src/client/ui/monitored-progress-bar.vala
rename to src/client/components/monitored-progress-bar.vala
diff --git a/src/client/ui/monitored-spinner.vala b/src/client/components/monitored-spinner.vala
similarity index 100%
rename from src/client/ui/monitored-spinner.vala
rename to src/client/components/monitored-spinner.vala
diff --git a/src/client/ui/pill-toolbar.vala b/src/client/components/pill-toolbar.vala
similarity index 100%
rename from src/client/ui/pill-toolbar.vala
rename to src/client/components/pill-toolbar.vala
diff --git a/src/client/ui/status-bar.vala b/src/client/components/status-bar.vala
similarity index 100%
rename from src/client/ui/status-bar.vala
rename to src/client/components/status-bar.vala
diff --git a/src/client/ui/stock.vala b/src/client/components/stock.vala
similarity index 100%
rename from src/client/ui/stock.vala
rename to src/client/components/stock.vala
diff --git a/src/client/views/conversation-list-cell-renderer.vala 
b/src/client/conversation-list/conversation-list-cell-renderer.vala
similarity index 100%
rename from src/client/views/conversation-list-cell-renderer.vala
rename to src/client/conversation-list/conversation-list-cell-renderer.vala
diff --git a/src/client/models/conversation-list-store.vala 
b/src/client/conversation-list/conversation-list-store.vala
similarity index 100%
rename from src/client/models/conversation-list-store.vala
rename to src/client/conversation-list/conversation-list-store.vala
diff --git a/src/client/views/conversation-list-view.vala 
b/src/client/conversation-list/conversation-list-view.vala
similarity index 100%
rename from src/client/views/conversation-list-view.vala
rename to src/client/conversation-list/conversation-list-view.vala
diff --git a/src/client/views/formatted-conversation-data.vala 
b/src/client/conversation-list/formatted-conversation-data.vala
similarity index 100%
rename from src/client/views/formatted-conversation-data.vala
rename to src/client/conversation-list/formatted-conversation-data.vala
diff --git a/src/client/views/conversation-viewer.vala 
b/src/client/conversation-viewer/conversation-viewer.vala
similarity index 100%
rename from src/client/views/conversation-viewer.vala
rename to src/client/conversation-viewer/conversation-viewer.vala
diff --git a/src/client/views/conversation-web-view.vala 
b/src/client/conversation-viewer/conversation-web-view.vala
similarity index 100%
rename from src/client/views/conversation-web-view.vala
rename to src/client/conversation-viewer/conversation-web-view.vala
diff --git a/src/common/common-international.vala b/src/client/util/util-international.vala
similarity index 100%
rename from src/common/common-international.vala
rename to src/client/util/util-international.vala
diff --git a/src/common/common-yorba-application.vala b/src/client/util/util-yorba-application.vala
similarity index 100%
rename from src/common/common-yorba-application.vala
rename to src/client/util/util-yorba-application.vala
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]