From 49fc86155ca2ec847239f7969ac190dfe7aa4920 Mon Sep 17 00:00:00 2001
From: Bryan Forbes
Date: Mon, 19 Apr 2010 12:39:21 -0500
Subject: Removed property_list_client.pxi. Added notification strings.

---
 cython/Makefile.am              |  1 -
 cython/notification_proxy.pxi   | 54 +++++++++++++++++++++++++++++++++++++++++
 cython/property_list_client.pxi | 20 ---------------
 3 files changed, 54 insertions(+), 21 deletions(-)
 delete mode 100644 cython/property_list_client.pxi

diff --git a/cython/Makefile.am b/cython/Makefile.am
index a8e39d4..d68136a 100644
--- a/cython/Makefile.am
+++ b/cython/Makefile.am
@@ -14,7 +14,6 @@ PXIINCLUDES =					\
 	notification_proxy.pxi		\
 	sbservices.pxi				\
 	mobilebackup.pxi			\
-	property_list_client.pxi	\
 	afc.pxi						\
 	file_relay.pxi				\
 	screenshotr.pxi				\
diff --git a/cython/notification_proxy.pxi b/cython/notification_proxy.pxi
index 7b2911b..ccc30f8 100644
--- a/cython/notification_proxy.pxi
+++ b/cython/notification_proxy.pxi
@@ -16,6 +16,60 @@ cdef extern from "libimobiledevice/notification_proxy.h":
     np_error_t np_observe_notifications(np_client_t client, char **notification_spec)
     np_error_t np_set_notify_callback(np_client_t client, np_notify_cb_t notify_cb, void *userdata)
 
+    cdef char* C_NP_SYNC_WILL_START "NP_SYNC_WILL_START"
+    cdef char* C_NP_SYNC_DID_START "NP_SYNC_DID_START"
+    cdef char* C_NP_SYNC_DID_FINISH "NP_SYNC_DID_FINISH"
+    cdef char* C_NP_SYNC_LOCK_REQUEST "NP_SYNC_LOCK_REQUEST"
+
+    cdef char* C_NP_SYNC_CANCEL_REQUEST "NP_SYNC_CANCEL_REQUEST"
+    cdef char* C_NP_SYNC_SUSPEND_REQUEST "NP_SYNC_SUSPEND_REQUEST"
+    cdef char* C_NP_SYNC_RESUME_REQUEST "NP_SYNC_RESUME_REQUEST"
+    cdef char* C_NP_PHONE_NUMBER_CHANGED "NP_PHONE_NUMBER_CHANGED"
+    cdef char* C_NP_DEVICE_NAME_CHANGED "NP_DEVICE_NAME_CHANGED"
+    cdef char* C_NP_TIMEZONE_CHANGED "NP_TIMEZONE_CHANGED"
+    cdef char* C_NP_TRUSTED_HOST_ATTACHED "NP_TRUSTED_HOST_ATTACHED"
+    cdef char* C_NP_HOST_DETACHED "NP_HOST_DETACHED"
+    cdef char* C_NP_HOST_ATTACHED "NP_HOST_ATTACHED"
+    cdef char* C_NP_REGISTRATION_FAILED "NP_REGISTRATION_FAILED"
+    cdef char* C_NP_ACTIVATION_STATE "NP_ACTIVATION_STATE"
+    cdef char* C_NP_BRICK_STATE "NP_BRICK_STATE"
+    cdef char* C_NP_DS_DOMAIN_CHANGED "NP_DS_DOMAIN_CHANGED"
+    cdef char* C_NP_BACKUP_DOMAIN_CHANGED "NP_BACKUP_DOMAIN_CHANGED"
+    cdef char* C_NP_APP_INSTALLED "NP_APP_INSTALLED"
+    cdef char* C_NP_APP_UNINSTALLED "NP_APP_UNINSTALLED"
+    cdef char* C_NP_DEV_IMAGE_MOUNTED "NP_DEV_IMAGE_MOUNTED"
+    cdef char* C_NP_ATTEMPTACTIVATION "NP_ATTEMPTACTIVATION"
+    cdef char* C_NP_ITDBPREP_DID_END "NP_ITDBPREP_DID_END"
+    cdef char* C_NP_LANGUAGE_CHANGED "NP_LANGUAGE_CHANGED"
+    cdef char* C_NP_ADDRESS_BOOK_PREF_CHANGED "NP_ADDRESS_BOOK_PREF_CHANGED"
+
+NP_SYNC_WILL_START = C_NP_SYNC_WILL_START
+NP_SYNC_DID_START = C_NP_SYNC_DID_START
+NP_SYNC_DID_FINISH = C_NP_SYNC_DID_FINISH
+NP_SYNC_LOCK_REQUEST = C_NP_SYNC_LOCK_REQUEST
+
+NP_SYNC_CANCEL_REQUEST = C_NP_SYNC_CANCEL_REQUEST
+NP_SYNC_SUSPEND_REQUEST = C_NP_SYNC_SUSPEND_REQUEST
+NP_SYNC_RESUME_REQUEST = C_NP_SYNC_RESUME_REQUEST
+NP_PHONE_NUMBER_CHANGED = C_NP_PHONE_NUMBER_CHANGED
+NP_DEVICE_NAME_CHANGED = C_NP_DEVICE_NAME_CHANGED
+NP_TIMEZONE_CHANGED = C_NP_TIMEZONE_CHANGED
+NP_TRUSTED_HOST_ATTACHED = C_NP_TRUSTED_HOST_ATTACHED
+NP_HOST_DETACHED = C_NP_HOST_DETACHED
+NP_HOST_ATTACHED = C_NP_HOST_ATTACHED
+NP_REGISTRATION_FAILED = C_NP_REGISTRATION_FAILED
+NP_ACTIVATION_STATE = C_NP_ACTIVATION_STATE
+NP_BRICK_STATE = C_NP_BRICK_STATE
+NP_DS_DOMAIN_CHANGED = C_NP_DS_DOMAIN_CHANGED
+NP_BACKUP_DOMAIN_CHANGED = C_NP_BACKUP_DOMAIN_CHANGED
+NP_APP_INSTALLED = C_NP_APP_INSTALLED
+NP_APP_UNINSTALLED = C_NP_APP_UNINSTALLED
+NP_DEV_IMAGE_MOUNTED = C_NP_DEV_IMAGE_MOUNTED
+NP_ATTEMPTACTIVATION = C_NP_ATTEMPTACTIVATION
+NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END
+NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED
+NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED
+
 cdef void np_notify_cb(const_char_ptr notification, void *py_callback):
     (<object>py_callback)(notification)
 
diff --git a/cython/property_list_client.pxi b/cython/property_list_client.pxi
deleted file mode 100644
index 718b07f..0000000
--- a/cython/property_list_client.pxi
+++ /dev/null
@@ -1,20 +0,0 @@
-cdef class PropertyListClient(Base):
-    cpdef send(self, plist.Node node):
-        self.handle_error(self._send(node._c_node))
-
-    cpdef object receive(self):
-        cdef:
-            plist.plist_t c_node = NULL
-            int16_t err
-        err = self._receive(&c_node)
-        try:
-            self.handle_error(err)
-        except BaseError, e:
-            if c_node != NULL:
-                plist.plist_free(c_node)
-            raise
-
-        return plist.plist_t_to_node(c_node)
-
-    cdef inline int16_t _send(self, plist.plist_t node): pass
-    cdef inline int16_t _receive(self, plist.plist_t* c_node): pass
-- 
cgit v1.1-32-gdbae