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

3 files changed, 0 insertions, 78 deletions

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