diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/jarabe/frame/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jarabe/frame/devices/Makefile.am (renamed from src/jarabe/view/devices/Makefile.am) | 2 | ||||
| -rw-r--r-- | src/jarabe/frame/devices/__init__.py (renamed from src/jarabe/view/devices/__init__.py) | 0 | ||||
| -rw-r--r-- | src/jarabe/frame/devices/battery.py (renamed from src/jarabe/view/devices/battery.py) | 0 | ||||
| -rw-r--r-- | src/jarabe/frame/devices/deviceview.py (renamed from src/jarabe/view/devices/deviceview.py) | 0 | ||||
| -rw-r--r-- | src/jarabe/frame/devices/mesh.py (renamed from src/jarabe/view/devices/mesh.py) | 0 | ||||
| -rw-r--r-- | src/jarabe/frame/devices/speaker.py (renamed from src/jarabe/view/devices/speaker.py) | 0 | ||||
| -rw-r--r-- | src/jarabe/frame/devices/wireless.py (renamed from src/jarabe/view/devices/wireless.py) | 0 | ||||
| -rw-r--r-- | src/jarabe/frame/devicestray.py | 2 | ||||
| -rw-r--r-- | src/jarabe/view/Makefile.am | 2 |
11 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index dd17f7e..ea5060c 100644 --- a/configure.ac +++ b/configure.ac @@ -53,11 +53,11 @@ src/jarabe/controlpanel/network/Makefile src/jarabe/controlpanel/power/Makefile src/jarabe/desktop/Makefile src/jarabe/frame/Makefile +src/jarabe/frame/devices/Makefile src/jarabe/intro/Makefile src/jarabe/journal/Makefile src/jarabe/hardware/Makefile src/jarabe/view/Makefile -src/jarabe/view/devices/Makefile src/jarabe/model/Makefile src/jarabe/model/devices/Makefile po/Makefile.in diff --git a/src/jarabe/frame/Makefile.am b/src/jarabe/frame/Makefile.am index 15f5fe3..f1451d7 100644 --- a/src/jarabe/frame/Makefile.am +++ b/src/jarabe/frame/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = devices + sugardir = $(pythondir)/jarabe/frame sugar_PYTHON = \ __init__.py \ diff --git a/src/jarabe/view/devices/Makefile.am b/src/jarabe/frame/devices/Makefile.am index 6a9efe0..26cce8a 100644 --- a/src/jarabe/view/devices/Makefile.am +++ b/src/jarabe/frame/devices/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pythondir)/jarabe/view/devices +sugardir = $(pythondir)/jarabe/frame/devices sugar_PYTHON = \ __init__.py \ battery.py \ diff --git a/src/jarabe/view/devices/__init__.py b/src/jarabe/frame/devices/__init__.py index a9dd95a..a9dd95a 100644 --- a/src/jarabe/view/devices/__init__.py +++ b/src/jarabe/frame/devices/__init__.py diff --git a/src/jarabe/view/devices/battery.py b/src/jarabe/frame/devices/battery.py index 0302ecd..0302ecd 100644 --- a/src/jarabe/view/devices/battery.py +++ b/src/jarabe/frame/devices/battery.py diff --git a/src/jarabe/view/devices/deviceview.py b/src/jarabe/frame/devices/deviceview.py index 90ebbf5..90ebbf5 100644 --- a/src/jarabe/view/devices/deviceview.py +++ b/src/jarabe/frame/devices/deviceview.py diff --git a/src/jarabe/view/devices/mesh.py b/src/jarabe/frame/devices/mesh.py index d6248e2..d6248e2 100644 --- a/src/jarabe/view/devices/mesh.py +++ b/src/jarabe/frame/devices/mesh.py diff --git a/src/jarabe/view/devices/speaker.py b/src/jarabe/frame/devices/speaker.py index be32b1c..be32b1c 100644 --- a/src/jarabe/view/devices/speaker.py +++ b/src/jarabe/frame/devices/speaker.py diff --git a/src/jarabe/view/devices/wireless.py b/src/jarabe/frame/devices/wireless.py index 6be74fb..6be74fb 100644 --- a/src/jarabe/view/devices/wireless.py +++ b/src/jarabe/frame/devices/wireless.py diff --git a/src/jarabe/frame/devicestray.py b/src/jarabe/frame/devicestray.py index eb6707e..4b7adb0 100644 --- a/src/jarabe/frame/devicestray.py +++ b/src/jarabe/frame/devicestray.py @@ -18,7 +18,7 @@ import logging from sugar.graphics import tray -from jarabe.view.devices import deviceview +from jarabe.frame.devices import deviceview from jarabe.model import shellmodel _logger = logging.getLogger('DevicesTray') diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am index b22171b..18ba0a5 100644 --- a/src/jarabe/view/Makefile.am +++ b/src/jarabe/view/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = devices - sugardir = $(pythondir)/jarabe/view sugar_PYTHON = \ __init__.py \ |