Make the clipboard model internal to the frame.

8 files changed, 7 insertions, 7 deletions

diff --git a/src/jarabe/frame/Makefile.am b/src/jarabe/frame/Makefile.am
index ab8bb3c..e5c445f 100644
--- a/src/jarabe/frame/Makefile.am
+++ b/src/jarabe/frame/Makefile.am
@@ -2,8 +2,10 @@ sugardir = $(pythondir)/jarabe/frame
 sugar_PYTHON =				\
 	__init__.py			\
 	activitiestray.py		\
+        clipboard.py			\
 	clipboardicon.py		\
 	clipboardmenu.py		\
+	clipboardobject.py		\
 	clipboardpanelwindow.py		\
 	clipboardtray.py		\
 	devicestray.py			\
diff --git a/src/jarabe/model/clipboard.py b/src/jarabe/frame/clipboard.py
index b79867e..2b52ff3 100644
--- a/src/jarabe/model/clipboard.py
+++ b/src/jarabe/frame/clipboard.py
@@ -24,7 +24,7 @@ import gobject
 
 from sugar import mime
 
-from jarabe.model.clipboardobject import ClipboardObject, Format
+from jarabe.frame.clipboardobject import ClipboardObject, Format
 
 class Clipboard(gobject.GObject):
 
diff --git a/src/jarabe/frame/clipboardicon.py b/src/jarabe/frame/clipboardicon.py
index 8f43a6a..266e9a8 100644
--- a/src/jarabe/frame/clipboardicon.py
+++ b/src/jarabe/frame/clipboardicon.py
@@ -23,7 +23,7 @@ from sugar.graphics.icon import Icon
 from sugar.graphics.xocolor import XoColor
 from sugar import profile
 
-from jarabe.model import clipboard
+from jarabe.frame import clipboard
 from jarabe.frame.clipboardmenu import ClipboardMenu
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.frame.notification import NotificationIcon
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
index 990379b..8461094 100644
--- a/src/jarabe/frame/clipboardmenu.py
+++ b/src/jarabe/frame/clipboardmenu.py
@@ -30,7 +30,7 @@ from sugar import mime
 from sugar import profile
 from sugar import activity
 
-from jarabe.model import clipboard
+from jarabe.frame import clipboard
 from jarabe.journal import misc
 
 class ClipboardMenu(Palette):
diff --git a/src/jarabe/model/clipboardobject.py b/src/jarabe/frame/clipboardobject.py
index a4cd388..a4cd388 100644
--- a/src/jarabe/model/clipboardobject.py
+++ b/src/jarabe/frame/clipboardobject.py
diff --git a/src/jarabe/frame/clipboardpanelwindow.py b/src/jarabe/frame/clipboardpanelwindow.py
index b4ccba0..2a479a5 100644
--- a/src/jarabe/frame/clipboardpanelwindow.py
+++ b/src/jarabe/frame/clipboardpanelwindow.py
@@ -23,7 +23,7 @@ import hippo
 from jarabe.frame.framewindow import FrameWindow
 from jarabe.frame.clipboardtray import ClipboardTray
 
-from jarabe.model import clipboard
+from jarabe.frame import clipboard
 
 class ClipboardPanelWindow(FrameWindow):
     def __init__(self, frame, orientation):
diff --git a/src/jarabe/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py
index 6e7017c..e915d15 100644
--- a/src/jarabe/frame/clipboardtray.py
+++ b/src/jarabe/frame/clipboardtray.py
@@ -24,7 +24,7 @@ from sugar import util
 from sugar.graphics import tray
 from sugar.graphics import style
 
-from jarabe.model import clipboard
+from jarabe.frame import clipboard
 from jarabe.frame.clipboardicon import ClipboardIcon
 
 class _ContextMap(object):
diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
index da9f73f..26224f1 100644
--- a/src/jarabe/model/Makefile.am
+++ b/src/jarabe/model/Makefile.am
@@ -3,8 +3,6 @@ sugar_PYTHON =			\
 	__init__.py		\
 	accesspointmodel.py	\
 	buddymodel.py		\
-	clipboard.py		\
-	clipboardobject.py	\
 	friends.py		\
 	homeactivity.py		\
 	homemodel.py		\