summaryrefslogtreecommitdiff
path: root/src/camera/GPhoto.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-05-24 15:24:15 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-05-24 15:24:15 +0200
commite859597670d8a11e35aaa73dcb1856d607b7a8b7 (patch)
tree1513b35b0c01cdc7b47cb29567f42c3e8090d7e6 /src/camera/GPhoto.vala
parent9d91a24bd761fdf390f046763c772c3c9f6acb52 (diff)
parentde1fe3ed59903afa50e57455ef362f91da88f877 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/camera/GPhoto.vala')
-rw-r--r--src/camera/GPhoto.vala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 39b2109..bc2251c 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -135,9 +135,10 @@ namespace GPhoto {
// filesystem. In these cases shotwell can access the file directly. See:
// http://redmine.yorba.org/issues/2959
public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) {
- GPhoto.CameraStorageInformation *sifs = null;
+ // Fixme: Why do we need to query get_storageinfo here first?
+ GPhoto.CameraStorageInformation[] sifs = null;
int count = 0;
- camera.get_storageinfo(&sifs, out count, context);
+ camera.get_storageinfo(out sifs, context);
GPhoto.PortInfo port_info;
camera.get_port_info(out port_info);