diff options
Diffstat (limited to 'src/camera')
| -rw-r--r-- | src/camera/GPhoto.vala | 14 | ||||
| -rw-r--r-- | src/camera/ImportPage.vala | 5 |
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); |