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

6 files changed, 1 insertions, 140 deletions

diff --git a/services/Makefile.am b/services/Makefile.am
index 2a0fe5a..1bae7e7 100644
--- a/services/Makefile.am
+++ b/services/Makefile.am
@@ -1 +1 @@
-SUBDIRS = presence nm clipboard
+SUBDIRS = presence nm
diff --git a/services/clipboard/ClipboardService.py b/services/clipboard/ClipboardService.py
deleted file mode 100644
index 9ed9217..0000000
--- a/services/clipboard/ClipboardService.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# vi: ts=4 ai noet
-#
-# Copyright (C) 2006, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import logging
-import gobject
-import dbus
-import dbus.service
-from sugar import env
-
-class ClipboardDBusServiceHelper(dbus.service.Object):
-
-	_CLIPBOARD_DBUS_INTERFACE = "org.laptop.Clipboard"
-	_CLIPBOARD_OBJECT_PATH = "/org/laptop/Clipboard"
-
-	def __init__(self, parent):
-		self._parent = parent
-
-		bus = dbus.SessionBus()
-		bus_name = dbus.service.BusName(self._CLIPBOARD_DBUS_INTERFACE, bus=bus)
-		dbus.service.Object.__init__(self, bus_name, self._CLIPBOARD_OBJECT_PATH)
-		
-	@dbus.service.method(_CLIPBOARD_DBUS_INTERFACE,
-						 in_signature="ss", out_signature="")
-	def add_object(self, mimeType, fileName):
-		self.object_added(mimeType, fileName)
-		logging.debug('Added object of type ' + mimeType + ' with path at ' + fileName)
-
-	@dbus.service.method(_CLIPBOARD_DBUS_INTERFACE,
-						 in_signature="s", out_signature="")
-	def delete_object(self, fileName):
-		self.object_deleted(fileName)
-		logging.debug('Deleted object with path at ' + fileName)
-		
-	@dbus.service.method(_CLIPBOARD_DBUS_INTERFACE,
-						 in_signature="si", out_signature="")
-	def update_object_state(self, fileName, percent):
-		logging.debug('Updated object with path at ' + fileName + ' with percent ' + str(percent))
-		self.object_state_updated(fileName, percent)
-
-	@dbus.service.signal(_CLIPBOARD_DBUS_INTERFACE, signature="ss")
-	def object_added(self, mimeType, fileName):
-		pass
-
-	@dbus.service.signal(_CLIPBOARD_DBUS_INTERFACE, signature="s")
-	def object_deleted(self, fileName):
-		pass
-
-	@dbus.service.signal(_CLIPBOARD_DBUS_INTERFACE, signature="si")
-	def object_state_updated(self, fileName, percent):
-		pass
-
-class ClipboardService(object):
-	def __init__(self):
-		self._dbus_helper = ClipboardDBusServiceHelper(self)
-
-	def run(self):
-		loop = gobject.MainLoop()
-		try:
-			loop.run()
-		except KeyboardInterrupt:
-			print 'Ctrl+C pressed, exiting...'
diff --git a/services/clipboard/Makefile.am b/services/clipboard/Makefile.am
deleted file mode 100644
index ccc54f2..0000000
--- a/services/clipboard/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-servicedir = $(datadir)/sugar/services
-service_in_files = org.laptop.Clipboard.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
-
-sugardir = $(pkgdatadir)/services/clipboard
-sugar_PYTHON =			\
-	__init__.py			\
-	ClipboardService.py
-
-bin_SCRIPTS = sugar-clipboard
-
-EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS)
diff --git a/services/clipboard/__init__.py b/services/clipboard/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/services/clipboard/__init__.py
+++ /dev/null
diff --git a/services/clipboard/org.laptop.Clipboard.service.in b/services/clipboard/org.laptop.Clipboard.service.in
deleted file mode 100644
index b38bf2b..0000000
--- a/services/clipboard/org.laptop.Clipboard.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name = org.laptop.Clipboard
-Exec = @bindir@/sugar-clipboard
-
diff --git a/services/clipboard/sugar-clipboard b/services/clipboard/sugar-clipboard
deleted file mode 100755
index bcbd280..0000000
--- a/services/clipboard/sugar-clipboard
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/python
-# vi: ts=4 ai noet 
-#
-# Copyright (C) 2006, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import sys
-import logging
-
-from sugar import logger
-logger.start('clipboard')
-
-import gobject
-import pygtk
-pygtk.require('2.0')
-
-import dbus.glib
- 
-from sugar import env
-
-sys.path.insert(0, env.get_services_dir())
-
-from clipboard.ClipboardService import ClipboardService
-
-logging.info('Starting clipboard service.')
-
-gobject.threads_init()
-dbus.glib.threads_init()
-
-app = ClipboardService()
-app.run()