Reverting clipboard changes pushed by mistake. These are commits 23565cfd483e38d3a64cd5980deea47cccb28581 and a7e4092b0e4f3d30a21ee5a7982aecd5252a0822.

7 files changed, 3 insertions, 219 deletions

diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 905555a..ae2e2ee 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = activity chat clipboard graphics p2p presence
+SUBDIRS = activity chat graphics p2p presence
 
 sugardir = $(pythondir)/sugar
 sugar_PYTHON =				\
diff --git a/sugar/clipboard/ClipboardService.py b/sugar/clipboard/ClipboardService.py
deleted file mode 100644
index e189653..0000000
--- a/sugar/clipboard/ClipboardService.py
+++ /dev/null
@@ -1,73 +0,0 @@
-import dbus
-import gobject
-
-DBUS_SERVICE = "org.laptop.Clipboard"
-DBUS_INTERFACE = "org.laptop.Clipboard"
-DBUS_PATH = "/org/laptop/Clipboard"
-
-class ClipboardService(gobject.GObject):
-
-	__gsignals__ = {
-		'object-added': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-						([str, str])),
-		'object-deleted': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-						([str])),
-		'object-state-updated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-						([str, int])),
-	}
-	
-	def __init__(self):
-		gobject.GObject.__init__(self)
-		
-		self._dbus_service = None
-		bus = dbus.SessionBus()
-		bus.add_signal_receiver(self._name_owner_changed_cb,
-									signal_name="NameOwnerChanged",
-									dbus_interface="org.freedesktop.DBus")
-		# Try to register to ClipboardService, if we fail, we'll try later.
-		try:
-			self._connect_clipboard_signals()
-		except dbus.DBusException, exception:
-			pass
-		
-	def _connect_clipboard_signals(self):
-		bus = dbus.SessionBus()
-		proxy_obj = bus.get_object(DBUS_SERVICE, DBUS_PATH)
-		self._dbus_service = dbus.Interface(proxy_obj, DBUS_SERVICE)
-		self._dbus_service.connect_to_signal('object_added', self._object_added_cb)	
-		self._dbus_service.connect_to_signal('object_deleted', self._object_deleted_cb)
-		self._dbus_service.connect_to_signal('object_state_updated',
-			self._object_state_updated_cb)	
-
-	def _name_owner_changed_cb(self, name, old, new):
-		if name != DBUS_SERVICE:
-			return
-		
-		if (not old and not len(old)) and (new and len(new)):
-			# ClipboardService started up
-			self._connect_clipboard_signals()
-			
-	def _object_added_cb(self, mimeType, fileName):
-		self.emit('object-added', mimeType, fileName)
-
-	def _object_deleted_cb(self, fileName):
-		self.emit('object-deleted', fileName)
-
-	def _object_state_updated_cb(self, fileName, percent):
-		self.emit('object-state-updated', fileName, percent)
-	
-	def add_object(self, mimeType, fileName):
-		self._dbus_service.add_object(mimeType, fileName)
-	
-	def delete_object(self, fileName):
-		self._dbus_service.delete_object(fileName)
-	
-	def update_object_state(self, fileName, percent):
-		self._dbus_service.update_object_state(fileName, percent)
-
-_clipboard_service = None
-def get_instance():
-	global _clipboard_service
-	if not _clipboard_service:
-		_clipboard_service = ClipboardService()
-	return _clipboard_service
diff --git a/sugar/clipboard/Makefile.am b/sugar/clipboard/Makefile.am
deleted file mode 100644
index dbfabe9..0000000
--- a/sugar/clipboard/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-sugardir = $(pythondir)/sugar/clipboard
-sugar_PYTHON =			\
-	__init__.py			\
-	ClipboardService.py
-
diff --git a/sugar/clipboard/__init__.py b/sugar/clipboard/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/sugar/clipboard/__init__.py
+++ /dev/null
diff --git a/sugar/graphics/ClipboardBubble.py b/sugar/graphics/ClipboardBubble.py
deleted file mode 100644
index 4c1da58..0000000
--- a/sugar/graphics/ClipboardBubble.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (C) 2006, Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-#TODO: has to be merged with all the existing bubbles in a generic progress bar widget
-
-import math
-
-import gobject
-import gtk
-import hippo
-
-class ClipboardBubble(hippo.CanvasBox, hippo.CanvasItem):
-	__gtype_name__ = 'ClipboardBubble'
-
-	__gproperties__ = {
-		'fill-color': (object, None, None,
-					  gobject.PARAM_READWRITE),
-		'stroke-color': (object, None, None,
-					  gobject.PARAM_READWRITE),
-		'progress-color': (object, None, None,
-					  gobject.PARAM_READWRITE),
-		'percent'   : (object, None, None,
-					  gobject.PARAM_READWRITE),
-	}
-
-	def __init__(self, **kwargs):
-		self._stroke_color = 0xFFFFFFFF
-		self._fill_color = 0xFFFFFFFF
-		self._progress_color = 0x000000FF
-		self._percent = 0
-		self._radius = 8
-
-		hippo.CanvasBox.__init__(self, **kwargs)
-
-	def do_set_property(self, pspec, value):
-		if pspec.name == 'fill-color':
-			self._fill_color = value
-			self.emit_paint_needed(0, 0, -1, -1)
-		elif pspec.name == 'stroke-color':
-			self._stroke_color = value
-			self.emit_paint_needed(0, 0, -1, -1)
-		elif pspec.name == 'progress-color':
-			self._progress_color = value
-			self.emit_paint_needed(0, 0, -1, -1)
-		elif pspec.name == 'percent':
-			self._percent = value
-			self.emit_paint_needed(0, 0, -1, -1)
-
-	def do_get_property(self, pspec):
-		if pspec.name == 'fill-color':
-			return self._fill_color
-		elif pspec.name == 'stroke-color':
-			return self._stroke_color
-		elif pspec.name == 'progress-color':
-			return self._progress_color
-		elif pspec.name == 'percent':
-			return self._percent
-
-	def _int_to_rgb(self, int_color):
-		red = (int_color >> 24) & 0x000000FF
-		green = (int_color >> 16) & 0x000000FF
-		blue = (int_color >> 8) & 0x000000FF
-		alpha = int_color & 0x000000FF
-		return (red / 255.0, green / 255.0, blue / 255.0)
-
-	def do_paint_below_children(self, cr, damaged_box):
-		[width, height] = self.get_allocation()
-
-		line_width = 3.0
-		x = line_width
-		y = line_width
-		width -= line_width * 2
-		height -= line_width * 2
-
-		cr.move_to(x + self._radius, y);
-		cr.arc(x + width - self._radius, y + self._radius,
-			   self._radius, math.pi * 1.5, math.pi * 2);
-		cr.arc(x + width - self._radius, x + height - self._radius,
-			   self._radius, 0, math.pi * 0.5);
-		cr.arc(x + self._radius, y + height - self._radius,
-			   self._radius, math.pi * 0.5, math.pi);
-		cr.arc(x + self._radius, y + self._radius, self._radius,
-			   math.pi, math.pi * 1.5);
-
-		color = self._int_to_rgb(self._fill_color)
-		cr.set_source_rgb(*color)
-		cr.fill_preserve();
-
-		color = self._int_to_rgb(self._stroke_color)
-		cr.set_source_rgb(*color)
-		cr.set_line_width(line_width)
-		cr.stroke();
-
-		self._paint_progress_bar(cr, x, y, width, height, line_width)
-
-	def _paint_progress_bar(self, cr, x, y, width, height, line_width):
-		prog_x = x + line_width
-		prog_y = y + line_width
-		prog_width = (width - (line_width * 2)) * (self._percent / 100.0)
-		prog_height = (height - (line_width * 2))
-
-		x = prog_x
-		y = prog_y
-		width = prog_width
-		height = prog_height
-
-		cr.move_to(x + self._radius, y);
-		cr.arc(x + width - self._radius, y + self._radius,
-			   self._radius, math.pi * 1.5, math.pi * 2);
-		cr.arc(x + width - self._radius, x + height - self._radius,
-			   self._radius, 0, math.pi * 0.5);
-		cr.arc(x + self._radius, y + height - self._radius,
-			   self._radius, math.pi * 0.5, math.pi);
-		cr.arc(x + self._radius, y + self._radius, self._radius,
-			   math.pi, math.pi * 1.5);
-
-		color = self._int_to_rgb(self._progress_color)
-		cr.set_source_rgb(*color)
-		cr.fill_preserve();
diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am
index 9828c8c..83b0920 100644
--- a/sugar/graphics/Makefile.am
+++ b/sugar/graphics/Makefile.am
@@ -4,7 +4,6 @@ sugar_PYTHON =			\
 	bubble.py		\
 	canvasicon.py		\
 	colors.py		\
-	ClipboardBubble.py	\
 	grid.py			\
 	iconcolor.py		\
 	menu.py			\
diff --git a/sugar/graphics/menu.py b/sugar/graphics/menu.py
index 9c031ba..5404cf5 100644
--- a/sugar/graphics/menu.py
+++ b/sugar/graphics/menu.py
@@ -49,7 +49,6 @@ class Menu(gtk.Window):
 			self._root.append(content_box)
 
 		self._action_box = None
-		self._action_box_separator = None
 
 	def _create_separator(self):
 		separator = hippo.CanvasBox()
@@ -57,8 +56,8 @@ class Menu(gtk.Window):
 		return separator
 
 	def _create_action_box(self):
-		self._action_box_separator = self._create_separator()
-		self._root.append(self._action_box_separator)
+		separator = self._create_separator()
+		self._root.append(separator)
 
 		self._action_box = hippo.CanvasBox(
 						orientation=hippo.ORIENTATION_HORIZONTAL)
@@ -72,8 +71,5 @@ class Menu(gtk.Window):
 		icon.connect('activated', self._action_clicked_cb, action_id)
 		self._action_box.append(icon)
 
-	def remove_action(self, icon):
-		self._action_box.remove(icon)
-	
 	def _action_clicked_cb(self, icon, action):
 		self.emit('action', action)