--- libgphoto2-2.4.0/packaging/generic/print-camera-list.c.orig 2007-09-18 11:36:19.000000000 -0400 +++ libgphoto2-2.4.0/packaging/generic/print-camera-list.c 2007-09-18 11:52:42.000000000 -0400 @@ -799,6 +799,8 @@ printf("\n"); printf(" \n"); printf(" \n"); + printf(" \n"); + printf(" \n"); return 0; } @@ -838,52 +840,52 @@ return 0; } if (a->usb_vendor) { /* usb product id might be 0! */ - printf(" \n", a->usb_vendor); - printf(" \n", a->usb_product); + printf(" \n", a->usb_vendor); + printf(" \n", a->usb_product); if (a->device_type & GP_DEVICE_AUDIO_PLAYER) { - printf(" portable_audio_player\n"); - printf(" portable_audio_player\n"); - printf(" user\n"); - printf(" mtp\n"); + printf(" portable_audio_player\n"); + printf(" portable_audio_player\n"); + printf(" user\n"); + printf(" mtp\n"); /* FIXME: needs true formats ... But all of them can do MP3 */ - printf(" audio/mpeg\n"); + printf(" audio/mpeg\n"); } else { - printf(" camera\n"); - printf(" camera\n"); + printf(" camera\n"); + printf(" camera\n"); /* HACK alert ... but the HAL / gnome-volume-manager guys want that */ if (NULL!=strstr(a->library,"ptp")) - printf(" ptp\n"); + printf(" ptp\n"); else - printf(" proprietary\n"); + printf(" proprietary\n"); } /* leave them here even for audio players */ - printf(" %s\n", model); - printf(" true\n"); + printf(" %s\n", model); + printf(" true\n"); + printf(" \n"); printf(" \n"); - printf(" \n"); } else if ((a->usb_class) && (a->usb_class != 666)) { - printf(" \n", a->usb_class); - printf(" \n", a->usb_subclass); - printf(" \n", a->usb_protocol); - printf(" camera\n"); - printf(" camera\n"); + printf(" \n", a->usb_class); + printf(" \n", a->usb_subclass); + printf(" \n", a->usb_protocol); + printf(" camera\n"); + printf(" camera\n"); if (a->usb_class == 6) { - printf(" ptp\n"); + printf(" ptp\n"); } else { if (a->usb_class == 8) { - printf(" storage\n"); + printf(" storage\n"); } else { - printf(" proprietary\n"); + printf(" proprietary\n"); } } - printf(" %s\n", model); - printf(" true\n"); + printf(" %s\n", model); + printf(" true\n"); + printf(" \n"); printf(" \n"); printf(" \n"); - printf(" \n"); } } /* camera has USB connection */ return 0; @@ -892,6 +894,7 @@ static int fdi_end_func (const func_params_t *params, void *data) { + printf(" \n"); printf(" \n"); printf(" \n"); printf("\n"); @@ -918,6 +921,8 @@ printf("\n"); printf(" \n"); printf(" \n"); + printf(" \n"); + printf(" \n"); return 0; } @@ -961,28 +966,28 @@ /* do not set category. We don't really know what this device really is. * But we do now that is capable of being a camera, so add to capabilities */ - printf(" \n", a->usb_vendor); - printf(" \n", a->usb_product); + printf(" \n", a->usb_vendor); + printf(" \n", a->usb_product); if (params->add_comments) { printf(" \n", a->model); } if (a->device_type & GP_DEVICE_AUDIO_PLAYER) - printf(" portable_audio_player\n"); + printf(" portable_audio_player\n"); else - printf(" camera\n"); + printf(" camera\n"); + printf(" \n"); printf(" \n"); - printf(" \n"); } #if 0 /* would need to be able to merge upwards ... but cannot currently */ else if ((a->usb_class) && (a->usb_class != 666)) { - printf(" \n", a->usb_class); - printf(" \n", a->usb_subclass); - printf(" \n", a->usb_protocol); - printf(" camera\n"); + printf(" \n", a->usb_class); + printf(" \n", a->usb_subclass); + printf(" \n", a->usb_protocol); + printf(" camera\n"); + printf(" \n"); printf(" \n"); printf(" \n"); - printf(" \n"); } #endif } @@ -992,6 +997,7 @@ static int fdi_device_end_func (const func_params_t *params, void *data) { + printf(" \n"); printf(" \n"); printf(" \n"); printf("\n");