Merge lp:~elementary-pantheon/switchboard-plug-pantheon-shell/organize-source into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Cody Garver
Approved revision: 544
Merged at revision: 544
Proposed branch: lp:~elementary-pantheon/switchboard-plug-pantheon-shell/organize-source
Merge into: lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk
Diff against target: 33 lines (+6/-6)
1 file modified
src/CMakeLists.txt (+6/-6)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-pantheon-shell/organize-source
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+316520@code.launchpad.net

Commit message

Restructure src directory

Description of the change

Organize into standard directories as we use them in other projects

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2016-12-21 18:48:26 +0000
3+++ src/CMakeLists.txt 2017-02-07 01:45:32 +0000
4@@ -19,15 +19,15 @@
5 include (ValaPrecompile)
6 # Add all your vala files and requires packages to the List below to include them in the build
7 vala_precompile (VALA_C ${PLUGNAME}
8- Dock.vala
9- HotCorners.vala
10+ Cache.vala
11 desktop-plug.vala
12 GalaSettings.vala
13- Wallpaper.vala
14- SolidColorContainer.vala
15 SlingshotSettings.vala
16- Cache.vala
17- WallpaperContainer.vala
18+ Views/Dock.vala
19+ Views/HotCorners.vala
20+ Views/Wallpaper.vala
21+ Widgets/SolidColorContainer.vala
22+ Widgets/WallpaperContainer.vala
23 ${CMAKE_CURRENT_BINARY_DIR}/config.vala
24 PACKAGES
25 gnome-desktop-3.0
26
27=== added directory 'src/Views'
28=== renamed file 'src/Dock.vala' => 'src/Views/Dock.vala'
29=== renamed file 'src/HotCorners.vala' => 'src/Views/HotCorners.vala'
30=== renamed file 'src/Wallpaper.vala' => 'src/Views/Wallpaper.vala'
31=== added directory 'src/Widgets'
32=== renamed file 'src/SolidColorContainer.vala' => 'src/Widgets/SolidColorContainer.vala'
33=== renamed file 'src/WallpaperContainer.vala' => 'src/Widgets/WallpaperContainer.vala'

Subscribers

People subscribed via source and target branches