Refactor directory structure a bit, preliminary to the

library split-out.

105 files changed, 15 insertions, 17 deletions

diff --git a/Makefile.am b/Makefile.am
index e53e118..3304a38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = bin data lib po shell services
+SUBDIRS = bin data lib po src service
 
 bin_SCRIPTS = 			\
 	sugar-emulator
diff --git a/configure.ac b/configure.ac
index 4c91829..7e2202e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AC_CONFIG_FILES([
 bin/sugar
 bin/sugar-control-panel
 bin/sugar-shell
-shell/config.py
+src/config.py
 ])
 
 AC_OUTPUT([
@@ -58,19 +58,18 @@ lib/sugar/clipboard/Makefile
 lib/sugar/graphics/Makefile
 lib/sugar/presence/Makefile
 lib/sugar/datastore/Makefile
-services/Makefile
-services/shell/Makefile
-shell/Makefile
-shell/controlpanel/Makefile
-shell/intro/Makefile
-shell/hardware/Makefile
-shell/view/Makefile
-shell/view/devices/Makefile
-shell/view/devices/network/Makefile
-shell/view/frame/Makefile
-shell/view/home/Makefile
-shell/model/Makefile
-shell/model/devices/Makefile
-shell/model/devices/network/Makefile
+service/Makefile
+src/Makefile
+src/controlpanel/Makefile
+src/intro/Makefile
+src/hardware/Makefile
+src/view/Makefile
+src/view/devices/Makefile
+src/view/devices/network/Makefile
+src/view/frame/Makefile
+src/view/home/Makefile
+src/model/Makefile
+src/model/devices/Makefile
+src/model/devices/network/Makefile
 po/Makefile.in
 ])
diff --git a/services/shell/Makefile.am b/service/Makefile.am
index 44496ff..44496ff 100644
--- a/services/shell/Makefile.am
+++ b/service/Makefile.am
diff --git a/services/shell/__init__.py b/service/__init__.py
index 52b82c8..52b82c8 100644
--- a/services/shell/__init__.py
+++ b/service/__init__.py
diff --git a/services/shell/activityregistryservice.py b/service/activityregistryservice.py
index 9c2dda7..9c2dda7 100644
--- a/services/shell/activityregistryservice.py
+++ b/service/activityregistryservice.py
diff --git a/services/shell/bundleregistry.py b/service/bundleregistry.py
index 8dd141c..8dd141c 100644
--- a/services/shell/bundleregistry.py
+++ b/service/bundleregistry.py
diff --git a/services/shell/clipboardobject.py b/service/clipboardobject.py
index 70c21a0..70c21a0 100644
--- a/services/shell/clipboardobject.py
+++ b/service/clipboardobject.py
diff --git a/services/shell/clipboardservice.py b/service/clipboardservice.py
index fec546f..fec546f 100644
--- a/services/shell/clipboardservice.py
+++ b/service/clipboardservice.py
diff --git a/services/shell/org.laptop.ActivityRegistry.service.in b/service/org.laptop.ActivityRegistry.service.in
index ab6647c..ab6647c 100644
--- a/services/shell/org.laptop.ActivityRegistry.service.in
+++ b/service/org.laptop.ActivityRegistry.service.in
diff --git a/services/shell/org.laptop.Clipboard.service.in b/service/org.laptop.Clipboard.service.in
index 7ce3f6e..7ce3f6e 100644
--- a/services/shell/org.laptop.Clipboard.service.in
+++ b/service/org.laptop.Clipboard.service.in
diff --git a/services/shell/org.laptop.ObjectTypeRegistry.service.in b/service/org.laptop.ObjectTypeRegistry.service.in
index 563a600..563a600 100644
--- a/services/shell/org.laptop.ObjectTypeRegistry.service.in
+++ b/service/org.laptop.ObjectTypeRegistry.service.in
diff --git a/services/shell/sugar-shell-service b/service/sugar-shell-service
index e5c6a7d..e5c6a7d 100755
--- a/services/shell/sugar-shell-service
+++ b/service/sugar-shell-service
diff --git a/services/Makefile.am b/services/Makefile.am
deleted file mode 100644
index d7c539d..0000000
--- a/services/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = shell
diff --git a/shell/.gitignore b/src/.gitignore
index 4acd06b..4acd06b 100644
--- a/shell/.gitignore
+++ b/src/.gitignore
diff --git a/shell/Makefile.am b/src/Makefile.am
index 7b45960..7b45960 100644
--- a/shell/Makefile.am
+++ b/src/Makefile.am
diff --git a/shell/__init__.py b/src/__init__.py
index 41b4b1c..41b4b1c 100644
--- a/shell/__init__.py
+++ b/src/__init__.py
diff --git a/shell/config.py.in b/src/config.py.in
index c1a7a4a..c1a7a4a 100644
--- a/shell/config.py.in
+++ b/src/config.py.in
diff --git a/shell/controlpanel/Makefile.am b/src/controlpanel/Makefile.am
index f89132c..f89132c 100644
--- a/shell/controlpanel/Makefile.am
+++ b/src/controlpanel/Makefile.am
diff --git a/shell/controlpanel/__init__.py b/src/controlpanel/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/controlpanel/__init__.py
+++ b/src/controlpanel/__init__.py
diff --git a/shell/controlpanel/cmd.py b/src/controlpanel/cmd.py
index 634faa9..634faa9 100644
--- a/shell/controlpanel/cmd.py
+++ b/src/controlpanel/cmd.py
diff --git a/shell/controlpanel/control.py b/src/controlpanel/control.py
index a26132e..a26132e 100644
--- a/shell/controlpanel/control.py
+++ b/src/controlpanel/control.py
diff --git a/shell/hardware/Makefile.am b/src/hardware/Makefile.am
index 8cd9c77..8cd9c77 100644
--- a/shell/hardware/Makefile.am
+++ b/src/hardware/Makefile.am
diff --git a/shell/hardware/NetworkManagerInfo.conf b/src/hardware/NetworkManagerInfo.conf
index 4fb8270..4fb8270 100644
--- a/shell/hardware/NetworkManagerInfo.conf
+++ b/src/hardware/NetworkManagerInfo.conf
diff --git a/shell/hardware/__init__.py b/src/hardware/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/hardware/__init__.py
+++ b/src/hardware/__init__.py
diff --git a/shell/hardware/hardwaremanager.py b/src/hardware/hardwaremanager.py
index 4eeac03..4eeac03 100644
--- a/shell/hardware/hardwaremanager.py
+++ b/src/hardware/hardwaremanager.py
diff --git a/shell/hardware/keydialog.py b/src/hardware/keydialog.py
index d336ab9..d336ab9 100644
--- a/shell/hardware/keydialog.py
+++ b/src/hardware/keydialog.py
diff --git a/shell/hardware/nmclient.py b/src/hardware/nmclient.py
index d23a206..d23a206 100644
--- a/shell/hardware/nmclient.py
+++ b/src/hardware/nmclient.py
diff --git a/shell/hardware/nminfo.py b/src/hardware/nminfo.py
index 3a93120..3a93120 100644
--- a/shell/hardware/nminfo.py
+++ b/src/hardware/nminfo.py
diff --git a/shell/hardware/schoolserver.py b/src/hardware/schoolserver.py
index 68d14f7..68d14f7 100644
--- a/shell/hardware/schoolserver.py
+++ b/src/hardware/schoolserver.py
diff --git a/shell/intro/Makefile.am b/src/intro/Makefile.am
index 3b92ea0..3b92ea0 100644
--- a/shell/intro/Makefile.am
+++ b/src/intro/Makefile.am
diff --git a/shell/intro/__init__.py b/src/intro/__init__.py
index e69de29..e69de29 100644
--- a/shell/intro/__init__.py
+++ b/src/intro/__init__.py
diff --git a/shell/intro/colorpicker.py b/src/intro/colorpicker.py
index 90dbc26..90dbc26 100644
--- a/shell/intro/colorpicker.py
+++ b/src/intro/colorpicker.py
diff --git a/shell/intro/default-picture.png b/src/intro/default-picture.png
index e26b9b0..e26b9b0 100644
--- a/shell/intro/default-picture.png
+++ b/src/intro/default-picture.png
diff --git a/shell/intro/glive.py b/src/intro/glive.py
index a875e48..a875e48 100644
--- a/shell/intro/glive.py
+++ b/src/intro/glive.py
diff --git a/shell/intro/intro.py b/src/intro/intro.py
index 1bd46c7..1bd46c7 100644
--- a/shell/intro/intro.py
+++ b/src/intro/intro.py
diff --git a/shell/logsmanager.py b/src/logsmanager.py
index caa50d2..caa50d2 100644
--- a/shell/logsmanager.py
+++ b/src/logsmanager.py
diff --git a/shell/main.py b/src/main.py
index f2f1a51..f2f1a51 100644
--- a/shell/main.py
+++ b/src/main.py
diff --git a/shell/model/BuddyModel.py b/src/model/BuddyModel.py
index 11c6567..11c6567 100644
--- a/shell/model/BuddyModel.py
+++ b/src/model/BuddyModel.py
diff --git a/shell/model/Friends.py b/src/model/Friends.py
index 6fc3e97..6fc3e97 100644
--- a/shell/model/Friends.py
+++ b/src/model/Friends.py
diff --git a/shell/model/Invites.py b/src/model/Invites.py
index 9ffab44..9ffab44 100644
--- a/shell/model/Invites.py
+++ b/src/model/Invites.py
diff --git a/shell/model/Makefile.am b/src/model/Makefile.am
index 0b7d14c..0b7d14c 100644
--- a/shell/model/Makefile.am
+++ b/src/model/Makefile.am
diff --git a/shell/model/MeshModel.py b/src/model/MeshModel.py
index da5b3c2..da5b3c2 100644
--- a/shell/model/MeshModel.py
+++ b/src/model/MeshModel.py
diff --git a/shell/model/Owner.py b/src/model/Owner.py
index b06b391..b06b391 100644
--- a/shell/model/Owner.py
+++ b/src/model/Owner.py
diff --git a/shell/model/__init__.py b/src/model/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/model/__init__.py
+++ b/src/model/__init__.py
diff --git a/shell/model/accesspointmodel.py b/src/model/accesspointmodel.py
index 1d4d6cb..1d4d6cb 100644
--- a/shell/model/accesspointmodel.py
+++ b/src/model/accesspointmodel.py
diff --git a/shell/model/devices/Makefile.am b/src/model/devices/Makefile.am
index 5440eeb..5440eeb 100644
--- a/shell/model/devices/Makefile.am
+++ b/src/model/devices/Makefile.am
diff --git a/shell/model/devices/__init__.py b/src/model/devices/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/model/devices/__init__.py
+++ b/src/model/devices/__init__.py
diff --git a/shell/model/devices/battery.py b/src/model/devices/battery.py
index 853d00e..853d00e 100644
--- a/shell/model/devices/battery.py
+++ b/src/model/devices/battery.py
diff --git a/shell/model/devices/device.py b/src/model/devices/device.py
index d7105b5..d7105b5 100644
--- a/shell/model/devices/device.py
+++ b/src/model/devices/device.py
diff --git a/shell/model/devices/devicesmodel.py b/src/model/devices/devicesmodel.py
index fab9fa4..fab9fa4 100644
--- a/shell/model/devices/devicesmodel.py
+++ b/src/model/devices/devicesmodel.py
diff --git a/shell/model/devices/network/Makefile.am b/src/model/devices/network/Makefile.am
index 04074e5..04074e5 100644
--- a/shell/model/devices/network/Makefile.am
+++ b/src/model/devices/network/Makefile.am
diff --git a/shell/model/devices/network/__init__.py b/src/model/devices/network/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/model/devices/network/__init__.py
+++ b/src/model/devices/network/__init__.py
diff --git a/shell/model/devices/network/mesh.py b/src/model/devices/network/mesh.py
index 0152d8a..0152d8a 100644
--- a/shell/model/devices/network/mesh.py
+++ b/src/model/devices/network/mesh.py
diff --git a/shell/model/devices/network/wired.py b/src/model/devices/network/wired.py
index 66c5206..66c5206 100644
--- a/shell/model/devices/network/wired.py
+++ b/src/model/devices/network/wired.py
diff --git a/shell/model/devices/network/wireless.py b/src/model/devices/network/wireless.py
index c45a08e..c45a08e 100644
--- a/shell/model/devices/network/wireless.py
+++ b/src/model/devices/network/wireless.py
diff --git a/shell/model/homeactivity.py b/src/model/homeactivity.py
index 7365271..7365271 100644
--- a/shell/model/homeactivity.py
+++ b/src/model/homeactivity.py
diff --git a/shell/model/homemodel.py b/src/model/homemodel.py
index 44d5417..44d5417 100644
--- a/shell/model/homemodel.py
+++ b/src/model/homemodel.py
diff --git a/shell/model/shellmodel.py b/src/model/shellmodel.py
index 5462e27..5462e27 100644
--- a/shell/model/shellmodel.py
+++ b/src/model/shellmodel.py
diff --git a/shell/shellservice.py b/src/shellservice.py
index 458f941..458f941 100644
--- a/shell/shellservice.py
+++ b/src/shellservice.py
diff --git a/shell/view/ActivityHost.py b/src/view/ActivityHost.py
index 4332372..4332372 100644
--- a/shell/view/ActivityHost.py
+++ b/src/view/ActivityHost.py
diff --git a/shell/view/BuddyIcon.py b/src/view/BuddyIcon.py
index 3734001..3734001 100644
--- a/shell/view/BuddyIcon.py
+++ b/src/view/BuddyIcon.py
diff --git a/shell/view/BuddyMenu.py b/src/view/BuddyMenu.py
index e7e12ca..e7e12ca 100644
--- a/shell/view/BuddyMenu.py
+++ b/src/view/BuddyMenu.py
diff --git a/shell/view/Makefile.am b/src/view/Makefile.am
index abbb230..abbb230 100644
--- a/shell/view/Makefile.am
+++ b/src/view/Makefile.am
diff --git a/shell/view/OverlayWindow.py b/src/view/OverlayWindow.py
index 376ca2f..376ca2f 100644
--- a/shell/view/OverlayWindow.py
+++ b/src/view/OverlayWindow.py
diff --git a/shell/view/Shell.py b/src/view/Shell.py
index 72aa3b1..72aa3b1 100644
--- a/shell/view/Shell.py
+++ b/src/view/Shell.py
diff --git a/shell/view/__init__.py b/src/view/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/view/__init__.py
+++ b/src/view/__init__.py
diff --git a/shell/view/clipboardicon.py b/src/view/clipboardicon.py
index 4b36395..4b36395 100644
--- a/shell/view/clipboardicon.py
+++ b/src/view/clipboardicon.py
diff --git a/shell/view/clipboardmenu.py b/src/view/clipboardmenu.py
index b847828..b847828 100644
--- a/shell/view/clipboardmenu.py
+++ b/src/view/clipboardmenu.py
diff --git a/shell/view/devices/Makefile.am b/src/view/devices/Makefile.am
index c040beb..c040beb 100644
--- a/shell/view/devices/Makefile.am
+++ b/src/view/devices/Makefile.am
diff --git a/shell/view/devices/__init__.py b/src/view/devices/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/view/devices/__init__.py
+++ b/src/view/devices/__init__.py
diff --git a/shell/view/devices/battery.py b/src/view/devices/battery.py
index 09c69df..09c69df 100644
--- a/shell/view/devices/battery.py
+++ b/src/view/devices/battery.py
diff --git a/shell/view/devices/deviceview.py b/src/view/devices/deviceview.py
index f58da02..f58da02 100644
--- a/shell/view/devices/deviceview.py
+++ b/src/view/devices/deviceview.py
diff --git a/shell/view/devices/network/Makefile.am b/src/view/devices/network/Makefile.am
index 0d215f0..0d215f0 100644
--- a/shell/view/devices/network/Makefile.am
+++ b/src/view/devices/network/Makefile.am
diff --git a/shell/view/devices/network/__init__.py b/src/view/devices/network/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/view/devices/network/__init__.py
+++ b/src/view/devices/network/__init__.py
diff --git a/shell/view/devices/network/mesh.py b/src/view/devices/network/mesh.py
index 2543957..2543957 100644
--- a/shell/view/devices/network/mesh.py
+++ b/src/view/devices/network/mesh.py
diff --git a/shell/view/devices/network/wired.py b/src/view/devices/network/wired.py
index dc83a08..dc83a08 100644
--- a/shell/view/devices/network/wired.py
+++ b/src/view/devices/network/wired.py
diff --git a/shell/view/devices/network/wireless.py b/src/view/devices/network/wireless.py
index f4f8869..f4f8869 100644
--- a/shell/view/devices/network/wireless.py
+++ b/src/view/devices/network/wireless.py
diff --git a/shell/view/frame/Makefile.am b/src/view/frame/Makefile.am
index 02951b9..02951b9 100644
--- a/shell/view/frame/Makefile.am
+++ b/src/view/frame/Makefile.am
diff --git a/shell/view/frame/__init__.py b/src/view/frame/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/view/frame/__init__.py
+++ b/src/view/frame/__init__.py
diff --git a/shell/view/frame/activitiestray.py b/src/view/frame/activitiestray.py
index 3dbf955..3dbf955 100644
--- a/shell/view/frame/activitiestray.py
+++ b/src/view/frame/activitiestray.py
diff --git a/shell/view/frame/activitybutton.py b/src/view/frame/activitybutton.py
index 0c7c7fb..0c7c7fb 100644
--- a/shell/view/frame/activitybutton.py
+++ b/src/view/frame/activitybutton.py
diff --git a/shell/view/frame/clipboardbox.py b/src/view/frame/clipboardbox.py
index 7702759..7702759 100644
--- a/shell/view/frame/clipboardbox.py
+++ b/src/view/frame/clipboardbox.py
diff --git a/shell/view/frame/clipboardpanelwindow.py b/src/view/frame/clipboardpanelwindow.py
index e579b8c..e579b8c 100644
--- a/shell/view/frame/clipboardpanelwindow.py
+++ b/src/view/frame/clipboardpanelwindow.py
diff --git a/shell/view/frame/eventarea.py b/src/view/frame/eventarea.py
index 69bb759..69bb759 100644
--- a/shell/view/frame/eventarea.py
+++ b/src/view/frame/eventarea.py
diff --git a/shell/view/frame/frame.py b/src/view/frame/frame.py
index e8f8fa4..e8f8fa4 100644
--- a/shell/view/frame/frame.py
+++ b/src/view/frame/frame.py
diff --git a/shell/view/frame/frameinvoker.py b/src/view/frame/frameinvoker.py
index 07dc9d8..07dc9d8 100644
--- a/shell/view/frame/frameinvoker.py
+++ b/src/view/frame/frameinvoker.py
diff --git a/shell/view/frame/framewindow.py b/src/view/frame/framewindow.py
index 623d162..623d162 100644
--- a/shell/view/frame/framewindow.py
+++ b/src/view/frame/framewindow.py
diff --git a/shell/view/frame/friendstray.py b/src/view/frame/friendstray.py
index b34f357..b34f357 100644
--- a/shell/view/frame/friendstray.py
+++ b/src/view/frame/friendstray.py
diff --git a/shell/view/frame/overlaybox.py b/src/view/frame/overlaybox.py
index bb74f18..bb74f18 100644
--- a/shell/view/frame/overlaybox.py
+++ b/src/view/frame/overlaybox.py
diff --git a/shell/view/frame/zoomtoolbar.py b/src/view/frame/zoomtoolbar.py
index 48e63de..48e63de 100644
--- a/shell/view/frame/zoomtoolbar.py
+++ b/src/view/frame/zoomtoolbar.py
diff --git a/shell/view/home/FriendView.py b/src/view/home/FriendView.py
index 786589f..786589f 100644
--- a/shell/view/home/FriendView.py
+++ b/src/view/home/FriendView.py
diff --git a/shell/view/home/FriendsBox.py b/src/view/home/FriendsBox.py
index e9efc57..e9efc57 100644
--- a/shell/view/home/FriendsBox.py
+++ b/src/view/home/FriendsBox.py
diff --git a/shell/view/home/HomeBox.py b/src/view/home/HomeBox.py
index 8764887..8764887 100644
--- a/shell/view/home/HomeBox.py
+++ b/src/view/home/HomeBox.py
diff --git a/shell/view/home/HomeWindow.py b/src/view/home/HomeWindow.py
index f1f46e9..f1f46e9 100644
--- a/shell/view/home/HomeWindow.py
+++ b/src/view/home/HomeWindow.py
diff --git a/shell/view/home/Makefile.am b/src/view/home/Makefile.am
index 6916806..6916806 100644
--- a/shell/view/home/Makefile.am
+++ b/src/view/home/Makefile.am
diff --git a/shell/view/home/MeshBox.py b/src/view/home/MeshBox.py
index 3b7c4a7..3b7c4a7 100644
--- a/shell/view/home/MeshBox.py
+++ b/src/view/home/MeshBox.py
diff --git a/shell/view/home/MyIcon.py b/src/view/home/MyIcon.py
index af0f6ce..af0f6ce 100644
--- a/shell/view/home/MyIcon.py
+++ b/src/view/home/MyIcon.py
diff --git a/shell/view/home/__init__.py b/src/view/home/__init__.py
index a9dd95a..a9dd95a 100644
--- a/shell/view/home/__init__.py
+++ b/src/view/home/__init__.py
diff --git a/shell/view/home/activitiesdonut.py b/src/view/home/activitiesdonut.py
index 8e09006..8e09006 100755
--- a/shell/view/home/activitiesdonut.py
+++ b/src/view/home/activitiesdonut.py
diff --git a/shell/view/home/proc_smaps.py b/src/view/home/proc_smaps.py
index 6e1680f..6e1680f 100755
--- a/shell/view/home/proc_smaps.py
+++ b/src/view/home/proc_smaps.py
diff --git a/shell/view/home/snowflakelayout.py b/src/view/home/snowflakelayout.py
index 1eb58cf..1eb58cf 100644
--- a/shell/view/home/snowflakelayout.py
+++ b/src/view/home/snowflakelayout.py
diff --git a/shell/view/home/spreadlayout.py b/src/view/home/spreadlayout.py
index 3463169..3463169 100644
--- a/shell/view/home/spreadlayout.py
+++ b/src/view/home/spreadlayout.py
diff --git a/shell/view/home/transitionbox.py b/src/view/home/transitionbox.py
index f1ba4fb..f1ba4fb 100644
--- a/shell/view/home/transitionbox.py
+++ b/src/view/home/transitionbox.py
diff --git a/shell/view/keyhandler.py b/src/view/keyhandler.py
index b07f46c..b07f46c 100644
--- a/shell/view/keyhandler.py
+++ b/src/view/keyhandler.py
diff --git a/shell/view/pulsingicon.py b/src/view/pulsingicon.py
index 9e7b3d9..9e7b3d9 100644
--- a/shell/view/pulsingicon.py
+++ b/src/view/pulsingicon.py