diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-06-12 21:07:38 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-06-12 21:07:38 +0000 |
| commit | ffe0a3e862a6f4db41e7fa21d539c02a1ed1088f (patch) | |
| tree | b80501e4767d295b32d32653b8806c0c1dea21ac /packaging/generic | |
| parent | ed3138b400116ddccfbb0f5bb25954c94073a04a (diff) | |
| download | libgphoto2-ffe0a3e862a6f4db41e7fa21d539c02a1ed1088f.tar.gz | |
replace vendor/class hack by direct Apple Vendor ID check
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12147 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'packaging/generic')
| -rw-r--r-- | packaging/generic/print-camera-list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index 436319825..616a587fb 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -859,7 +859,7 @@ fdi_camera_func (const func_params_t *params, if (a->usb_vendor) { /* usb product id might be 0! */ printf(" <match key=\"usb.vendor_id\" int=\"%d\">\n", a->usb_vendor); printf(" <match key=\"usb.product_id\" int=\"%d\">\n", a->usb_product); - if ((a->usb_class) && (a->usb_class != 666)) { /* additional match */ + if (a->usb_vendor == 0x05ac) { /* Apple iPhone */ printf(" <match key=\"usb.interface.class\" int=\"%d\">\n", a->usb_class); printf(" <match key=\"usb.interface.subclass\" int=\"%d\">\n", a->usb_subclass); printf(" <match key=\"usb.interface.protocol\" int=\"%d\">\n", a->usb_protocol); @@ -885,7 +885,7 @@ fdi_camera_func (const func_params_t *params, /* leave them here even for audio players */ printf(" <merge key=\"camera.libgphoto2.name\" type=\"string\">%s</merge>\n", model); printf(" <merge key=\"camera.libgphoto2.support\" type=\"bool\">true</merge>\n"); - if ((a->usb_class) && (a->usb_class != 666)) { /* additional match */ + if (a->usb_vendor == 0x05ac) { /* Apple iPhone */ printf(" </match>\n"); printf(" </match>\n"); printf(" </match>\n"); |