summaryrefslogtreecommitdiff
path: root/monitor
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2013-06-11 13:33:23 +0200
committerOndrej Holy <oholy@redhat.com>2013-06-19 13:42:42 +0200
commit53f086bdb30a1cc582ed7064bbf69f931b398134 (patch)
treeff27e11e04bad2d8262c1422c26fd796aea8119f /monitor
parent80d83ce120fc0af69ef61abfeea96604c0190cad (diff)
downloadgvfs-53f086bdb30a1cc582ed7064bbf69f931b398134.tar.gz
afc: Bump libimobiledevice dependency
https://bugzilla.redhat.com/show_bug.cgi?id=951731 https://bugzilla.gnome.org/show_bug.cgi?id=702577
Diffstat (limited to 'monitor')
-rw-r--r--monitor/afc/afcvolume.c8
-rw-r--r--monitor/afc/afcvolumemonitor.c5
2 files changed, 0 insertions, 13 deletions
diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c
index 4801254d..c8a4f853 100644
--- a/monitor/afc/afcvolume.c
+++ b/monitor/afc/afcvolume.c
@@ -80,11 +80,7 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
guint retries;
plist_t value;
char *model, *display_name;
-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
lockdownd_service_descriptor_t lockdown_service = NULL;
-#else
- guint16 port;
-#endif
lockdownd_error_t lerr;
retries = 0;
@@ -105,12 +101,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self)
idevice_free (dev);
return 0;
}
-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
lerr = lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service);
lockdownd_service_descriptor_free (lockdown_service);
-#else
- lerr = lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port);
-#endif
if (lerr != LOCKDOWN_E_SUCCESS)
{
idevice_free (dev);
diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
index 3545bdfa..995ef4d1 100644
--- a/monitor/afc/afcvolumemonitor.c
+++ b/monitor/afc/afcvolumemonitor.c
@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
self = G_VFS_AFC_VOLUME_MONITOR(user_data);
-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
event_udid = event->udid;
-#else
- event_udid = event->uuid;
-#endif
-
if (event->event == IDEVICE_DEVICE_ADD)
g_vfs_afc_monitor_create_volume (self, event_udid);
else