From af06ff22149191c056804e7fec9c1a6880a06872 Mon Sep 17 00:00:00 2001
From: Bryan Forbes
Date: Wed, 31 Mar 2010 15:01:50 -0500
Subject: Fixed some class names and inheritance chains.

---
 cython/imobiledevice.pyx        | 6 ++++--
 cython/installation_proxy.pxi   | 2 +-
 cython/mobile_image_mounter.pxi | 2 +-
 cython/sbservices.pxi           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'cython')

diff --git a/cython/imobiledevice.pyx b/cython/imobiledevice.pyx
index b7ec87b..dc0fb88 100644
--- a/cython/imobiledevice.pyx
+++ b/cython/imobiledevice.pyx
@@ -70,10 +70,12 @@ cdef class iDeviceError(BaseError):
 cpdef set_debug_level(int level):
     idevice_set_debug_level(level)
 
-cdef class iDeviceEvent: pass
+cdef class iDeviceEvent:
+    def __init__(self, *args, **kwargs):
+        raise TypeError("iDeviceEvent cannot be instantiated")
 
 cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data):
-    cdef iDeviceEvent event = iDeviceEvent()
+    cdef iDeviceEvent event = iDeviceEvent.__new__(iDeviceEvent)
     event._c_event = c_event
     (<object>user_data)(event)
 
diff --git a/cython/installation_proxy.pxi b/cython/installation_proxy.pxi
index 0424a81..22e7e38 100644
--- a/cython/installation_proxy.pxi
+++ b/cython/installation_proxy.pxi
@@ -42,7 +42,7 @@ cdef class InstallationProxyError(BaseError):
         }
         BaseError.__init__(self, *args, **kwargs)
 
-cdef class InstallationProxyClient(Base):
+cdef class InstallationProxy(Base):
     cdef instproxy_client_t _c_client
 
     def __cinit__(self, iDevice device not None, LockdownClient lockdown=None, *args, **kwargs):
diff --git a/cython/mobile_image_mounter.pxi b/cython/mobile_image_mounter.pxi
index 8ec30d1..9086f2c 100644
--- a/cython/mobile_image_mounter.pxi
+++ b/cython/mobile_image_mounter.pxi
@@ -27,7 +27,7 @@ cdef class MobileImageMounterError(BaseError):
         }
         BaseError.__init__(self, *args, **kwargs)
 
-cdef class MobileImageMounterClient(PropertyListClient):
+cdef class MobileImageMounterClient(Base):
     cdef mobile_image_mounter_client_t _c_client
 
     def __cinit__(self, iDevice device not None, LockdownClient lockdown=None, *args, **kwargs):
diff --git a/cython/sbservices.pxi b/cython/sbservices.pxi
index 0ad67c7..f458bec 100644
--- a/cython/sbservices.pxi
+++ b/cython/sbservices.pxi
@@ -25,7 +25,7 @@ cdef class SpringboardServicesError(BaseError):
         }
         BaseError.__init__(self, *args, **kwargs)
 
-cdef class SpringboardServices:
+cdef class SpringboardServicesClient(Base):
     cdef sbservices_client_t _c_client
 
     def __cinit__(self, iDevice device not None, LockdownClient lockdown=None, *args, **kwargs):
-- 
cgit v1.1-32-gdbae