Revert "Uprev libmtp to 1.1.12"

examples/folders.c

 /**
  * \file folders.c
  * Example program that lists all folders on a device.
  *
  * Copyright (C) 2005-2011 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2007 Ted Bullock <tbullock@canada.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 23 matching lines @@
   for(i=0;i<level;i++) printf("  ");
 
   printf("%s\n", folderlist->name);
 
   dump_folder_list(folderlist->child, level+1);
   dump_folder_list(folderlist->sibling, level);
 }
 
 int main (int argc, char **argv)
 {
-  LIBMTP_raw_device_t *rawdevices;
-  int numrawdevices;
-  int i;
+  LIBMTP_mtpdevice_t *device_list, *device;
 
   LIBMTP_Init();
   printf("Attempting to connect device(s)\n");
 
-  switch (LIBMTP_Detect_Raw_Devices(&rawdevices, &numrawdevices)) {
+  switch(LIBMTP_Get_Connected_Devices(&device_list))
+  {
   case LIBMTP_ERROR_NO_DEVICE_ATTACHED:
     printf("mtp-folders: no devices found\n");
     return 0;
   case LIBMTP_ERROR_CONNECTING:
     fprintf(stderr, "mtp-folders: There has been an error connecting. Exit\n");
     return 1;
   case LIBMTP_ERROR_MEMORY_ALLOCATION:
     fprintf(stderr, "mtp-folders: Memory Allocation Error. Exit\n");
     return 1;
 
   /* Unknown general errors - This should never execute */
   case LIBMTP_ERROR_GENERAL:
   default:
     fprintf(stderr, "mtp-folders: Unknown error, please report "
                     "this to the libmtp developers\n");
-    return 1;
+  return 1;
 
   /* Successfully connected at least one device, so continue */
   case LIBMTP_ERROR_NONE:
     printf("mtp-folders: Successfully connected\n");
   }
 
   /* iterate through connected MTP devices */
-  for (i = 0; i < numrawdevices; i++) {
-    LIBMTP_mtpdevice_t *device;
+  for(device = device_list; device != NULL; device = device->next)
+  {
     LIBMTP_devicestorage_t *storage;
     char *friendlyname;
     int ret;
 
-    device = LIBMTP_Open_Raw_Device(&rawdevices[i]);
-    if (device == NULL) {
-      fprintf(stderr, "Unable to open raw device %d\n", i);
-      continue;
-    }
-
     /* Echo the friendly name so we know which device we are working with */
     friendlyname = LIBMTP_Get_Friendlyname(device);
     if (friendlyname == NULL) {
       printf("Friendly name: (NULL)\n");
     } else {
       printf("Friendly name: %s\n", friendlyname);
       free(friendlyname);
     }
 
     LIBMTP_Dump_Errorstack(device);
@@ skipping 17 matching lines @@
 
       if (folders == NULL) {
         fprintf(stdout, "No folders found\n");
         LIBMTP_Dump_Errorstack(device);
         LIBMTP_Clear_Errorstack(device);
       } else {
         dump_folder_list(folders,0);
       }
       LIBMTP_destroy_folder_t(folders);
     }
-    LIBMTP_Release_Device(device);
   }
 
-  free(rawdevices);
+  LIBMTP_Release_Device_List(device_list);
   printf("OK.\n");
 
   return 0;
 }