diff options
| author | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-05-25 11:28:39 +0000 |
|---|---|---|
| committer | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-05-25 11:28:39 +0000 |
| commit | f8131917e2ea9ee8cd9aa5982394128635c01adf (patch) | |
| tree | d4433aa84d0740d4c3501e7e6260c1efbdc01e25 | |
| parent | f87f1088d0eae00af511b0eb0e847138a971562c (diff) | |
| download | libgpod-f8131917e2ea9ee8cd9aa5982394128635c01adf.tar.gz libgpod-f8131917e2ea9ee8cd9aa5982394128635c01adf.tar.xz libgpod-f8131917e2ea9ee8cd9aa5982394128635c01adf.zip | |
* src/itdb_device.c: don't insert NULL firewire IDs in the SysInfo
hash table
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1983 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/itdb_device.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2008-05-25 Christophe Fergeau <teuf at gnome.org> + * src/itdb_device.c: don't insert NULL firewire IDs in the SysInfo + hash table + +2008-05-25 Christophe Fergeau <teuf at gnome.org> + * configure.ac: rework libxml detection * src/Makefile.am: remove LIBXML_CFLAGS/LIBXML_LIBS since they are no longer used diff --git a/src/itdb_device.c b/src/itdb_device.c index 4f3fe50..0f86c57 100644 --- a/src/itdb_device.c +++ b/src/itdb_device.c @@ -452,8 +452,10 @@ static void itdb_device_read_sysinfo_extended (Itdb_Device *device) if ((device->sysinfo != NULL) && (device->sysinfo_extended != NULL)) { const char *fwid; fwid = itdb_sysinfo_properties_get_firewire_id (device->sysinfo_extended); - g_hash_table_insert (device->sysinfo, g_strdup ("FirewireGuid"), - g_strdup (fwid)); + if (fwid != NULL) { + g_hash_table_insert (device->sysinfo, g_strdup ("FirewireGuid"), + g_strdup (fwid)); + } } } |