summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/idevice.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index d5817c6..e3cbb19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AM_PROG_CC_C_O
26AC_PROG_LIBTOOL 26AC_PROG_LIBTOOL
27 27
28# Checks for libraries. 28# Checks for libraries.
29PKG_CHECK_MODULES(libusbmuxd, libusbmuxd >= 0.1.4) 29PKG_CHECK_MODULES(libusbmuxd, libusbmuxd >= 1.0.8)
30PKG_CHECK_MODULES(libplist, libplist >= 1.8) 30PKG_CHECK_MODULES(libplist, libplist >= 1.8)
31PKG_CHECK_MODULES(libplistmm, libplist++ >= 1.8) 31PKG_CHECK_MODULES(libplistmm, libplist++ >= 1.8)
32AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build libimobiledevice])]) 32AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build libimobiledevice])])
diff --git a/src/idevice.c b/src/idevice.c
index a6091f2..91d67e6 100644
--- a/src/idevice.c
+++ b/src/idevice.c
@@ -49,7 +49,7 @@ static void usbmux_event_cb(const usbmuxd_event_t *event, void *user_data)
49 idevice_event_t ev; 49 idevice_event_t ev;
50 50
51 ev.event = event->event; 51 ev.event = event->event;
52 ev.udid = event->device.uuid; 52 ev.udid = event->device.udid;
53 ev.conn_type = CONNECTION_USBMUXD; 53 ev.conn_type = CONNECTION_USBMUXD;
54 54
55 if (event_cb) { 55 if (event_cb) {
@@ -122,7 +122,7 @@ idevice_error_t idevice_get_device_list(char ***devices, int *count)
122 122
123 for (i = 0; dev_list[i].handle > 0; i++) { 123 for (i = 0; dev_list[i].handle > 0; i++) {
124 newlist = realloc(*devices, sizeof(char*) * (newcount+1)); 124 newlist = realloc(*devices, sizeof(char*) * (newcount+1));
125 newlist[newcount++] = strdup(dev_list[i].uuid); 125 newlist[newcount++] = strdup(dev_list[i].udid);
126 *devices = newlist; 126 *devices = newlist;
127 } 127 }
128 usbmuxd_device_list_free(&dev_list); 128 usbmuxd_device_list_free(&dev_list);
@@ -171,10 +171,10 @@ idevice_error_t idevice_device_list_free(char **devices)
171idevice_error_t idevice_new(idevice_t * device, const char *udid) 171idevice_error_t idevice_new(idevice_t * device, const char *udid)
172{ 172{
173 usbmuxd_device_info_t muxdev; 173 usbmuxd_device_info_t muxdev;
174 int res = usbmuxd_get_device_by_uuid(udid, &muxdev); 174 int res = usbmuxd_get_device_by_udid(udid, &muxdev);
175 if (res > 0) { 175 if (res > 0) {
176 idevice_t phone = (idevice_t) malloc(sizeof(struct idevice_private)); 176 idevice_t phone = (idevice_t) malloc(sizeof(struct idevice_private));
177 phone->udid = strdup(muxdev.uuid); 177 phone->udid = strdup(muxdev.udid);
178 phone->conn_type = CONNECTION_USBMUXD; 178 phone->conn_type = CONNECTION_USBMUXD;
179 phone->conn_data = (void*)(long)muxdev.handle; 179 phone->conn_data = (void*)(long)muxdev.handle;
180 *device = phone; 180 *device = phone;