← Back to branch summary

~ubuntu-branches/ubuntu/maverick/libmtp/maverick

« back to all changes in this revision

Viewing changes to src/libmtp.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-05-26 14:01:48 UTC
  • mfrom: (16.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100526140148-pie49rs1951l43fm
Tags: 1.0.3-1ubuntu1
https://launchpad.net/bugs/585802
* Merge with debian unstable (LP: #585802), Ubuntu remaining changes:
  - Install the apport package hook.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libmtp.c
1784
1784
    return NULL;
1785
1785
  }
1786
1786
 
 
1787
  /* Check: if this is a PTP device, is it really tagged as MTP? */
 
1788
  if (current_params->deviceinfo.VendorExtensionID != 0x00000006) {
 
1789
    LIBMTP_ERROR("LIBMTP WARNING: no MTP vendor extension on device "
 
1790
                 "%d on bus %d",
 
1791
                 rawdevice->devnum, rawdevice->bus_location);
 
1792
    LIBMTP_ERROR("LIBMTP WARNING: VendorExtensionID: %08x",
 
1793
                 current_params->deviceinfo.VendorExtensionID);
 
1794
    LIBMTP_ERROR("LIBMTP WARNING: VendorExtensionDesc: %s",
 
1795
                 current_params->deviceinfo.VendorExtensionDesc);
 
1796
    LIBMTP_ERROR("LIBMTP WARNING: this typically means the device is PTP "
 
1797
                 "(i.e. a camera) but not an MTP device at all. "
 
1798
                 "Trying to continue anyway.");
 
1799
  }
 
1800
 
1787
1801
  /* Determine if the object size supported is 32 or 64 bit wide */
1788
1802
  for (i=0;i<current_params->deviceinfo.ImageFormats_len;i++) {
1789
1803
    PTPObjectPropDesc opd;