Global renames due to project rename to libimobiledevice

11 files changed, 137 insertions, 137 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index aced258..2e20332 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,9 +1,9 @@
-nobase_include_HEADERS = libiphone/libiphone.h \
-			 libiphone/lockdown.h \
-			 libiphone/afc.h \
-			 libiphone/file_relay.h \
-			 libiphone/notification_proxy.h \
-			 libiphone/installation_proxy.h \
-			 libiphone/sbservices.h \
-			 libiphone/mobilesync.h \
-			 libiphone/mobilebackup.h
+nobase_include_HEADERS = libimobiledevice/libimobiledevice.h \
+			 libimobiledevice/lockdown.h \
+			 libimobiledevice/afc.h \
+			 libimobiledevice/file_relay.h \
+			 libimobiledevice/notification_proxy.h \
+			 libimobiledevice/installation_proxy.h \
+			 libimobiledevice/sbservices.h \
+			 libimobiledevice/mobilesync.h \
+			 libimobiledevice/mobilebackup.h
diff --git a/include/libiphone/afc.h b/include/libimobiledevice/afc.h
index 5d09b40..5b61499 100644
--- a/include/libiphone/afc.h
+++ b/include/libimobiledevice/afc.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/afc.h
+ * @file libimobiledevice/afc.h
  * @brief AFC Implementation
  * \internal
  *
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 
 /* Error Codes */
 #define AFC_E_SUCCESS                 0
@@ -87,7 +87,7 @@ struct afc_client_int;
 typedef struct afc_client_int *afc_client_t;
 
 /* Interface */
-afc_error_t afc_client_new(iphone_device_t device, uint16_t port, afc_client_t *client);
+afc_error_t afc_client_new(idevice_t device, uint16_t port, afc_client_t *client);
 afc_error_t afc_client_free(afc_client_t client);
 afc_error_t afc_get_device_info(afc_client_t client, char ***infos);
 afc_error_t afc_read_directory(afc_client_t client, const char *dir, char ***list);
diff --git a/include/libiphone/file_relay.h b/include/libimobiledevice/file_relay.h
index 672f1bd..268eed8 100644
--- a/include/libiphone/file_relay.h
+++ b/include/libimobiledevice/file_relay.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/file_relay.h
+ * @file libimobiledevice/file_relay.h
  * @brief file_relay Implementation
  * \internal
  *
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 
 /* Error Codes */
 #define FILE_RELAY_E_SUCCESS                0
@@ -44,10 +44,10 @@ typedef int16_t file_relay_error_t;
 struct file_relay_client_int;
 typedef struct file_relay_client_int *file_relay_client_t;
 
-file_relay_error_t file_relay_client_new(iphone_device_t device, uint16_t port, file_relay_client_t *client);
+file_relay_error_t file_relay_client_new(idevice_t device, uint16_t port, file_relay_client_t *client);
 file_relay_error_t file_relay_client_free(file_relay_client_t client);
 
-file_relay_error_t file_relay_request_sources(file_relay_client_t client, const char **sources, iphone_connection_t *connection);
+file_relay_error_t file_relay_request_sources(file_relay_client_t client, const char **sources, idevice_connection_t *connection);
 
 #ifdef __cplusplus
 }
diff --git a/include/libiphone/installation_proxy.h b/include/libimobiledevice/installation_proxy.h
index b7bbb60..22e76b1 100644
--- a/include/libiphone/installation_proxy.h
+++ b/include/libimobiledevice/installation_proxy.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/installation_proxy.h
+ * @file libimobiledevice/installation_proxy.h
  * @brief Implementation to talk to the installation proxy on a device
  * \internal
  *
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 #include <glib.h>
 
 /* Error Codes */
@@ -48,7 +48,7 @@ typedef struct instproxy_client_int *instproxy_client_t;
 typedef void (*instproxy_status_cb_t) (const char *operation, plist_t status);
 
 /* Interface */
-instproxy_error_t instproxy_client_new(iphone_device_t device, uint16_t port, instproxy_client_t *client);
+instproxy_error_t instproxy_client_new(idevice_t device, uint16_t port, instproxy_client_t *client);
 instproxy_error_t instproxy_client_free(instproxy_client_t client);
 
 instproxy_error_t instproxy_browse(instproxy_client_t client, plist_t client_options, plist_t *result);
diff --git a/include/libimobiledevice/libimobiledevice.h b/include/libimobiledevice/libimobiledevice.h
new file mode 100644
index 0000000..87b078a
--- /dev/null
+++ b/include/libimobiledevice/libimobiledevice.h
@@ -0,0 +1,102 @@
+/**
+ * @file libimobiledevice/libimobiledevice.h
+ * @brief Common code and device handling
+ * \internal
+ *
+ * Copyright (c) 2008 Jonathan Beck All Rights Reserved.
+ *
+ * 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 
+ */
+
+#ifndef LIBIMOBILEDEVICE_H
+#define LIBIMOBILEDEVICE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <plist/plist.h>
+
+/* Error Codes */
+#define IDEVICE_E_SUCCESS                0
+#define IDEVICE_E_INVALID_ARG           -1
+#define IDEVICE_E_UNKNOWN_ERROR         -2
+#define IDEVICE_E_NO_DEVICE             -3
+#define IDEVICE_E_NOT_ENOUGH_DATA       -4
+#define IDEVICE_E_BAD_HEADER            -5
+#define IDEVICE_E_SSL_ERROR             -6
+
+typedef int16_t idevice_error_t;
+
+struct idevice_int;
+typedef struct idevice_int *idevice_t;
+
+struct idevice_connection_int;
+typedef struct idevice_connection_int *idevice_connection_t;
+
+/* generic */
+void idevice_set_debug_level(int level);
+
+/* discovery (events/asynchronous) */
+// event type
+enum idevice_event_type {
+	IDEVICE_DEVICE_ADD = 1,
+	IDEVICE_DEVICE_REMOVE
+};
+
+// event data structure
+typedef struct {
+	enum idevice_event_type event;
+	const char *uuid;
+	int conn_type;
+} idevice_event_t;
+
+// event callback function prototype
+typedef void (*idevice_event_cb_t) (const idevice_event_t *event, void *user_data);
+
+// functions
+idevice_error_t idevice_event_subscribe(idevice_event_cb_t callback, void *user_data);
+idevice_error_t idevice_event_unsubscribe();
+
+/* discovery (synchronous) */
+idevice_error_t idevice_get_device_list(char ***devices, int *count);
+idevice_error_t idevice_device_list_free(char **devices);
+
+/* device structure creation and destruction */
+idevice_error_t idevice_new(idevice_t *device, const char *uuid);
+idevice_error_t idevice_free(idevice_t device);
+
+/* connection/disconnection */
+idevice_error_t idevice_connect(idevice_t device, uint16_t port, idevice_connection_t *connection);
+idevice_error_t idevice_disconnect(idevice_connection_t connection);
+
+/* communication */
+idevice_error_t idevice_connection_send(idevice_connection_t connection, const char *data, uint32_t len, uint32_t *sent_bytes);
+idevice_error_t idevice_connection_receive_timeout(idevice_connection_t connection, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout);
+idevice_error_t idevice_connection_receive(idevice_connection_t connection, char *data, uint32_t len, uint32_t *recv_bytes);
+
+/* misc */
+idevice_error_t idevice_get_handle(idevice_t device, uint32_t *handle);
+idevice_error_t idevice_get_uuid(idevice_t device, char **uuid);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/include/libiphone/lockdown.h b/include/libimobiledevice/lockdown.h
index 003a99b..49c708d 100644
--- a/include/libiphone/lockdown.h
+++ b/include/libimobiledevice/lockdown.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/lockdown.h
+ * @file libimobiledevice/lockdown.h
  * @brief Communcation with the lockdown device daemon
  * \internal
  *
@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 
 /* Error Codes */
 #define LOCKDOWN_E_SUCCESS                    0
@@ -66,8 +66,8 @@ struct lockdownd_pair_record {
 typedef struct lockdownd_pair_record *lockdownd_pair_record_t;
 
 /* Interface */
-lockdownd_error_t lockdownd_client_new(iphone_device_t device, lockdownd_client_t *client, const char *label);
-lockdownd_error_t lockdownd_client_new_with_handshake(iphone_device_t device, lockdownd_client_t *client, const char *label);
+lockdownd_error_t lockdownd_client_new(idevice_t device, lockdownd_client_t *client, const char *label);
+lockdownd_error_t lockdownd_client_new_with_handshake(idevice_t device, lockdownd_client_t *client, const char *label);
 lockdownd_error_t lockdownd_client_free(lockdownd_client_t client);
 
 lockdownd_error_t lockdownd_query_type(lockdownd_client_t client, char **type);
diff --git a/include/libiphone/mobilebackup.h b/include/libimobiledevice/mobilebackup.h
index 8db6758..e51d4c1 100644
--- a/include/libiphone/mobilebackup.h
+++ b/include/libimobiledevice/mobilebackup.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/mobilebackup.h
+ * @file libimobiledevice/mobilebackup.h
  * @brief MobileBackup Implementation
  * \internal
  *
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 
 /* Error Codes */
 #define MOBILEBACKUP_E_SUCCESS                0
@@ -43,7 +43,7 @@ typedef int16_t mobilebackup_error_t;
 struct mobilebackup_client_int;
 typedef struct mobilebackup_client_int *mobilebackup_client_t;
 
-mobilebackup_error_t mobilebackup_client_new(iphone_device_t device, uint16_t port, mobilebackup_client_t * client);
+mobilebackup_error_t mobilebackup_client_new(idevice_t device, uint16_t port, mobilebackup_client_t * client);
 mobilebackup_error_t mobilebackup_client_free(mobilebackup_client_t client);
 mobilebackup_error_t mobilebackup_receive(mobilebackup_client_t client, plist_t *plist);
 mobilebackup_error_t mobilebackup_send(mobilebackup_client_t client, plist_t plist);
diff --git a/include/libiphone/mobilesync.h b/include/libimobiledevice/mobilesync.h
index f85113d..349b6a3 100644
--- a/include/libiphone/mobilesync.h
+++ b/include/libimobiledevice/mobilesync.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/mobilesync.h
+ * @file libimobiledevice/mobilesync.h
  * @brief MobileSync Implementation
  * \internal
  *
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 
 /* Error Codes */
 #define MOBILESYNC_E_SUCCESS                0
@@ -43,7 +43,7 @@ typedef int16_t mobilesync_error_t;
 struct mobilesync_client_int;
 typedef struct mobilesync_client_int *mobilesync_client_t;
 
-mobilesync_error_t mobilesync_client_new(iphone_device_t device, uint16_t port, mobilesync_client_t * client);
+mobilesync_error_t mobilesync_client_new(idevice_t device, uint16_t port, mobilesync_client_t * client);
 mobilesync_error_t mobilesync_client_free(mobilesync_client_t client);
 mobilesync_error_t mobilesync_receive(mobilesync_client_t client, plist_t *plist);
 mobilesync_error_t mobilesync_send(mobilesync_client_t client, plist_t plist);
diff --git a/include/libiphone/notification_proxy.h b/include/libimobiledevice/notification_proxy.h
index 962dd9b..adbb4cc 100644
--- a/include/libiphone/notification_proxy.h
+++ b/include/libimobiledevice/notification_proxy.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/notification_proxy.h
+ * @file libimobiledevice/notification_proxy.h
  * @brief Implementation to talk to the notification proxy on a device
  * \internal
  *
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 
 /* Error Codes */
 #define NP_E_SUCCESS                0
@@ -74,7 +74,7 @@ typedef struct np_client_int *np_client_t;
 typedef void (*np_notify_cb_t) (const char *notification);
 
 /* Interface */
-np_error_t np_client_new(iphone_device_t device, uint16_t port, np_client_t *client);
+np_error_t np_client_new(idevice_t device, uint16_t port, np_client_t *client);
 np_error_t np_client_free(np_client_t client);
 np_error_t np_post_notification(np_client_t client, const char *notification);
 np_error_t np_observe_notification(np_client_t client, const char *notification);
diff --git a/include/libiphone/sbservices.h b/include/libimobiledevice/sbservices.h
index 3e4accb..921d6be 100644
--- a/include/libiphone/sbservices.h
+++ b/include/libimobiledevice/sbservices.h
@@ -1,5 +1,5 @@
 /**
- * @file libiphone/sbservices.h
+ * @file libimobiledevice/sbservices.h
  * @brief Implementation to talk to com.apple.springboardservices on a device
  * \internal
  *
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-#include <libiphone/libiphone.h>
+#include <libimobiledevice/libimobiledevice.h>
 
 /* Error Codes */
 #define SBSERVICES_E_SUCCESS                0
@@ -43,7 +43,7 @@ struct sbservices_client_int;
 typedef struct sbservices_client_int *sbservices_client_t;
 
 /* Interface */
-sbservices_error_t sbservices_client_new(iphone_device_t device, uint16_t port, sbservices_client_t *client);
+sbservices_error_t sbservices_client_new(idevice_t device, uint16_t port, sbservices_client_t *client);
 sbservices_error_t sbservices_client_free(sbservices_client_t client);
 sbservices_error_t sbservices_get_icon_state(sbservices_client_t client, plist_t *state);
 sbservices_error_t sbservices_set_icon_state(sbservices_client_t client, plist_t newstate);
diff --git a/include/libiphone/libiphone.h b/include/libiphone/libiphone.h
deleted file mode 100644
index efe9a63..0000000
--- a/include/libiphone/libiphone.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * @file libiphone/libiphone.h
- * @brief Common code and device handling
- * \internal
- *
- * Copyright (c) 2008 Jonathan Beck All Rights Reserved.
- *
- * 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 
- */
-
-#ifndef LIBIPHONE_H
-#define LIBIPHONE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <plist/plist.h>
-
-/* Error Codes */
-#define IPHONE_E_SUCCESS                0
-#define IPHONE_E_INVALID_ARG           -1
-#define IPHONE_E_UNKNOWN_ERROR         -2
-#define IPHONE_E_NO_DEVICE             -3
-#define IPHONE_E_NOT_ENOUGH_DATA       -4
-#define IPHONE_E_BAD_HEADER            -5
-#define IPHONE_E_SSL_ERROR             -6
-
-typedef int16_t iphone_error_t;
-
-struct iphone_device_int;
-typedef struct iphone_device_int *iphone_device_t;
-
-struct iphone_connection_int;
-typedef struct iphone_connection_int *iphone_connection_t;
-
-/* generic */
-void iphone_set_debug_level(int level);
-
-/* discovery (events/asynchronous) */
-// event type
-enum iphone_event_type {
-	IPHONE_DEVICE_ADD = 1,
-	IPHONE_DEVICE_REMOVE
-};
-
-// event data structure
-typedef struct {
-	enum iphone_event_type event;
-	const char *uuid;
-	int conn_type;
-} iphone_event_t;
-
-// event callback function prototype
-typedef void (*iphone_event_cb_t) (const iphone_event_t *event, void *user_data);
-
-// functions
-iphone_error_t iphone_event_subscribe(iphone_event_cb_t callback, void *user_data);
-iphone_error_t iphone_event_unsubscribe();
-
-/* discovery (synchronous) */
-iphone_error_t iphone_get_device_list(char ***devices, int *count);
-iphone_error_t iphone_device_list_free(char **devices);
-
-/* device structure creation and destruction */
-iphone_error_t iphone_device_new(iphone_device_t *device, const char *uuid);
-iphone_error_t iphone_device_free(iphone_device_t device);
-
-/* connection/disconnection */
-iphone_error_t iphone_device_connect(iphone_device_t device, uint16_t port, iphone_connection_t *connection);
-iphone_error_t iphone_device_disconnect(iphone_connection_t connection);
-
-/* communication */
-iphone_error_t iphone_connection_send(iphone_connection_t connection, const char *data, uint32_t len, uint32_t *sent_bytes);
-iphone_error_t iphone_connection_receive_timeout(iphone_connection_t connection, char *data, uint32_t len, uint32_t *recv_bytes, unsigned int timeout);
-iphone_error_t iphone_connection_receive(iphone_connection_t connection, char *data, uint32_t len, uint32_t *recv_bytes);
-
-/* misc */
-iphone_error_t iphone_device_get_handle(iphone_device_t device, uint32_t *handle);
-iphone_error_t iphone_device_get_uuid(iphone_device_t device, char **uuid);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-