diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-02-14 13:28:06 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-02-14 13:28:06 +0000 |
| commit | d291d989d86868f07a656e875abf025d3d4c8667 (patch) | |
| tree | 59ae4f454f9df11968085ec7a8b249fb8518e87c /src | |
| parent | 94f1f1fda673a4a6d9fedf18d748140c1f8ea1e7 (diff) | |
| download | libgpod-d291d989d86868f07a656e875abf025d3d4c8667.tar.gz libgpod-d291d989d86868f07a656e875abf025d3d4c8667.tar.xz libgpod-d291d989d86868f07a656e875abf025d3d4c8667.zip | |
* src/ipod-device.c: (ipod_device_set_property): fixed bug that
caused ipod-detection to fail if hal daemon was not running. As
a consequence cover art was not written to the iPod.
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1205 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'src')
| -rw-r--r-- | src/ipod-device.c | 26 | ||||
| -rw-r--r-- | src/itdb_itunesdb.c | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/ipod-device.c b/src/ipod-device.c index 57d3229..3f16c3b 100644 --- a/src/ipod-device.c +++ b/src/ipod-device.c @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-01-03 20:25:37 jcs> +/* Time-stamp: <2006-02-14 22:09:32 jcs> | | Copyright (C) 2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -535,22 +535,24 @@ ipod_device_set_property(GObject *object, guint prop_id, case PROP_MOUNT_POINT: case PROP_DEVICE_PATH: case PROP_HAL_VOLUME_ID: - if (device->priv->hal_context) - { - str = g_value_get_string(value); - volumes = libhal_manager_find_device_string_match( + str = g_value_get_string(value); + if (device->priv->hal_context) + { + volumes = libhal_manager_find_device_string_match( device->priv->hal_context, "block.device", str, &volume_count, NULL); - if(volume_count == 0) { + if(volume_count == 0) { libhal_free_string_array(volumes); volumes = libhal_manager_find_device_string_match( - device->priv->hal_context, "volume.mount_point", - str, &volume_count, NULL); + device->priv->hal_context, "volume.mount_point", + str, &volume_count, NULL); if(volume_count >= 1) - str = volumes[0]; - } else { + str = volumes[0]; + } else { str = volumes[0]; + } + libhal_free_string_array(volumes); } #ifdef HAVE_LIBHAL g_free_if_not_null(device->priv->hal_volume_id); @@ -562,9 +564,7 @@ ipod_device_set_property(GObject *object, guint prop_id, /* end JCS for libgpod */ #endif device->priv->is_ipod = ipod_device_reload(device); - libhal_free_string_array(volumes); - } - break; + break; case PROP_DEVICE_NAME: str = g_value_get_string(value); g_free_if_not_null(device->priv->device_name); diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index 2a2c133..cbea6f3 100644 --- a/src/itdb_itunesdb.c +++ b/src/itdb_itunesdb.c @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-02-04 12:04:25 jcs> +/* Time-stamp: <2006-02-14 22:10:45 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. |