Adding first bluetooth functions

19 files changed, 1562 insertions, 4 deletions

diff --git a/activity.py b/activity.py
index 79d5e8e..1ca1070 100644
--- a/activity.py
+++ b/activity.py
@@ -22,20 +22,46 @@ from gi.repository import Gtk
 from sugar3.activity import activity
 from sugar3.activity.widgets import ActivityToolbarButton
 from sugar3.activity.widgets import StopButton
+from sugar3.graphics.toolbutton import ToolButton
 from sugar3.graphics.toolbarbox import ToolbarBox
 
+from widgets import DeviceList
+from bt import Bluetooth
+
 #from gettext import gettext as _
 
 
-class BluetoothActivity(activity.Activity):
+class ActivityBluetooth(activity.Activity):
 
     def __init__(self, handle):
         activity.Activity.__init__(self, handle)
 
         self.max_participants = 1
 
+        self.bluetooth = Bluetooth()
+        self.bluetooth.connect('device-found', self._device_found)
+
         # Canvas
-        #
+        self._notebook = Gtk.Notebook()
+        #self._notebook.set_show_tabs(False)
+        self.set_canvas(self._notebook)
+
+        scroll = Gtk.ScrolledWindow()
+        scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        self._notebook.append_page(scroll, Gtk.Label())
+
+        self._pdevices = DeviceList()
+        self._pdevices.set_devices(self.bluetooth.get_paired_devices())
+        scroll.add(self._pdevices)
+        scroll.show_all()
+
+        scroll = Gtk.ScrolledWindow()
+        scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        self._notebook.append_page(scroll, Gtk.Label())
+
+        self._nbdevices = DeviceList()
+        scroll.add(self._nbdevices)
+        scroll.show_all()
 
         # Toolbars
         toolbarbox = ToolbarBox()
@@ -43,7 +69,13 @@ class BluetoothActivity(activity.Activity):
         activity_button = ActivityToolbarButton(self)
         toolbarbox.toolbar.insert(activity_button, 0)
 
-        separator = gtk.SeparatorToolItem()
+        toolbarbox.toolbar.insert(Gtk.SeparatorToolItem(), -1)
+
+        search_btn = ToolButton(icon_name='system-search')
+        search_btn.connect('clicked', self._find_devices)
+        toolbarbox.toolbar.insert(search_btn, -1)
+
+        separator = Gtk.SeparatorToolItem()
         separator.set_draw(False)
         separator.set_expand(True)
         toolbarbox.toolbar.insert(separator, -1)
@@ -54,3 +86,10 @@ class BluetoothActivity(activity.Activity):
         self.set_toolbar_box(toolbarbox)
         self.show_all()
 
+    def _find_devices(self, widget):
+        self._notebook.set_current_page(1)
+        self.bluetooth.find_devices()
+        self.nbdevices.model.clear()
+
+    def _device_found(self, bluetooth, deviceprops):
+        self.nbdevices.add_device(deviceprops)
\ No newline at end of file
diff --git a/activity/activity.info b/activity/activity.info
index ad6b34f..ff90c01 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -2,7 +2,7 @@
 name = Bluetooth
 activity_version = 1
 bundle_id = org.sugarlabs.Bluetooth
-exec = sugar-activity activity.Bluetooth -s
+exec = sugar-activity activity.ActivityBluetooth -s
 icon = activity-bluetooth
 show_launcher = yes
 license = GPLv3+
diff --git a/bluez/AUTHORS b/bluez/AUTHORS
new file mode 100644
index 0000000..cca440c
--- /dev/null
+++ b/bluez/AUTHORS
@@ -0,0 +1,2 @@
+Vinicius Gomes <vcgomes@gmail.com>
+Li Dongyang <Jerry87905@gmail.com>
\ No newline at end of file
diff --git a/bluez/Adapter.py b/bluez/Adapter.py
new file mode 100644
index 0000000..6428543
--- /dev/null
+++ b/bluez/Adapter.py
@@ -0,0 +1,138 @@
+# Adapter.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import dbus
+import types
+
+import Device
+import Agent
+import errors
+from utils import raise_dbus_error
+from utils import raise_type_error
+from BaseInterface import BaseInterface
+
+class Adapter(BaseInterface):
+
+    @raise_dbus_error
+    def __init__(self, obj_path):
+        super(Adapter, self).__init__('org.bluez.Adapter', obj_path)
+    # __init__
+
+    @raise_dbus_error
+    def GetProperties(self):
+        return self.GetInterface().GetProperties()
+    # GetProperties
+
+    @raise_dbus_error
+    def SetProperty(self, name, value):
+        if type(value) == types.IntType:
+            value = dbus.UInt32(value)
+        self.GetInterface().SetProperty(name, value)
+    # SetProperty
+
+    @raise_dbus_error
+    def RequestSession(self):
+        self.GetInterface().RequestSession()
+    # RequestSession
+
+    @raise_dbus_error
+    def ReleaseSession(self):
+        self.GetInterface().ReleaseSession()
+    # ReleaseSession
+
+    @raise_dbus_error
+    def StartDiscovery(self):
+        self.GetInterface().StartDiscovery()
+    # StartDiscovery
+
+    @raise_dbus_error
+    def StopDiscovery(self):
+        self.GetInterface().StopDiscovery()
+    # StopDiscovery
+
+    @raise_dbus_error
+    def FindDevice(self, address):
+        obj_path = self.GetInterface().FindDevice(address)
+        return Device.Device(obj_path)
+    # FindDevice
+
+    @raise_dbus_error
+    def ListDevices(self):
+        obj_paths = self.GetInterface().ListDevices()
+        devices = []
+        for obj_path in obj_paths:
+            devices.append(Device.Device(obj_path))
+        return devices
+    # ListDevices
+
+    @raise_dbus_error
+    def CreateDevice(self, address):
+        obj_path = self.GetInterface().CreateDevice(address)
+        return Device.Device(obj_path)
+    # CreateDevice
+
+    @raise_dbus_error
+    def CreatePairedDevice(self, address, agent, capability='', reply_handler=None, error_handler=None):
+        def reply_handler_wrapper(obj_path):
+            if not callable(reply_handler):
+                return
+            reply_handler(Device.Device(obj_path))
+
+        def error_handler_wrapper(exception):
+            exception = errors.parse_dbus_error(exception)
+            if not callable(error_handler):
+                raise exception
+            error_handler(exception)
+
+        raise_type_error(agent, Agent.Agent)
+        if reply_handler is None and error_handler is None:
+            obj_path = self.GetInterface().CreatePairedDevice(address, agent.GetObjectPath(), capability)
+            return Device.Device(obj_path)
+        else:
+            self.GetInterface().CreatePairedDevice(address,
+                                                   agent.GetObjectPath(),
+                                                   capability,
+                                                   reply_handler=reply_handler_wrapper,
+                                                   error_handler=error_handler_wrapper)
+            return None
+    # CreatePairedDevice
+
+    @raise_dbus_error
+    def CancelDeviceCreation(self, address):
+        self.GetInterface.CancelDeviceCreation(address)
+    # CancelDeviceCreation
+
+    @raise_dbus_error
+    def RemoveDevice(self, device):
+        raise_type_error(device, Device.Device)
+        self.GetInterface().RemoveDevice(device.GetObjectPath())
+    # RemoveDevice
+
+    @raise_dbus_error
+    def RegisterAgent(self, agent, capability=''):
+        raise_type_error(agent, Agent.Agent)
+        self.GetInterface().RegisterAgent(agent.GetObjectPath(), capability)
+    # RegisterAgent
+
+    @raise_dbus_error
+    def UnregisterAgent(self, agent):
+        raise_type_error(agent, Agent.Agent)
+        self.GetInterface().UnregisterAgent(agent.GetObjectPath())
+    # UnregisterAgent
+# Adapter
diff --git a/bluez/Agent.py b/bluez/Agent.py
new file mode 100644
index 0000000..2b60eaf
--- /dev/null
+++ b/bluez/Agent.py
@@ -0,0 +1,121 @@
+# Agent.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import inspect
+import dbus
+import dbus.service
+import errors
+
+__SIGNATURES__ = {'Release':('', ''),
+                  'RequestPinCode':('o', 's'),
+                  'RequestPasskey':('o', 'u'),
+                  'DisplayPasskey':('ou', ''),
+                  'RequestConfirmation':('ou', ''),
+                  'Authorize':('os', ''),
+                  'ConfirmModeChange':('s', ''),
+                  'Cancel':('', '')}
+
+def AgentMethod(func):
+    '''
+    The decorator for customizing the agent methods.
+    To use async callbacks, add two extra parameters for
+    success callback and error callback in the def of the agent method.
+    '''
+    global __SIGNATURES__
+    try:
+        signatures = __SIGNATURES__[func.__name__]
+    except KeyError:
+        raise errors.BluezUnavailableAgentMethodError('method name ' + func.__name__ + ' unavailable for agent')
+    args = inspect.getargspec(func)[0]
+    if len(args) - len(signatures[0]) == 3:
+        async_callbacks = (args[-2], args[-1])
+    else:
+        async_callbacks = None
+    warp = dbus.service.method('org.bluez.Agent',
+                               in_signature=signatures[0],
+                               out_signature=signatures[1],
+                               async_callbacks=async_callbacks)
+    return warp(func)
+# AgentMethod
+
+class Agent(dbus.service.Object):
+
+    '''
+    Inherit from this class and use AgentMethod decorator
+    to customize the methods.
+    The simple-agent is provided by default.
+    '''
+
+    def __init__(self, obj_path):
+        self.__obj_path = obj_path
+        dbus.service.Object.__init__(self, dbus.SystemBus(), obj_path)
+    # __init__
+
+    def GetObjectPath(self):
+        '''Returns the dbus object path of the agent.'''
+        return self.__obj_path
+    # GetObjectPath
+
+    @AgentMethod
+    def Release(self):
+        print "Release"
+    # Release
+
+    @AgentMethod
+    def RequestPinCode(self, device):
+        print "RequestPinCode (%s)" % (device)
+        return raw_input("Enter PIN Code:")
+    # RequestPinCode
+
+    @AgentMethod
+    def RequestPasskey(self, device):
+        print "RequestPasskey (%s)" % (device)
+        passkey = raw_input("Enter Passkey:")
+        return dbus.UInt32(passkey)
+    # RequestPasskey
+
+    @AgentMethod
+    def DisplayPasskey(self, device, passkey):
+        print "DisplayPasskey (%s, %d)" % (device, passkey)
+    # DisplayPasskey
+
+    @AgentMethod
+    def RequestConfirmation(self, device, passkey):
+        print "RequestConfirmation (%s, %d)" % (device, passkey)
+        confirm = raw_input("Confirm passkey (y/n): ")
+        if confirm == 'y':
+            return
+        raise errors. DBusAuthenticationRejectedError("Passkey doesn't match")
+    # RequestConfirmation
+
+    @AgentMethod
+    def Authorize(self, device, uuid):
+        print "Authorize (%s, %s)" % (device, uuid)
+    # Authorize
+
+    @AgentMethod
+    def ConfirmModeChange(self, mode):
+        print "ConfirmModeChange (%s)" % (mode)
+    # ConfirmModeChange
+
+    @AgentMethod
+    def Cancel(self):
+        print "Cancel"
+    # Cancel
+# Agent
diff --git a/bluez/BaseInterface.py b/bluez/BaseInterface.py
new file mode 100644
index 0000000..3de3908
--- /dev/null
+++ b/bluez/BaseInterface.py
@@ -0,0 +1,51 @@
+# BaseInterface.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import dbus
+import xml.dom.minidom
+
+from BlueZInterface import BlueZInterface
+from ServiceInterface import ServiceInterface
+
+class BaseInterface(BlueZInterface):
+
+    def __init__(self, interface_name, obj_path):
+        super(BaseInterface, self).__init__(interface_name, obj_path)
+    # __init__
+
+    def ListServiceInterfaces(self):
+        '''
+        Returns a list of available service interfaces under current object path,
+        for available methods for each interface, check BlueZ4 documents.
+        '''
+        interfaces = []
+        dbus_object = dbus.SystemBus().get_object('org.bluez', self.GetObjectPath())
+        dbus_introspect = dbus.Interface(dbus_object, 'org.freedesktop.DBus.Introspectable')
+        introspect_xml = dbus_introspect.Introspect()
+        root_node = xml.dom.minidom.parseString(introspect_xml)
+        for interface in root_node.getElementsByTagName('interface'):
+            interface_name = interface.getAttribute('name')
+            if interface_name != self.GetInterfaceName():
+                methods = []
+                for method in interface.getElementsByTagName('method'):
+                    methods.append(method.getAttribute('name'))
+                interfaces.append(ServiceInterface(interface_name, self.GetObjectPath(), methods))
+        return interfaces
+    # ListServiceInterfaces
+# BaseInterface
diff --git a/bluez/BlueZInterface.py b/bluez/BlueZInterface.py
new file mode 100644
index 0000000..1b5959d
--- /dev/null
+++ b/bluez/BlueZInterface.py
@@ -0,0 +1,80 @@
+# BlueZInterface.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import dbus
+import types
+
+from utils import raise_type_error
+
+class BlueZInterface(object):
+
+    def __init__(self, interface_name, obj_path):
+        self.__obj_path = obj_path
+        self.__interface_name = interface_name
+        self.__bus = dbus.SystemBus()
+        self.__dbus_proxy = self.__bus.get_object('org.bluez', obj_path, follow_name_owner_changes=True)
+        self.__interface = dbus.Interface(self.__dbus_proxy, interface_name)
+        try:
+            self._properties = self.__interface.GetProperties()
+            self.__bus.add_signal_receiver(self._update_property,
+                                           "PropertyChanged",
+                                           interface_name,
+                                           "org.bluez",
+                                           obj_path)
+        except dbus.exceptions.DBusException:
+            self._properties = {}
+    # __init__
+
+    def _update_property(self, name, value):
+        self._properties[name] = value
+    # _update_property
+
+    def __getattr__(self, name):
+        if not name in self._properties:
+            raise AttributeError("'%s' object has no attribute '%s'"
+                                 % (self.__class__.__name__, name) )
+        return self._properties[name]
+    # __getattr__
+
+    def GetObjectPath(self):
+        return self.__obj_path
+    # GetObjectPath
+
+    def GetInterface(self):
+        return self.__interface
+    # GetInterface
+
+    def GetInterfaceName(self):
+        return self.__interface_name
+    # GetInterfaceName
+
+    def HandleSignal(self, handler, signal):
+        '''
+        The handler function will be called when specific signal is emitted.
+        For available signals of each interface, check BlueZ4 documents.
+        '''
+        raise_type_error(handler, types.FunctionType)
+        raise_type_error(signal, types.StringType)
+        self.__bus.add_signal_receiver(handler,
+                                       signal,
+                                       self.__interface_name,
+                                       'org.bluez',
+                                       self.__obj_path)
+    # HandleSignal
+# BlueZInterface
diff --git a/bluez/COPYING b/bluez/COPYING
new file mode 100644
index 0000000..5ab7695
--- /dev/null
+++ b/bluez/COPYING
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/bluez/ChangeLog b/bluez/ChangeLog
new file mode 100644
index 0000000..450c92b
--- /dev/null
+++ b/bluez/ChangeLog
@@ -0,0 +1,25 @@
+ver 0.1.4:
+    Manager is no longer a singleton, will raise an exception
+    when trying to re-init Manager with a different mainloop.
+    Raise a general AttributeError when interface doesn't have a
+    method or property.
+
+ver 0.1.3:
+    Follow the latest BlueZ API.
+    New way to get properties instead of calling GetProperties(),
+    e.g. just call adapter.Name
+    Change license to LGPL 2.1.
+
+ver 0.1.2:
+    Remove service record related methods from Adapter,
+    as they are now in service plugin.
+    Rename discover related methods of Adapter
+    to follow the BlueZ API changes.
+
+ver 0.1.1:
+    Add class BaseInterface with method ListServiceInterfaces.
+    Make Manager, Adapter and Device inherit from BaseInterface.
+    Remove ListInterfaces from Device.
+
+ver 0.1:
+    Initial public release.
diff --git a/bluez/Device.py b/bluez/Device.py
new file mode 100644
index 0000000..8121411
--- /dev/null
+++ b/bluez/Device.py
@@ -0,0 +1,54 @@
+# Device.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+from utils import raise_dbus_error
+from BaseInterface import BaseInterface
+
+class Device(BaseInterface):
+
+    @raise_dbus_error
+    def __init__(self, obj_path):
+        super(Device, self).__init__('org.bluez.Device', obj_path)
+    # __init__
+
+    @raise_dbus_error
+    def GetProperties(self):
+        return self.GetInterface().GetProperties()
+    # GetProperties
+
+    @raise_dbus_error
+    def SetProperty(self, name, value):
+        self.GetInterface().SetProperty(name, value)
+    # SetProperty
+
+    @raise_dbus_error
+    def DiscoverServices(self, pattern):
+        return self.GetInterface().DiscoverServices(pattern)
+    # DiscoverServices
+
+    @raise_dbus_error
+    def CancelDiscovery(self):
+        self.GetInterface().CancelDiscovery()
+    # CancelDiscovery
+
+    @raise_dbus_error
+    def Disconnect(self):
+        self.GetInterface().Disconnect()
+    # Disconnect
+# Device
diff --git a/bluez/Manager.py b/bluez/Manager.py
new file mode 100644
index 0000000..c04c1fa
--- /dev/null
+++ b/bluez/Manager.py
@@ -0,0 +1,121 @@
+# Manager.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import Adapter
+import Agent
+import errors
+from utils import raise_dbus_error
+from BaseInterface import BaseInterface
+
+class Manager(BaseInterface):
+
+    '''
+    Pass the name of the mainloop as a string to __init__.
+    The mainloop support could not be changed after the first init of Manager.
+    Supported mainloops are gobject, pyqt4 and ecore, use your perferred one.
+    And gobject is supported by dbus-python natively.
+    If you wanna use pyqt4 or ecore, make sure you have python bindings for them.
+    '''
+
+    _mainloop_support = ''
+
+    @raise_dbus_error
+    def __init__(self, mainloop):
+        if Manager._mainloop_support == '':
+            self.__setup_event_loop(mainloop)
+        elif Manager._mainloop_support != mainloop:
+            raise errors.DBusMainLoopAlreadyExistsError("Already have " + Manager._mainloop_support)
+        super(Manager, self).__init__('org.bluez.Manager', '/')
+    # __init__
+
+    def __setup_event_loop(self, mainloop):
+        def raise_mainloop_not_found(mainloop):
+            raise errors.DBusMainLoopModuleNotFoundError('Can not find mofule for ' + mainloop)
+        def parse_gobject_mainloop(mainloop):
+            try:
+                import dbus.mainloop.glib
+            except ImportError:
+                raise_mainloop_not_found(mainloop)
+            dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+            return True
+
+        def parse_pyqt4_mainloop(mainloop):
+            try:
+                import dbus.mainloop.qt
+            except ImportError:
+                raise_mainloop_not_found(mainloop)
+            dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
+            return True
+
+        def parse_ecore_mainloop(mainloop):
+            try:
+                import e_dbus
+            except ImportError:
+                raise_mainloop_not_found(mainloop)
+            e_dbus.DBusEcoreMainLoop(set_as_default=True)
+            return True
+
+        _supported_mainloops = {'gobject':parse_gobject_mainloop,
+                                'pyqt4':parse_pyqt4_mainloop,
+                                'ecore':parse_ecore_mainloop}
+        if (not isinstance(mainloop, str)) or (mainloop not in _supported_mainloops):
+            raise errors.DBusMainLoopNotSupportedError('Supported mainloops are gobject, pyqt4 and ecore')
+        else:
+            parse_mainloop = _supported_mainloops.get(mainloop)
+            if parse_mainloop(mainloop):
+                Manager._mainloop_support = mainloop
+    # __setup_event_loop
+
+    @raise_dbus_error
+    def GetProperties(self):
+        return self.GetInterface().GetProperties()
+    # GetProperties
+
+    @raise_dbus_error
+    def DefaultAdapter(self):
+        obj_path = self.GetInterface().DefaultAdapter()
+        return Adapter.Adapter(obj_path)
+    # DefaultAdapter
+
+    @raise_dbus_error
+    def FindAdapter(self, pattern):
+        obj_path = self.GetInterface().FindAdapter(pattern)
+        return Adapter.Adapter(obj_path)
+    # FindAdapter
+
+    @raise_dbus_error
+    def ListAdapters(self):
+        obj_paths = self.GetInterface().ListAdapters()
+        adapters = []
+        for obj_path in obj_paths:
+            adapters.append(Adapter.Adapter(obj_path))
+        return adapters
+    # ListAdapters
+
+    def CreateAgent(self, cls=Agent.Agent, obj_path='/org/bluez/Agent'):
+        '''
+        Paramater cls should be a custom sub-class of Agent.
+        Paramater obj_path is the dbus object path for the agent, should start with '/'.
+        Returns an instance of specified cls.
+        '''
+        if not issubclass(cls, Agent.Agent):
+            raise TypeError('Expecting a subclass of Agent')
+        return cls(obj_path)
+    # CreateAgent
+# Manager
diff --git a/bluez/README b/bluez/README
new file mode 100644
index 0000000..5efcd1f
--- /dev/null
+++ b/bluez/README
@@ -0,0 +1,34 @@
+bluez-python - A BlueZ python binding on top of dbus-python
+
+
+Requirements
+==============================
+
+In order to use bluez-python you need following software packages:
+    - Python 2.5 or later
+    - Linux Bluetooth protocol stack (BlueZ)
+    - Python bindings for D-Bus (dbus-python)
+
+
+Installation
+==============================
+
+From a command shell:
+
+# python setup.py install
+
+
+Notes
+==============================
+
+    - Only supports BlueZ4 API
+    - Checking the doc directory in the BlueZ source package is always a good idea.
+
+
+Contact
+==============================
+
+Li Dongyang <Jerry87905@gmail.com>
+
+For additional information, check the page on the BlueZ wiki:
+    http://wiki.bluez.org/wiki/bluez-python
\ No newline at end of file
diff --git a/bluez/ServiceInterface.py b/bluez/ServiceInterface.py
new file mode 100644
index 0000000..6a06c44
--- /dev/null
+++ b/bluez/ServiceInterface.py
@@ -0,0 +1,38 @@
+# ServiceInterface.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+from utils import raise_dbus_error
+from BlueZInterface import BlueZInterface
+
+class ServiceInterface(BlueZInterface):
+
+    @raise_dbus_error
+    def __init__(self, interface, obj_path, methods):
+        self.methods = methods
+        super(ServiceInterface, self).__init__(interface, obj_path)
+    # __init__
+
+    def __getattribute__(self, name):
+        if name in object.__getattribute__(self, 'methods'):
+            func = getattr(self.GetInterface(), name)
+            return raise_dbus_error(func)
+        else:
+            return super(ServiceInterface, self).__getattribute__(name)
+    # __getattribute__
+# ServiceInterface
diff --git a/bluez/__init__.py b/bluez/__init__.py
new file mode 100644
index 0000000..ae22459
--- /dev/null
+++ b/bluez/__init__.py
@@ -0,0 +1,22 @@
+# __init__.py - make bluez a package
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+from Manager import Manager
+from Agent import Agent
+from Agent import AgentMethod
diff --git a/bluez/errors.py b/bluez/errors.py
new file mode 100644
index 0000000..45b2cdc
--- /dev/null
+++ b/bluez/errors.py
@@ -0,0 +1,144 @@
+# errors.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class BluezDBusException(Exception):
+    """
+    Custom Bluez Dbus Exception class.
+    """
+    def __init__(self, reason):
+        """ """
+        self.reason = reason
+
+    # __init__
+    def __str__(self):
+        """ """
+        return self.reason
+    # repr
+
+class DBusFailedError(BluezDBusException):
+    pass
+
+class DBusInvalidArgumentsError(BluezDBusException):
+    pass
+
+class DBusNotAuthorizedError(BluezDBusException):
+    pass
+
+class DBusOutOfMemoryError(BluezDBusException):
+    pass
+
+class DBusNoSuchAdapterError(BluezDBusException):
+    pass
+
+class DBusNotReadyError(BluezDBusException):
+    pass
+
+class DBusNotAvailableError(BluezDBusException):
+    pass
+
+class DBusNotConnectedError(BluezDBusException):
+    pass
+
+class DBusConnectionAttemptFailedError(BluezDBusException):
+    pass
+
+class DBusAlreadyExistsError(BluezDBusException):
+    pass
+
+class DBusDoesNotExistError(BluezDBusException):
+    pass
+
+class DBusNoReplyError(BluezDBusException):
+    pass
+
+class DBusInProgressError(BluezDBusException):
+    pass
+
+class DBusNotSupportedError(BluezDBusException):
+    pass
+
+class DBusAuthenticationFailedError(BluezDBusException):
+    pass
+
+class DBusAuthenticationTimeoutError(BluezDBusException):
+    pass
+
+class DBusAuthenticationRejectedError(BluezDBusException):
+    pass
+
+class DBusAuthenticationCanceledError(BluezDBusException):
+    pass
+
+class DBusUnsupportedMajorClassError(BluezDBusException):
+    pass
+
+class DBusNotSupportedError(BluezDBusException):
+    pass
+
+class DBusServiceUnknownError(BluezDBusException):
+    pass
+
+class DBusMainLoopNotSupportedError(BluezDBusException):
+    pass
+
+class DBusMainLoopModuleNotFoundError(BluezDBusException):
+    pass
+
+class DBusMainLoopAlreadyExistsError(BluezDBusException):
+    pass
+
+class BluezUnavailableAgentMethodError(BluezDBusException):
+    pass
+
+
+__DICT_ERROR__ = {'org.bluez.Error.Failed:':DBusFailedError,
+                  'org.bluez.Error.InvalidArguments:':DBusInvalidArgumentsError,
+                  'org.bluez.Error.NotAuthorized:':DBusNotAuthorizedError,
+                  'org.bluez.Error.OutOfMemory:':DBusOutOfMemoryError,
+                  'org.bluez.Error.NoSuchAdapter:':DBusNoSuchAdapterError,
+                  'org.bluez.Error.NotReady:':DBusNotReadyError,
+                  'org.bluez.Error.NotAvailable:':DBusNotAvailableError,
+                  'org.bluez.Error.NotConnected:':DBusNotConnectedError,
+                  'org.bluez.serial.Error.ConnectionAttemptFailed:':DBusConnectionAttemptFailedError,
+                  'org.bluez.Error.AlreadyExists:':DBusAlreadyExistsError,
+                  'org.bluez.Error.DoesNotExist:':DBusDoesNotExistError,
+                  'org.bluez.Error.InProgress:':DBusInProgressError,
+                  'org.bluez.Error.NoReply:':DBusNoReplyError,
+                  'org.bluez.Error.NotSupported:':DBusNotSupportedError,
+                  'org.bluez.Error.AuthenticationFailed:':DBusAuthenticationFailedError,
+                  'org.bluez.Error.AuthenticationTimeout:':DBusAuthenticationTimeoutError,
+                  'org.bluez.Error.AuthenticationRejected:':DBusAuthenticationRejectedError,
+                  'org.bluez.Error.AuthenticationCanceled:':DBusAuthenticationCanceledError,
+                  'org.bluez.serial.Error.NotSupported:':DBusNotSupportedError,
+                  'org.bluez.Error.UnsupportedMajorClass:':DBusUnsupportedMajorClassError,
+                  'org.freedesktop.DBus.Error.ServiceUnknown:':DBusServiceUnknownError}
+
+def parse_dbus_error(exception):
+    """
+    Return a custom exception based in the dbus exception that was raised.
+    """
+    global __DICT_ERROR__
+
+    aux = "%s" % exception
+    aux_splt = aux.split(None,1)
+    try:
+        return __DICT_ERROR__[aux_splt[0]](aux_splt[1])
+    except KeyError:
+        return exception
+# parse_dbus_error
diff --git a/bluez/utils.py b/bluez/utils.py
new file mode 100644
index 0000000..52ee4b5
--- /dev/null
+++ b/bluez/utils.py
@@ -0,0 +1,35 @@
+# utils.py
+#
+# Copyright (C) 2008 Vinicius Gomes <vcgomes [at] gmail [dot] com>
+# Copyright (C) 2008 Li Dongyang <Jerry87905 [at] gmail [dot] com>
+#
+# 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.1 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+import dbus
+import errors
+
+def raise_dbus_error(method):
+    def warp(*args, **kwargs):
+        try:
+            return method(*args, **kwargs)
+        except dbus.DBusException, exception:
+            raise errors.parse_dbus_error(exception)
+    return warp
+# raise_dbus_error
+
+def raise_type_error(instance, cls):
+    if not isinstance(instance, cls):
+        raise TypeError('Expecting an instance of ' + cls.__name__ + ', not ' + type(instance).__name__)
+# raise_type_error
diff --git a/bt.py b/bt.py
new file mode 100644
index 0000000..72241ea
--- /dev/null
+++ b/bt.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2013 Agustin Zubiaga <aguz@sugarlabs.org>
+
+# 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 3 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 bluez
+
+from gi.repository import GObject
+
+SEARCH_TIME = 20  # seconds
+
+
+class Bluetooth(GObject.GObject):
+
+    __gsignals__ = {
+            'device-found': (GObject.SignalFlags.RUN_FIRST, None, [object])}
+
+    def __init__(self):
+        super(Bluetooth, self).__init__()
+
+        manager = bluez.Manager('gobject')
+        self._adapter = manager.DefaultAdapter()
+        #self._adapter.HandleSignal(self._device_found, 'DeviceFound')
+
+        self._nearby_devices = []
+        self._paired_devices = self._adapter.ListDevices()
+
+    def get_paired_devices(self):
+        return [i.GetProperties() for i in self._paired_devices]
+
+    def find_devices(self):
+        self._adapter.StartDiscovery()
+        self._nearby_devices = []
+        GObject.timeout_add(SEARCH_TIME * 1000, self._stop_search)
+
+    def _device_found(self, address, properties):
+        self._nearby_devices.append(properties)
+        self.emit('device-found', properties)
+        return
+
+    def _stop_search(self):
+        self._adapter.StopDiscovery()
diff --git a/icons/bluetooth.svg b/icons/bluetooth.svg
new file mode 100644
index 0000000..2f18167
--- /dev/null
+++ b/icons/bluetooth.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#000000">
+	<!ENTITY fill_color "#ffffff">
+]><svg height="100%" id="svg2" inkscape:version="0.48.4 r9939" sodipodi:docname="Bluetooth.svg" version="1.1" viewBox="25 36 700 978" width="100%" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+  <metadata id="metadata14">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs12"/>
+  <sodipodi:namedview bordercolor="#000000" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview10" inkscape:current-layer="g4" inkscape:cx="1127.0127" inkscape:cy="371.07041" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="480" inkscape:window-maximized="0" inkscape:window-width="809" inkscape:window-x="0" inkscape:window-y="27" inkscape:zoom="0.24130879" objecttolerance="10" pagecolor="#ffffff" showgrid="false"/>
+  <g fill="&fill_color;" id="g4" style="fill:#000000">
+    <rect height="976" id="rect6" ry="291" style="fill:&fill_color;" width="640" x="51" y="37"/>
+    <path d="M208,367 513,674 366,852V216L513,386 208,685" id="path8" stroke="&stroke_color;" stroke-width="53" style="fill:&fill_color;"/>
+  </g>
+</svg>
diff --git a/widgets.py b/widgets.py
new file mode 100644
index 0000000..821b60c
--- /dev/null
+++ b/widgets.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2013 Agustin Zubiaga <aguz@sugarlabs.org>
+
+# 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 3 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
+
+from gi.repository import Gtk
+from gi.repository import Gdk
+from gi.repository import GdkPixbuf
+
+import os
+from sugar3.activity import activity
+from sugar3.graphics import style
+
+ICONS_DIR = os.path.join(activity.get_bundle_path(), "icons")
+
+
+def get_icon(icon_id):
+    icon_path = os.path.join(ICONS_DIR, icon_id + ".svg")
+    if not os.path.exists(icon_path):
+        icon_path = os.path.join(ICONS_DIR, "bluetooth.svg")
+
+    return icon_path
+
+
+class DeviceList(Gtk.TreeView):
+
+    def __init__(self):
+        super(DeviceList, self).__init__()
+
+        self.model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str)
+        self.set_model(self.model)
+
+        column = Gtk.TreeViewColumn()
+        cell = Gtk.CellRendererPixbuf()
+        column.pack_start(cell, False)
+        column.add_attribute(cell, "pixbuf", 0)
+        self.append_column(column)
+
+        column = Gtk.TreeViewColumn()
+        cell = Gtk.CellRendererText()
+        column.pack_start(cell, False)
+        column.add_attribute(cell, "text", 1)
+        self.append_column(column)
+
+        column = Gtk.TreeViewColumn()
+        cell = Gtk.CellRendererText()
+        column.pack_start(cell, False)
+        column.add_attribute(cell, "text", 2)
+        self.append_column(column)
+
+        #self.modify_base(Gdk.Color(255, 255, 255))
+
+    def add_device(self, i):
+        icon = get_icon(i["Icon"])
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(icon,
+                         style.MEDIUM_ICON_SIZE, style.MEDIUM_ICON_SIZE)
+        self.model.append([pixbuf, i["Name"], i["Address"]])
+
+    def set_devices(self, devices):
+        for i in devices:
+            self.add_device(i)
\ No newline at end of file