summaryrefslogtreecommitdiff
path: root/src/camera
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-11-24 08:37:53 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-11-24 08:37:53 +0100
commit1bf62485f701b52ae27433e3570ac24cd7da886f (patch)
tree0f7be6ad3efd0c75fdad81d8bef5513d477f8d11 /src/camera
parent008bc99860fd353a5da5d06e6be5937f4a358aed (diff)
parenta7f185a9852392d1d6290771db6289c97c401a36 (diff)
Merge branch 'release/debian/0.32.3-1'debian/0.32.3-1
Diffstat (limited to 'src/camera')
-rw-r--r--src/camera/GPhoto.vala14
-rw-r--r--src/camera/ImportPage.vala5
2 files changed, 2 insertions, 17 deletions
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 702f307..5c0b9a8 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -92,21 +92,9 @@ namespace GPhoto {
}
}
- // For CameraFileInfoFile, CameraFileInfoPreview, and CameraStorageInformation. See:
- // https://bugzilla.gnome.org/show_bug.cgi?id=716252
- // https://bugzilla.redhat.com/show_bug.cgi?id=585676
- // https://sourceforge.net/tracker/?func=detail&aid=3000198&group_id=8874&atid=108874
- public const int MAX_FILENAME_LENGTH = 63;
- public const int MAX_BASEDIR_LENGTH = 255;
-
public bool get_info(Context context, Camera camera, string folder, string filename,
out CameraFileInfo info) throws Error {
- if (folder.length > MAX_BASEDIR_LENGTH || filename.length > MAX_FILENAME_LENGTH) {
- info = {};
-
- return false;
- }
-
+
Result res = camera.get_file_info(folder, filename, out info, context);
if (res != Result.OK)
throw new GPhotoError.LIBRARY("[%d] Error retrieving file information for %s/%s: %s",
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index a5d3b4e..463317b 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -1346,10 +1346,7 @@ public class ImportPage : CheckerboardPage {
}
}
- public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
- if (folder.length > GPhoto.MAX_BASEDIR_LENGTH)
- return null;
-
+ public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
string basedir = get_fs_basedir(camera, fsid);
if (basedir == null) {
debug("Unable to find base directory for %s fsid %d", camera_name, fsid);