diff -up libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage libgphoto2-2.4.1/packaging/generic/print-camera-list.c
--- libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage 2008-03-24 12:47:00.000000000 +0100
+++ libgphoto2-2.4.1/packaging/generic/print-camera-list.c 2008-06-02 10:44:29.000000000 +0200
@@ -793,6 +793,8 @@ fdi_begin_func (const func_params_t *par
printf("\n");
printf(" \n");
printf(" \n");
+ printf(" \n");
+ printf(" \n");
return 0;
}
@@ -832,52 +834,52 @@ fdi_camera_func (const func_params_t *pa
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;
@@ -886,6 +888,7 @@ fdi_camera_func (const func_params_t *pa
static int
fdi_end_func (const func_params_t *params, void *data)
{
+ printf(" \n");
printf(" \n");
printf(" \n");
printf("\n");
@@ -912,6 +915,8 @@ fdi_device_begin_func (const func_params
printf("\n");
printf(" \n");
printf(" \n");
+ printf(" \n");
+ printf(" \n");
return 0;
}
@@ -955,28 +960,28 @@ fdi_device_camera_func (const func_param
/* 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
}
@@ -986,6 +991,7 @@ fdi_device_camera_func (const func_param
static int
fdi_device_end_func (const func_params_t *params, void *data)
{
+ printf(" \n");
printf(" \n");
printf(" \n");
printf("\n");