From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/camera/CameraTable.vala | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/camera/CameraTable.vala') diff --git a/src/camera/CameraTable.vala b/src/camera/CameraTable.vala index 7eb7ae2..1636816 100644 --- a/src/camera/CameraTable.vala +++ b/src/camera/CameraTable.vala @@ -342,11 +342,21 @@ public class CameraTable { display_name = device.get_property("ID_MODEL"); } } + + if (port.has_prefix("disk:")) { + try { + var mount = File.new_for_path (port.substring(5)).find_enclosing_mount(); + var volume = mount.get_volume(); + // Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume) + display_name = _("%s (%s)").printf (name, volume.get_name ()); + icon = volume.get_icon().to_string(); + + } catch (Error e) { } + } if (null == display_name) { // Default to GPhoto detected name. display_name = name; } - int index = port_info_list.lookup_path(port); if (index < 0) do_op((GPhoto.Result) index, "lookup port %s".printf(port)); -- cgit v1.2.3