diff options
author | Christophe Fergeau <teuf@gnome.org> | 2005-11-22 12:27:17 +0000 |
---|---|---|
committer | Christophe Fergeau <teuf@gnome.org> | 2005-11-22 12:27:17 +0000 |
commit | a3d7e2e6102177f0658768074f0d0ddc958d0e09 (patch) | |
tree | 6dee006bb38216dfa78399b608084a4a50dad356 | |
parent | 44d0ef61dc89d89beb9e33c08d5d4078a28da97f (diff) | |
download | libgpod-a3d7e2e6102177f0658768074f0d0ddc958d0e09.tar.gz libgpod-a3d7e2e6102177f0658768074f0d0ddc958d0e09.tar.xz libgpod-a3d7e2e6102177f0658768074f0d0ddc958d0e09.zip |
2005-11-22 Christophe Fergeau <teuf@gnome.org>
* src/ipod-device.c: fix compilation issue when hal isn't available
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1166 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/ipod-device.c | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -1,5 +1,9 @@ 2005-11-22 Christophe Fergeau <teuf@gnome.org> + * src/ipod-device.c: fix compilation issue when hal isn't available + +2005-11-22 Christophe Fergeau <teuf@gnome.org> + * configure.ac: fix .so versioning 2005-11-22 Christophe Fergeau <teuf@gnome.org> diff --git a/src/ipod-device.c b/src/ipod-device.c index 6330c90..fd71784 100644 --- a/src/ipod-device.c +++ b/src/ipod-device.c @@ -358,7 +358,6 @@ static gboolean ipod_device_detect_volume_info(IpodDevice *device); static LibHalContext *ipod_device_hal_initialize(void); static void ipod_device_detect_volume_used(IpodDevice *device); static guint64 ipod_device_dir_size(const gchar *path); -static gboolean ipod_device_has_open_fd(IpodDevice *device); static gboolean ipod_device_read_sysinfo(IpodDevice *device); static gboolean ipod_device_detect_writeable(IpodDevice *device); static void ipod_device_restore_reboot_preferences(IpodDevice *device); @@ -1367,7 +1366,8 @@ ipod_device_dir_size(const gchar *path) return retsize; } -gboolean +#ifdef HAVE_LIBHAL +static gboolean ipod_device_has_open_fd(IpodDevice *device) { GDir *dir, *fddir; @@ -1425,7 +1425,6 @@ ipod_device_has_open_fd(IpodDevice *device) return FALSE; } -#ifdef HAVE_LIBHAL /* modded from g-v-m */ static int ipod_device_run_command(IpodDevice *device, const char *command, |