[libdmapsharing] Some cleaning of the add_entry_to_mlcl functions to make them more consistent Signed-off-by: W. Mich

[W. Michael Petullo <wmpetullo src gnome org>]

commit 2d354fbb6656791c9ab5c5ec68d6c77fa02ef281
Author: W. Michael Petullo <mike flyn org>
Date:   Sun Aug 22 23:04:51 2010 -0500

    Some cleaning of the add_entry_to_mlcl functions to make them more consistent
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/daap-share.c |    3 +--
 libdmapsharing/dpap-share.c |   21 +++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index 126476c..4a6e31f 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -534,8 +534,7 @@ add_entry_to_mlcl (gpointer id,
 		   gpointer _mb)
 {
 	GNode *mlit;
-	struct MLCL_Bits *mb;
-	mb = (struct MLCL_Bits *) _mb;
+	struct MLCL_Bits *mb = (struct MLCL_Bits *) _mb;
 	mlit = dmap_structure_add (mb->mlcl, DMAP_CC_MLIT);
 
 	if (_dmap_share_client_requested (mb->bits, ITEM_KIND))
diff --git a/libdmapsharing/dpap-share.c b/libdmapsharing/dpap-share.c
index d97ec98..6c3b3e8 100644
--- a/libdmapsharing/dpap-share.c
+++ b/libdmapsharing/dpap-share.c
@@ -351,17 +351,14 @@ add_entry_to_mlcl (gpointer id,
 		   DMAPRecord *record,
 		   gpointer _mb)
 {
-	struct MLCL_Bits *mb = (struct MLCL_Bits *) _mb;
-
 	GNode *mlit;
-	gchar *aspect_ratio;
-
+	struct MLCL_Bits *mb = (struct MLCL_Bits *) _mb;
 	mlit = dmap_structure_add (mb->mlcl, DMAP_CC_MLIT);
 
 	if (_dmap_share_client_requested (mb->bits, ITEM_KIND))
 		dmap_structure_add (mlit, DMAP_CC_MIKD, (gchar) DPAP_ITEM_KIND_PHOTO);
 	if (_dmap_share_client_requested (mb->bits, ITEM_ID))
-		dmap_structure_add (mlit, DMAP_CC_MIID, (gint32) GPOINTER_TO_UINT (id));
+		dmap_structure_add (mlit, DMAP_CC_MIID, GPOINTER_TO_UINT (id));
 	if (_dmap_share_client_requested (mb->bits, ITEM_NAME)) {
 		gchar *filename;
 		g_object_get (record, "filename", &filename, NULL);
@@ -369,11 +366,15 @@ add_entry_to_mlcl (gpointer id,
 		g_free (filename);
 	}
 	if (_dmap_share_client_requested (mb->bits, PERSISTENT_ID))
-		dmap_structure_add (mlit, DMAP_CC_MPER, (gint64) GPOINTER_TO_UINT (id));
-	/* dpap-sharp claims iPhoto '08 will not show thumbnails without PASP: */
-	g_object_get (record, "aspect-ratio", &aspect_ratio, NULL);
-	dmap_structure_add (mlit, DMAP_CC_PASP, aspect_ratio);
-	g_free (aspect_ratio);
+		dmap_structure_add (mlit, DMAP_CC_MPER, GPOINTER_TO_UINT (id));
+	if (TRUE) {
+		/* dpap-sharp claims iPhoto '08 will not show thumbnails without PASP
+		 * and this does seem to be the case when testing. */
+		gchar *aspect_ratio;
+		g_object_get (record, "aspect-ratio", &aspect_ratio, NULL);
+		dmap_structure_add (mlit, DMAP_CC_PASP, aspect_ratio);
+		g_free (aspect_ratio);
+	}
 	if (_dmap_share_client_requested (mb->bits, PHOTO_CREATIONDATE)) {
 		gint creation_date;
 		g_object_get (record, "creation-date", &creation_date, NULL);