diff options
| author | 2012-04-08 01:42:07 +0200 | |
|---|---|---|
| committer | 2012-04-08 01:42:07 +0200 | |
| commit | 0f5d47beb4a278d3eb25aadff9abfdac80d525c2 (patch) | |
| tree | 70c2b85be567f2933542d2873fd5dc63998a5de2 /src/idevice.c | |
| parent | c153ee92a1036cdec929d3d04b396373e5011a1c (diff) | |
| download | libimobiledevice-0f5d47beb4a278d3eb25aadff9abfdac80d525c2.tar.gz libimobiledevice-0f5d47beb4a278d3eb25aadff9abfdac80d525c2.tar.bz2 | |
idevice: Bump libusbmuxd dependency to 1.0.8 and adopt idevice.c to API changes
Diffstat (limited to 'src/idevice.c')
| -rw-r--r-- | src/idevice.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) | |||
| 171 | idevice_error_t idevice_new(idevice_t * device, const char *udid) | 171 | idevice_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; |
