From a98020ab2fe950f24d06002918ca9027432f25b2 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Tue, 30 Sep 2008 22:18:23 +0000
Subject: Move view.clipboard* into frame.

---
(limited to 'src')

diff --git a/src/jarabe/frame/Makefile.am b/src/jarabe/frame/Makefile.am
index f1451d7..575685a 100644
--- a/src/jarabe/frame/Makefile.am
+++ b/src/jarabe/frame/Makefile.am
@@ -4,6 +4,8 @@ sugardir = $(pythondir)/jarabe/frame
 sugar_PYTHON =				\
 	__init__.py			\
 	activitiestray.py		\
+	clipboardicon.py		\
+	clipboardmenu.py		\
 	clipboardpanelwindow.py		\
 	clipboardtray.py		\
 	devicestray.py			\
diff --git a/src/jarabe/view/clipboardicon.py b/src/jarabe/frame/clipboardicon.py
index cb83900..8f43a6a 100644
--- a/src/jarabe/view/clipboardicon.py
+++ b/src/jarabe/frame/clipboardicon.py
@@ -24,7 +24,7 @@ from sugar.graphics.xocolor import XoColor
 from sugar import profile
 
 from jarabe.model import clipboard
-from jarabe.view.clipboardmenu import ClipboardMenu
+from jarabe.frame.clipboardmenu import ClipboardMenu
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.frame.notification import NotificationIcon
 import jarabe.frame.frame
diff --git a/src/jarabe/view/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
index 990379b..990379b 100644
--- a/src/jarabe/view/clipboardmenu.py
+++ b/src/jarabe/frame/clipboardmenu.py
diff --git a/src/jarabe/frame/clipboardtray.py b/src/jarabe/frame/clipboardtray.py
index ca67b82..6e7017c 100644
--- a/src/jarabe/frame/clipboardtray.py
+++ b/src/jarabe/frame/clipboardtray.py
@@ -25,7 +25,7 @@ from sugar.graphics import tray
 from sugar.graphics import style
 
 from jarabe.model import clipboard
-from jarabe.view.clipboardicon import ClipboardIcon
+from jarabe.frame.clipboardicon import ClipboardIcon
 
 class _ContextMap(object):
     """Maps a drag context to the clipboard object involved in the dragging."""
diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am
index 404910a..733864b 100644
--- a/src/jarabe/view/Makefile.am
+++ b/src/jarabe/view/Makefile.am
@@ -4,8 +4,6 @@ sugar_PYTHON =				\
 	activityhost.py			\
 	buddyicon.py			\
 	buddymenu.py			\
-	clipboardicon.py		\
-	clipboardmenu.py		\
 	keyhandler.py			\
 	launchwindow.py			\
 	pulsingicon.py			\
--
cgit v0.9.1