Removed deprecated callbackbase.

FIXES:
 - Removed deprecated callbackbase.

Signed-off-by: Bruno Abinader <bruno.abinader@indt.org.br>

git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1406 596f6dd7-e928-0410-a184-9e12fd12cf7e

diff --git a/callbackbase.pyx b/callbackbase.pyx
deleted file mode 100644 (file)
index a6ef6b7..0000000
--- a/callbackbase.pyx
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#  Copyright (c) 2008 INdT - Instituto Nokia de Tecnologia
-#
-#  This file is part of python-purple.
-#
-#  python-purple 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.
-#
-#  python-purple 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, see <http://www.gnu.org/licenses/>.
-#
-#
-
-class CallBackBase:
-    def __init__(self, dict_cbs):
-        self.cbs = dict_cbs
-
-    def add_callback(self, name, func):
-        self.cbs[name] = func
-
-    def call_callback(self, name):
-        self.cbs[name] = (data, user)

diff --git a/purple.pyx b/purple.pyx
index f0989fd..e69a966 100644 (file)
--- a/purple.pyx
+++ b/purple.pyx
@@ -245,8 +245,9 @@ cdef class Purple:
 
         return ret
 
 
         return ret
 

-    def add_callback(self, type, name, func):
-        """ Adds a callback 'func' with given name 'name' inside type 'type'.
+    def add_callback(self, type, name, callback):
+        """
+        Adds a callback with given name inside callback's type.

         Example: add_callback("account", "notify-added", notify_added_cb)
         """
         global account_cbs
         Example: add_callback("account", "notify-added", notify_added_cb)
         """
         global account_cbs

@@ -261,7 +262,7 @@ cdef class Purple:
           "connection": connection_cbs,
           "conversation": conversation_cbs,
           "notify": notify_cbs,
           "connection": connection_cbs,
           "conversation": conversation_cbs,
           "notify": notify_cbs,

-          "request": request_cbs }[type][name] = func
+          "request": request_cbs }[type][name] = callback

 
     def signal_connect(self, name=None, cb=None):
         cdef int handle
 
     def signal_connect(self, name=None, cb=None):
         cdef int handle