summaryrefslogtreecommitdiff
path: root/src/camera
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
commit49120f48474fc8fdc2448c75d961bc238213cfac (patch)
tree05bcdb95d65a807cf0f1ffffd066c09074b5cf56 /src/camera
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
New upstream version 0.28.2upstream/0.28.2
Diffstat (limited to 'src/camera')
-rw-r--r--src/camera/CameraBranch.c (renamed from src/camera/Branch.c)522
-rw-r--r--src/camera/CameraBranch.vala (renamed from src/camera/Branch.vala)2
-rw-r--r--src/camera/CameraTable.c1867
-rw-r--r--src/camera/CameraTable.vala12
-rw-r--r--src/camera/GPhoto.c2053
-rw-r--r--src/camera/GPhoto.vala83
-rw-r--r--src/camera/ImportPage.c7954
-rw-r--r--src/camera/ImportPage.vala76
8 files changed, 6393 insertions, 6176 deletions
diff --git a/src/camera/Branch.c b/src/camera/CameraBranch.c
index 60ed699..9ac4b11 100644
--- a/src/camera/Branch.c
+++ b/src/camera/CameraBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* CameraBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from CameraBranch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
*
@@ -433,8 +433,8 @@ GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
enum {
CAMERA_HEADER_DUMMY_PROPERTY
};
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
GType page_get_type (void) G_GNUC_CONST;
GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -459,23 +459,23 @@ static void camera_sidebar_entry_finalize (GObject * obj);
static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
gint result;
result = camera_branch_camera_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 465 "Branch.c"
+#line 465 "CameraBranch.c"
}
static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_on_camera_added ((CameraBranch*) self, camera);
-#line 472 "Branch.c"
+#line 472 "CameraBranch.c"
}
static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_on_camera_removed ((CameraBranch*) self, camera);
-#line 479 "Branch.c"
+#line 479 "CameraBranch.c"
}
@@ -487,15 +487,15 @@ CameraBranch* camera_branch_construct (GType object_type) {
CameraTable* _tmp14_;
CameraTable* _tmp15_;
CameraTable* _tmp16_;
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = camera_header_new ();
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = (CameraBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, _camera_branch_camera_comparator_gcompare_func, NULL);
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (_tmp1_);
-#line 499 "Branch.c"
+#line 499 "CameraBranch.c"
{
GeeIterator* _camera_it = NULL;
CameraTable* _tmp2_;
@@ -504,87 +504,87 @@ CameraBranch* camera_branch_construct (GType object_type) {
GeeIterable* _tmp5_;
GeeIterator* _tmp6_;
GeeIterator* _tmp7_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = camera_table_get_instance ();
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = _tmp2_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = camera_table_get_cameras (_tmp3_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp5_ = _tmp4_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp6_ = gee_iterable_iterator (_tmp5_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp7_ = _tmp6_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (_tmp5_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_camera_table_unref0 (_tmp3_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_camera_it = _tmp7_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
while (TRUE) {
-#line 528 "Branch.c"
+#line 528 "CameraBranch.c"
GeeIterator* _tmp8_;
gboolean _tmp9_;
DiscoveredCamera* camera = NULL;
GeeIterator* _tmp10_;
gpointer _tmp11_;
DiscoveredCamera* _tmp12_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp8_ = _camera_it;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp9_ = gee_iterator_next (_tmp8_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
if (!_tmp9_) {
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
break;
-#line 543 "Branch.c"
+#line 543 "CameraBranch.c"
}
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp10_ = _camera_it;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp11_ = gee_iterator_get (_tmp10_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera = (DiscoveredCamera*) _tmp11_;
-#line 19 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp12_ = camera;
-#line 19 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_add_camera (self, _tmp12_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_discovered_camera_unref0 (camera);
-#line 557 "Branch.c"
+#line 557 "CameraBranch.c"
}
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (_camera_it);
-#line 561 "Branch.c"
+#line 561 "CameraBranch.c"
}
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp13_ = camera_table_get_instance ();
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp14_ = _tmp13_;
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_signal_connect_object (_tmp14_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0);
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_camera_table_unref0 (_tmp14_);
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp15_ = camera_table_get_instance ();
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp16_ = _tmp15_;
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_signal_connect_object (_tmp16_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0);
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_camera_table_unref0 (_tmp16_);
-#line 13 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self;
-#line 581 "Branch.c"
+#line 581 "CameraBranch.c"
}
CameraBranch* camera_branch_new (void) {
-#line 13 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return camera_branch_construct (CAMERA_TYPE_BRANCH);
-#line 588 "Branch.c"
+#line 588 "CameraBranch.c"
}
@@ -597,9 +597,9 @@ void camera_branch_terminate (void) {
static gpointer _g_object_ref0 (gpointer self) {
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self ? g_object_ref (self) : NULL;
-#line 603 "Branch.c"
+#line 603 "CameraBranch.c"
}
@@ -617,49 +617,49 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
gint _tmp8_;
gint _tmp9_;
gint _tmp10_;
-#line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 32 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = a;
-#line 32 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = b;
-#line 32 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
if (_tmp0_ == _tmp1_) {
-#line 33 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = 0;
-#line 33 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 635 "Branch.c"
+#line 635 "CameraBranch.c"
}
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = a;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = sidebar_entry_get_sidebar_name (_tmp2_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = _tmp3_;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp5_ = b;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp6_ = sidebar_entry_get_sidebar_name (_tmp5_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp7_ = _tmp6_;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp8_ = g_utf8_collate (_tmp4_, _tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp9_ = _tmp8_;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (_tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (_tmp4_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
ret = _tmp9_;
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp10_ = ret;
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
if (_tmp10_ == 0) {
-#line 663 "Branch.c"
+#line 663 "CameraBranch.c"
CameraSidebarEntry* cam_a = NULL;
SidebarEntry* _tmp11_;
CameraSidebarEntry* _tmp12_;
@@ -675,67 +675,67 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
gchar* _tmp22_;
gchar* _tmp23_;
gint _tmp24_;
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp11_ = a;
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp11_) : NULL);
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
cam_a = _tmp12_;
-#line 40 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp13_ = b;
-#line 40 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp13_) : NULL);
-#line 40 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
cam_b = _tmp14_;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp16_ = cam_a;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
if (_tmp16_ != NULL) {
-#line 695 "Branch.c"
+#line 695 "CameraBranch.c"
CameraSidebarEntry* _tmp17_;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp17_ = cam_b;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp15_ = _tmp17_ != NULL;
-#line 701 "Branch.c"
+#line 701 "CameraBranch.c"
} else {
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp15_ = FALSE;
-#line 705 "Branch.c"
+#line 705 "CameraBranch.c"
}
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_vala_assert (_tmp15_, "cam_a != null && cam_b != null");
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp18_ = cam_a;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp19_ = camera_sidebar_entry_get_uri (_tmp18_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp20_ = _tmp19_;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp21_ = cam_b;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp22_ = camera_sidebar_entry_get_uri (_tmp21_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp23_ = _tmp22_;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp24_ = g_utf8_collate (_tmp20_, _tmp23_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
ret = _tmp24_;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (_tmp23_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (_tmp20_);
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (cam_b);
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (cam_a);
-#line 733 "Branch.c"
+#line 733 "CameraBranch.c"
}
-#line 45 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = ret;
-#line 45 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 739 "Branch.c"
+#line 739 "CameraBranch.c"
}
@@ -744,49 +744,49 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc
GeeHashMap* _tmp0_;
DiscoveredCamera* _tmp1_;
gpointer _tmp2_;
-#line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL);
-#line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->camera_map;
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = camera;
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = (CameraSidebarEntry*) _tmp2_;
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 762 "Branch.c"
+#line 762 "CameraBranch.c"
}
static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) {
DiscoveredCamera* _tmp0_;
-#line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 53 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = camera;
-#line 53 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_add_camera (self, _tmp0_);
-#line 776 "Branch.c"
+#line 776 "CameraBranch.c"
}
static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) {
DiscoveredCamera* _tmp0_;
-#line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 57 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = camera;
-#line 57 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_remove_camera (self, _tmp0_);
-#line 790 "Branch.c"
+#line 790 "CameraBranch.c"
}
@@ -801,41 +801,41 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came
DiscoveredCamera* _tmp6_;
SidebarEntry* _tmp7_;
SidebarEntry* _tmp8_;
-#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->camera_map;
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = camera;
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_vala_assert (!_tmp2_, "!camera_map.has_key(camera)");
-#line 63 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = camera;
-#line 63 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = camera_sidebar_entry_new (_tmp3_);
-#line 63 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
entry = _tmp4_;
-#line 64 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp5_ = self->priv->camera_map;
-#line 64 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp6_ = camera;
-#line 64 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, entry);
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp7_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp8_ = _tmp7_;
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (_tmp8_);
-#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (entry);
-#line 839 "Branch.c"
+#line 839 "CameraBranch.c"
}
@@ -851,83 +851,83 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c
GeeHashMap* _tmp6_;
DiscoveredCamera* _tmp7_;
gboolean _tmp8_;
-#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->camera_map;
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = camera;
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_vala_assert (_tmp2_, "camera_map.has_key(camera)");
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = self->priv->camera_map;
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = camera;
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
entry = (CameraSidebarEntry*) _tmp5_;
-#line 74 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_vala_assert (entry != NULL, "entry != null");
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp6_ = self->priv->camera_map;
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp7_ = camera;
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, NULL);
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
removed = _tmp8_;
-#line 77 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_vala_assert (removed, "removed");
-#line 79 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (entry);
-#line 891 "Branch.c"
+#line 891 "CameraBranch.c"
}
static void camera_branch_class_init (CameraBranchClass * klass) {
gchar* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_type_class_add_private (klass, sizeof (CameraBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
G_OBJECT_CLASS (klass)->finalize = camera_branch_finalize;
-#line 8 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = g_strdup (RESOURCES_ICON_CAMERAS);
-#line 8 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_cameras_icon = _tmp0_;
-#line 907 "Branch.c"
+#line 907 "CameraBranch.c"
}
static void camera_branch_instance_init (CameraBranch * self) {
GeeHashMap* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv = CAMERA_BRANCH_GET_PRIVATE (self);
-#line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv->camera_map = _tmp0_;
-#line 919 "Branch.c"
+#line 919 "CameraBranch.c"
}
static void camera_branch_finalize (GObject * obj) {
CameraBranch * self;
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch);
-#line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (self->priv->camera_map);
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
G_OBJECT_CLASS (camera_branch_parent_class)->finalize (obj);
-#line 931 "Branch.c"
+#line 931 "CameraBranch.c"
}
@@ -945,25 +945,25 @@ GType camera_branch_get_type (void) {
CameraHeader* camera_header_construct (GType object_type) {
CameraHeader * self = NULL;
-#line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), TRUE);
-#line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
+ self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), _ ("List of all discovered camera devices"), TRUE);
+#line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self;
-#line 953 "Branch.c"
+#line 953 "CameraBranch.c"
}
CameraHeader* camera_header_new (void) {
-#line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return camera_header_construct (CAMERA_TYPE_HEADER);
-#line 960 "Branch.c"
+#line 960 "CameraBranch.c"
}
static void camera_header_class_init (CameraHeaderClass * klass) {
-#line 83 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 83 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_header_parent_class = g_type_class_peek_parent (klass);
-#line 967 "Branch.c"
+#line 967 "CameraBranch.c"
}
@@ -984,9 +984,9 @@ GType camera_header_get_type (void) {
static gpointer _discovered_camera_ref0 (gpointer self) {
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self ? discovered_camera_ref (self) : NULL;
-#line 990 "Branch.c"
+#line 990 "CameraBranch.c"
}
@@ -997,38 +997,38 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
DiscoveredCamera* _tmp2_;
const gchar* _tmp3_;
gchar* _tmp4_;
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = (CameraSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = camera;
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = _discovered_camera_ref0 (_tmp0_);
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_discovered_camera_unref0 (self->priv->camera);
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv->camera = _tmp1_;
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = camera;
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = _tmp2_->uri;
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = g_strdup (_tmp3_);
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (self->priv->uri);
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv->uri = _tmp4_;
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self;
-#line 1025 "Branch.c"
+#line 1025 "CameraBranch.c"
}
CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) {
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera);
-#line 1032 "Branch.c"
+#line 1032 "CameraBranch.c"
}
@@ -1039,27 +1039,27 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
DiscoveredCamera* _tmp1_;
const gchar* _tmp2_;
gchar* _tmp3_;
-#line 98 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = self->priv->camera;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = _tmp1_->display_name;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = _tmp2_;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
if (_tmp0_ == NULL) {
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = _ ("Camera");
-#line 1055 "Branch.c"
+#line 1055 "CameraBranch.c"
}
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = g_strdup (_tmp0_);
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = _tmp3_;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1063 "Branch.c"
+#line 1063 "CameraBranch.c"
}
@@ -1070,31 +1070,31 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
DiscoveredCamera* _tmp1_;
const gchar* _tmp2_;
gchar* _tmp4_;
-#line 102 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = self->priv->camera;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = _tmp1_->icon;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = _tmp2_;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
if (_tmp0_ == NULL) {
-#line 1084 "Branch.c"
+#line 1084 "CameraBranch.c"
const gchar* _tmp3_;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = camera_branch_cameras_icon;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = _tmp3_;
-#line 1090 "Branch.c"
+#line 1090 "CameraBranch.c"
}
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = g_strdup (_tmp0_);
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = _tmp4_;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1098 "Branch.c"
+#line 1098 "CameraBranch.c"
}
@@ -1110,37 +1110,37 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base
gchar* _tmp6_;
ImportPage* _tmp7_;
Page* _tmp8_;
-#line 106 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 106 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->camera;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = _tmp0_->gcamera;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp2_ = self->priv->uri;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = _tmp3_;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp5_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp6_ = _tmp5_;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp7_ = import_page_new (_tmp1_, _tmp2_, _tmp4_, _tmp6_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_object_ref_sink (_tmp7_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (_tmp6_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (_tmp4_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = _tmp8_;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1144 "Branch.c"
+#line 1144 "CameraBranch.c"
}
@@ -1148,55 +1148,55 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (CAMERA_IS_SIDEBAR_ENTRY (self), NULL);
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->uri;
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1162 "Branch.c"
+#line 1162 "CameraBranch.c"
}
static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_type_class_add_private (klass, sizeof (CameraSidebarEntryPrivate));
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_name;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_icon;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_create_page;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize;
-#line 1179 "Branch.c"
+#line 1179 "CameraBranch.c"
}
static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) {
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1186 "Branch.c"
+#line 1186 "CameraBranch.c"
}
static void camera_sidebar_entry_finalize (GObject * obj) {
CameraSidebarEntry * self;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 90 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_discovered_camera_unref0 (self->priv->camera);
-#line 91 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (self->priv->uri);
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj);
-#line 1200 "Branch.c"
+#line 1200 "CameraBranch.c"
}
diff --git a/src/camera/Branch.vala b/src/camera/CameraBranch.vala
index 9bc551a..052f093 100644
--- a/src/camera/Branch.vala
+++ b/src/camera/CameraBranch.vala
@@ -82,7 +82,7 @@ public class Camera.Branch : Sidebar.Branch {
public class Camera.Header : Sidebar.Header {
public Header() {
- base (_("Cameras"));
+ base (_("Cameras"), _("List of all discovered camera devices"));
}
}
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 864a4e8..5c3c502 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <gphoto2/gphoto2-port-info-list.h>
#include <gphoto2/gphoto2-list.h>
+#include <glib/gi18n-lib.h>
#include <gobject/gvaluecollector.h>
@@ -227,7 +228,7 @@ gint camera_table_get_count (CameraTable* self);
DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri);
static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error);
static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1);
-static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value);
static void _g_object_unref0_ (gpointer var);
static void _g_list_free__g_object_unref0_ (GList* self);
static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port);
@@ -235,7 +236,7 @@ gchar* camera_table_get_port_uri (const gchar* port);
gchar* camera_table_get_port_path (const gchar* port);
static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid);
static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid);
-static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
+static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
static void camera_table_finalize (CameraTable * obj);
@@ -247,7 +248,7 @@ static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL};
static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 251 "CameraTable.c"
+#line 252 "CameraTable.c"
}
@@ -303,21 +304,21 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer
self->icon = _tmp7_;
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 307 "CameraTable.c"
+#line 308 "CameraTable.c"
}
DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon);
-#line 314 "CameraTable.c"
+#line 315 "CameraTable.c"
}
static void value_discovered_camera_init (GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 321 "CameraTable.c"
+#line 322 "CameraTable.c"
}
@@ -326,7 +327,7 @@ static void value_discovered_camera_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (value->data[0].v_pointer);
-#line 330 "CameraTable.c"
+#line 331 "CameraTable.c"
}
}
@@ -336,11 +337,11 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
if (src_value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = discovered_camera_ref (src_value->data[0].v_pointer);
-#line 340 "CameraTable.c"
+#line 341 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 344 "CameraTable.c"
+#line 345 "CameraTable.c"
}
}
@@ -348,37 +349,37 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
static gpointer value_discovered_camera_peek_pointer (const GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 352 "CameraTable.c"
+#line 353 "CameraTable.c"
}
static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (collect_values[0].v_pointer) {
-#line 359 "CameraTable.c"
+#line 360 "CameraTable.c"
DiscoveredCamera * object;
object = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (object->parent_instance.g_class == NULL) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 366 "CameraTable.c"
+#line 367 "CameraTable.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 370 "CameraTable.c"
+#line 371 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = discovered_camera_ref (object);
-#line 374 "CameraTable.c"
+#line 375 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 378 "CameraTable.c"
+#line 379 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 382 "CameraTable.c"
+#line 383 "CameraTable.c"
}
@@ -389,25 +390,25 @@ static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_
if (!object_p) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 393 "CameraTable.c"
+#line 394 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = NULL;
-#line 399 "CameraTable.c"
+#line 400 "CameraTable.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = value->data[0].v_pointer;
-#line 403 "CameraTable.c"
+#line 404 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 407 "CameraTable.c"
+#line 408 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 411 "CameraTable.c"
+#line 412 "CameraTable.c"
}
@@ -421,7 +422,7 @@ GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return G_PARAM_SPEC (spec);
-#line 425 "CameraTable.c"
+#line 426 "CameraTable.c"
}
@@ -430,7 +431,7 @@ gpointer value_get_discovered_camera (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA), NULL);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 434 "CameraTable.c"
+#line 435 "CameraTable.c"
}
@@ -450,17 +451,17 @@ void value_set_discovered_camera (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_ref (value->data[0].v_pointer);
-#line 454 "CameraTable.c"
+#line 455 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 458 "CameraTable.c"
+#line 459 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (old);
-#line 464 "CameraTable.c"
+#line 465 "CameraTable.c"
}
}
@@ -479,17 +480,17 @@ void value_take_discovered_camera (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = v_object;
-#line 483 "CameraTable.c"
+#line 484 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 487 "CameraTable.c"
+#line 488 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (old);
-#line 493 "CameraTable.c"
+#line 494 "CameraTable.c"
}
}
@@ -499,14 +500,14 @@ static void discovered_camera_class_init (DiscoveredCameraClass * klass) {
discovered_camera_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
((DiscoveredCameraClass *) klass)->finalize = discovered_camera_finalize;
-#line 503 "CameraTable.c"
+#line 504 "CameraTable.c"
}
static void discovered_camera_instance_init (DiscoveredCamera * self) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 510 "CameraTable.c"
+#line 511 "CameraTable.c"
}
@@ -524,7 +525,7 @@ static void discovered_camera_finalize (DiscoveredCamera * obj) {
_g_free0 (self->display_name);
#line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->icon);
-#line 528 "CameraTable.c"
+#line 529 "CameraTable.c"
}
@@ -549,7 +550,7 @@ gpointer discovered_camera_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 553 "CameraTable.c"
+#line 554 "CameraTable.c"
}
@@ -562,7 +563,7 @@ void discovered_camera_unref (gpointer instance) {
DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 566 "CameraTable.c"
+#line 567 "CameraTable.c"
}
}
@@ -570,28 +571,28 @@ void discovered_camera_unref (gpointer instance) {
static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) {
#line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_update_cameras ((CameraTable*) self);
-#line 574 "CameraTable.c"
+#line 575 "CameraTable.c"
}
static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
#line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_udev_event ((CameraTable*) self, action, device);
-#line 581 "CameraTable.c"
+#line 582 "CameraTable.c"
}
static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
#line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 588 "CameraTable.c"
+#line 589 "CameraTable.c"
}
static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
#line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 595 "CameraTable.c"
+#line 596 "CameraTable.c"
}
@@ -600,7 +601,7 @@ static gboolean _camera_table_delayed_init_gsource_func (gpointer self) {
result = camera_table_delayed_init ((CameraTable*) self);
#line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 604 "CameraTable.c"
+#line 605 "CameraTable.c"
}
@@ -641,14 +642,14 @@ static CameraTable* camera_table_construct (GType object_type) {
g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref);
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 645 "CameraTable.c"
+#line 646 "CameraTable.c"
}
static CameraTable* camera_table_new (void) {
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 652 "CameraTable.c"
+#line 653 "CameraTable.c"
}
@@ -669,18 +670,18 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
library_window_set_page_switching_enabled (_tmp1_, FALSE);
#line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_tmp1_);
-#line 673 "CameraTable.c"
+#line 674 "CameraTable.c"
{
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_init_camera_table (self, &_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 679 "CameraTable.c"
+#line 680 "CameraTable.c"
gboolean _tmp2_ = FALSE;
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 683 "CameraTable.c"
- goto __catch58_gphoto_error;
+#line 684 "CameraTable.c"
+ goto __catch64_gphoto_error;
}
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -688,11 +689,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp2_;
-#line 692 "CameraTable.c"
+#line 693 "CameraTable.c"
}
}
- goto __finally58;
- __catch58_gphoto_error:
+ goto __finally64;
+ __catch64_gphoto_error:
{
GError* err = NULL;
GError* _tmp3_;
@@ -713,12 +714,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
_g_error_free0 (err);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 717 "CameraTable.c"
+#line 718 "CameraTable.c"
}
- __finally58:
+ __finally64:
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 722 "CameraTable.c"
+#line 723 "CameraTable.c"
gboolean _tmp5_ = FALSE;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -726,19 +727,19 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp5_;
-#line 730 "CameraTable.c"
+#line 731 "CameraTable.c"
}
{
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_update_camera_table (self, &_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 737 "CameraTable.c"
+#line 738 "CameraTable.c"
gboolean _tmp6_ = FALSE;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 741 "CameraTable.c"
- goto __catch59_gphoto_error;
+#line 742 "CameraTable.c"
+ goto __catch65_gphoto_error;
}
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -746,11 +747,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp6_;
-#line 750 "CameraTable.c"
+#line 751 "CameraTable.c"
}
}
- goto __finally59;
- __catch59_gphoto_error:
+ goto __finally65;
+ __catch65_gphoto_error:
{
GError* err = NULL;
GError* _tmp7_;
@@ -767,12 +768,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 771 "CameraTable.c"
+#line 772 "CameraTable.c"
}
- __finally59:
+ __finally65:
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 776 "CameraTable.c"
+#line 777 "CameraTable.c"
gboolean _tmp9_ = FALSE;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -780,7 +781,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp9_;
-#line 784 "CameraTable.c"
+#line 785 "CameraTable.c"
}
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp10_ = app_window_get_instance ();
@@ -794,14 +795,14 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
result = FALSE;
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 798 "CameraTable.c"
+#line 799 "CameraTable.c"
}
static gpointer _camera_table_ref0 (gpointer self) {
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? camera_table_ref (self) : NULL;
-#line 805 "CameraTable.c"
+#line 806 "CameraTable.c"
}
@@ -814,7 +815,7 @@ CameraTable* camera_table_get_instance (void) {
_tmp0_ = camera_table_instance;
#line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp0_ == NULL) {
-#line 818 "CameraTable.c"
+#line 819 "CameraTable.c"
CameraTable* _tmp1_;
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = camera_table_new ();
@@ -822,7 +823,7 @@ CameraTable* camera_table_get_instance (void) {
_camera_table_unref0 (camera_table_instance);
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_instance = _tmp1_;
-#line 826 "CameraTable.c"
+#line 827 "CameraTable.c"
}
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = camera_table_instance;
@@ -832,7 +833,7 @@ CameraTable* camera_table_get_instance (void) {
result = _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 836 "CameraTable.c"
+#line 837 "CameraTable.c"
}
@@ -853,7 +854,7 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 857 "CameraTable.c"
+#line 858 "CameraTable.c"
}
@@ -874,7 +875,7 @@ gint camera_table_get_count (CameraTable* self) {
result = _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 878 "CameraTable.c"
+#line 879 "CameraTable.c"
}
@@ -897,7 +898,7 @@ DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri)
result = (DiscoveredCamera*) _tmp2_;
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 901 "CameraTable.c"
+#line 902 "CameraTable.c"
}
@@ -912,7 +913,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
_tmp0_ = res;
#line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp0_ != GP_OK) {
-#line 916 "CameraTable.c"
+#line 917 "CameraTable.c"
int _tmp1_;
const gchar* _tmp2_;
int _tmp3_;
@@ -936,7 +937,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
g_propagate_error (error, _inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 940 "CameraTable.c"
+#line 941 "CameraTable.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -944,7 +945,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
g_clear_error (&_inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 948 "CameraTable.c"
+#line 949 "CameraTable.c"
}
}
}
@@ -975,7 +976,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 979 "CameraTable.c"
+#line 980 "CameraTable.c"
} else {
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -983,7 +984,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_clear_error (&_inner_error_);
#line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 987 "CameraTable.c"
+#line 988 "CameraTable.c"
}
}
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1002,7 +1003,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 1006 "CameraTable.c"
+#line 1007 "CameraTable.c"
} else {
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1010,7 +1011,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
g_clear_error (&_inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 1014 "CameraTable.c"
+#line 1015 "CameraTable.c"
}
}
}
@@ -1019,31 +1020,31 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
static gpointer _g_object_ref0 (gpointer self) {
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? g_object_ref (self) : NULL;
-#line 1023 "CameraTable.c"
+#line 1024 "CameraTable.c"
}
-static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1034 "CameraTable.c"
+#line 1035 "CameraTable.c"
}
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[(*length)++] = value;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[*length] = NULL;
-#line 1040 "CameraTable.c"
+#line 1041 "CameraTable.c"
}
static void _g_object_unref0_ (gpointer var) {
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 1047 "CameraTable.c"
+#line 1048 "CameraTable.c"
}
@@ -1052,7 +1053,7 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_list_free (self);
-#line 1056 "CameraTable.c"
+#line 1057 "CameraTable.c"
}
@@ -1086,7 +1087,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
device_list = _tmp2_;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = device_list;
-#line 1090 "CameraTable.c"
+#line 1091 "CameraTable.c"
{
GList* device_collection = NULL;
GList* device_it = NULL;
@@ -1094,14 +1095,14 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
device_collection = _tmp3_;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1098 "CameraTable.c"
+#line 1099 "CameraTable.c"
GUdevDevice* _tmp4_;
GUdevDevice* device = NULL;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp4_ = _g_object_ref0 ((GUdevDevice*) device_it->data);
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
device = _tmp4_;
-#line 1105 "CameraTable.c"
+#line 1106 "CameraTable.c"
{
gchar* device_file = NULL;
GUdevDevice* _tmp5_;
@@ -1122,7 +1123,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp10_ = device_file;
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp10_ != NULL) {
-#line 1126 "CameraTable.c"
+#line 1127 "CameraTable.c"
GUdevDevice* _tmp11_;
gboolean _tmp12_;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1131,15 +1132,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = _tmp12_;
-#line 1135 "CameraTable.c"
+#line 1136 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = FALSE;
-#line 1139 "CameraTable.c"
+#line 1140 "CameraTable.c"
}
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp9_) {
-#line 1143 "CameraTable.c"
+#line 1144 "CameraTable.c"
GUdevDevice* _tmp13_;
gboolean _tmp14_;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1148,15 +1149,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = _tmp14_;
-#line 1152 "CameraTable.c"
+#line 1153 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = FALSE;
-#line 1156 "CameraTable.c"
+#line 1157 "CameraTable.c"
}
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp8_) {
-#line 1160 "CameraTable.c"
+#line 1161 "CameraTable.c"
gint camera_bus = 0;
gint camera_device = 0;
const gchar* _tmp15_;
@@ -1176,7 +1177,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_tmp16_ = sscanf (_tmp15_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device);
#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp16_ < 2) {
-#line 1180 "CameraTable.c"
+#line 1181 "CameraTable.c"
const gchar* _tmp17_;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = device_file;
@@ -1189,7 +1190,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_g_object_unref0 (device);
#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 1192 "CameraTable.c"
+#line 1193 "CameraTable.c"
}
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp18_ = camera_bus;
@@ -1212,16 +1213,16 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp24_ = g_strdup (_tmp23_);
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add66 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
+ _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (camera);
-#line 1218 "CameraTable.c"
+#line 1219 "CameraTable.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (device_file);
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (device);
-#line 1224 "CameraTable.c"
+#line 1225 "CameraTable.c"
}
}
}
@@ -1233,7 +1234,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
if (result_length1) {
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*result_length1 = _tmp25__length1;
-#line 1236 "CameraTable.c"
+#line 1237 "CameraTable.c"
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp25_;
@@ -1241,7 +1242,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
__g_list_free__g_object_unref0_0 (device_list);
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1244 "CameraTable.c"
+#line 1245 "CameraTable.c"
}
@@ -1283,7 +1284,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp4_ = current_camera_count;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp4_ == 1) {
-#line 1286 "CameraTable.c"
+#line 1287 "CameraTable.c"
gchar** _tmp5_;
gint _tmp5__length1;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1292,15 +1293,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp5__length1 = usb_cameras_length1;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = _tmp5__length1 == 1;
-#line 1295 "CameraTable.c"
+#line 1296 "CameraTable.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = FALSE;
-#line 1299 "CameraTable.c"
+#line 1300 "CameraTable.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp3_) {
-#line 1303 "CameraTable.c"
+#line 1304 "CameraTable.c"
gchar** _tmp6_;
gint _tmp6__length1;
const gchar* _tmp7_;
@@ -1331,21 +1332,21 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1334 "CameraTable.c"
+#line 1335 "CameraTable.c"
} else {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1338 "CameraTable.c"
+#line 1339 "CameraTable.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1342 "CameraTable.c"
+#line 1343 "CameraTable.c"
}
#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp11_ = port;
#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (g_strcmp0 (_tmp11_, "usb:") == 0) {
-#line 1348 "CameraTable.c"
+#line 1349 "CameraTable.c"
const gchar* _tmp12_;
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp12_ = port;
@@ -1357,15 +1358,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1360 "CameraTable.c"
+#line 1361 "CameraTable.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1364 "CameraTable.c"
+#line 1365 "CameraTable.c"
}
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1368 "CameraTable.c"
+#line 1369 "CameraTable.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp13_ = port;
@@ -1373,7 +1374,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp14_ = sscanf (_tmp13_, "usb:%d,%d", &bus, &device);
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp14_ < 2) {
-#line 1376 "CameraTable.c"
+#line 1377 "CameraTable.c"
const gchar* _tmp15_;
#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = port;
@@ -1385,21 +1386,21 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1388 "CameraTable.c"
+#line 1389 "CameraTable.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1392 "CameraTable.c"
+#line 1393 "CameraTable.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1396 "CameraTable.c"
+#line 1397 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp16_ = usb_cameras;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp16__length1 = usb_cameras_length1;
-#line 1402 "CameraTable.c"
+#line 1403 "CameraTable.c"
{
gchar** usb_camera_collection = NULL;
gint usb_camera_collection_length1 = 0;
@@ -1411,14 +1412,14 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
usb_camera_collection_length1 = _tmp16__length1;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (usb_camera_it = 0; usb_camera_it < _tmp16__length1; usb_camera_it = usb_camera_it + 1) {
-#line 1414 "CameraTable.c"
+#line 1415 "CameraTable.c"
gchar* _tmp17_;
gchar* usb_camera = NULL;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]);
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_camera = _tmp17_;
-#line 1421 "CameraTable.c"
+#line 1422 "CameraTable.c"
{
gint camera_bus = 0;
gint camera_device = 0;
@@ -1433,7 +1434,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp19_ < 2) {
-#line 1436 "CameraTable.c"
+#line 1437 "CameraTable.c"
const gchar* _tmp20_;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp20_ = usb_camera;
@@ -1443,7 +1444,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_g_free0 (usb_camera);
#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 1446 "CameraTable.c"
+#line 1447 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp22_ = bus;
@@ -1451,7 +1452,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp23_ = camera_bus;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp22_ == _tmp23_) {
-#line 1454 "CameraTable.c"
+#line 1455 "CameraTable.c"
gint _tmp24_;
gint _tmp25_;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1460,15 +1461,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
_tmp25_ = camera_device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = _tmp24_ == _tmp25_;
-#line 1463 "CameraTable.c"
+#line 1464 "CameraTable.c"
} else {
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = FALSE;
-#line 1467 "CameraTable.c"
+#line 1468 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp21_) {
-#line 1471 "CameraTable.c"
+#line 1472 "CameraTable.c"
const gchar* _tmp26_;
gchar* _tmp27_;
const gchar* _tmp28_;
@@ -1495,19 +1496,19 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1498 "CameraTable.c"
+#line 1499 "CameraTable.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1502 "CameraTable.c"
+#line 1503 "CameraTable.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1506 "CameraTable.c"
+#line 1507 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
-#line 1510 "CameraTable.c"
+#line 1511 "CameraTable.c"
}
}
}
@@ -1522,15 +1523,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
if (full_port) {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1524 "CameraTable.c"
+#line 1525 "CameraTable.c"
} else {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1528 "CameraTable.c"
+#line 1529 "CameraTable.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1532 "CameraTable.c"
+#line 1533 "CameraTable.c"
}
@@ -1548,7 +1549,7 @@ gchar* camera_table_get_port_uri (const gchar* port) {
result = _tmp1_;
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1550 "CameraTable.c"
+#line 1551 "CameraTable.c"
}
@@ -1571,7 +1572,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
_tmp3_ = end;
#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 1573 "CameraTable.c"
+#line 1574 "CameraTable.c"
glong _tmp4_;
#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -1579,7 +1580,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = _tmp4_;
#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1581 "CameraTable.c"
+#line 1582 "CameraTable.c"
} else {
gchar* _tmp5_;
gchar* _tmp6_;
@@ -1591,7 +1592,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = (glong) (_tmp5_ - _tmp6_);
#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1593 "CameraTable.c"
+#line 1594 "CameraTable.c"
}
}
@@ -1615,21 +1616,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp1_ = offset;
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 1617 "CameraTable.c"
+#line 1618 "CameraTable.c"
glong _tmp2_;
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1623 "CameraTable.c"
+#line 1624 "CameraTable.c"
} else {
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1627 "CameraTable.c"
+#line 1628 "CameraTable.c"
}
#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1631 "CameraTable.c"
+#line 1632 "CameraTable.c"
glong _tmp3_;
glong _tmp4_;
glong _tmp5_;
@@ -1641,7 +1642,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 1643 "CameraTable.c"
+#line 1644 "CameraTable.c"
} else {
gint _tmp6_;
gint _tmp7_;
@@ -1651,13 +1652,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp7_ = _tmp6_;
#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 1653 "CameraTable.c"
+#line 1654 "CameraTable.c"
}
#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 1659 "CameraTable.c"
+#line 1660 "CameraTable.c"
glong _tmp9_;
glong _tmp10_;
glong _tmp11_;
@@ -1671,7 +1672,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp11_ = offset;
#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1673 "CameraTable.c"
+#line 1674 "CameraTable.c"
} else {
glong _tmp12_;
glong _tmp13_;
@@ -1681,13 +1682,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp13_ = string_length;
#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1683 "CameraTable.c"
+#line 1684 "CameraTable.c"
}
#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 1689 "CameraTable.c"
+#line 1690 "CameraTable.c"
glong _tmp15_;
glong _tmp16_;
#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1696,7 +1697,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp16_ = offset;
#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 1698 "CameraTable.c"
+#line 1699 "CameraTable.c"
}
#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -1716,7 +1717,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
result = _tmp22_;
#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1718 "CameraTable.c"
+#line 1719 "CameraTable.c"
}
@@ -1735,20 +1736,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if ((*((gchar*) self)) == '\0') {
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 1737 "CameraTable.c"
+#line 1738 "CameraTable.c"
} else {
const gchar* _tmp2_;
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = old;
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 1744 "CameraTable.c"
+#line 1745 "CameraTable.c"
}
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_) {
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 1750 "CameraTable.c"
+#line 1751 "CameraTable.c"
} else {
const gchar* _tmp3_;
const gchar* _tmp4_;
@@ -1758,11 +1759,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp4_ = replacement;
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 1760 "CameraTable.c"
+#line 1761 "CameraTable.c"
}
#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1764 "CameraTable.c"
+#line 1765 "CameraTable.c"
gchar* _tmp5_;
#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = g_strdup (self);
@@ -1770,7 +1771,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
result = _tmp5_;
#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1772 "CameraTable.c"
+#line 1773 "CameraTable.c"
}
{
GRegex* regex = NULL;
@@ -1802,8 +1803,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1804 "CameraTable.c"
- goto __catch60_g_regex_error;
+#line 1805 "CameraTable.c"
+ goto __catch66_g_regex_error;
}
#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1811,7 +1812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1813 "CameraTable.c"
+#line 1814 "CameraTable.c"
}
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = regex;
@@ -1827,8 +1828,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1829 "CameraTable.c"
- goto __catch60_g_regex_error;
+#line 1830 "CameraTable.c"
+ goto __catch66_g_regex_error;
}
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
@@ -1838,7 +1839,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1840 "CameraTable.c"
+#line 1841 "CameraTable.c"
}
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = _tmp11_;
@@ -1852,10 +1853,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1854 "CameraTable.c"
+#line 1855 "CameraTable.c"
}
- goto __finally60;
- __catch60_g_regex_error:
+ goto __finally66;
+ __catch66_g_regex_error:
{
GError* e = NULL;
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1866,9 +1867,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_assert_not_reached ();
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 1868 "CameraTable.c"
+#line 1869 "CameraTable.c"
}
- __finally60:
+ __finally66:
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1877,7 +1878,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1879 "CameraTable.c"
+#line 1880 "CameraTable.c"
}
}
@@ -1895,7 +1896,7 @@ gchar* camera_table_get_port_path (const gchar* port) {
_tmp2_ = g_str_has_prefix (_tmp1_, "usb:");
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp2_) {
-#line 1897 "CameraTable.c"
+#line 1898 "CameraTable.c"
const gchar* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
@@ -1922,19 +1923,19 @@ gchar* camera_table_get_port_path (const gchar* port) {
_g_free0 (_tmp7_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp5_);
-#line 1924 "CameraTable.c"
+#line 1925 "CameraTable.c"
} else {
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp0_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = NULL;
-#line 1930 "CameraTable.c"
+#line 1931 "CameraTable.c"
}
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp0_;
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1936 "CameraTable.c"
+#line 1937 "CameraTable.c"
}
@@ -1950,7 +1951,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
_tmp0_ = self->priv->volume_monitor;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1952 "CameraTable.c"
+#line 1953 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1958,14 +1959,14 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
volume_collection = _tmp1_;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1960 "CameraTable.c"
+#line 1961 "CameraTable.c"
GVolume* _tmp2_;
GVolume* volume = NULL;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 1967 "CameraTable.c"
+#line 1968 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
@@ -1986,7 +1987,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
_g_free0 (_tmp5_);
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp7_) {
-#line 1988 "CameraTable.c"
+#line 1989 "CameraTable.c"
GVolume* _tmp8_;
gchar* _tmp9_;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2001,22 +2002,22 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
__g_list_free__g_object_unref0_0 (volume_collection);
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2003 "CameraTable.c"
+#line 2004 "CameraTable.c"
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2007 "CameraTable.c"
+#line 2008 "CameraTable.c"
}
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2012 "CameraTable.c"
+#line 2013 "CameraTable.c"
}
#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = NULL;
#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2018 "CameraTable.c"
+#line 2019 "CameraTable.c"
}
@@ -2032,7 +2033,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
_tmp0_ = self->priv->volume_monitor;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 2034 "CameraTable.c"
+#line 2035 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -2040,14 +2041,14 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
volume_collection = _tmp1_;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 2042 "CameraTable.c"
+#line 2043 "CameraTable.c"
GVolume* _tmp2_;
GVolume* volume = NULL;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 2049 "CameraTable.c"
+#line 2050 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
@@ -2068,7 +2069,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
_g_free0 (_tmp5_);
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp7_) {
-#line 2070 "CameraTable.c"
+#line 2071 "CameraTable.c"
GVolume* _tmp8_;
GIcon* _tmp9_;
GIcon* _tmp10_;
@@ -2094,46 +2095,46 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
__g_list_free__g_object_unref0_0 (volume_collection);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2096 "CameraTable.c"
+#line 2097 "CameraTable.c"
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2100 "CameraTable.c"
+#line 2101 "CameraTable.c"
}
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2105 "CameraTable.c"
+#line 2106 "CameraTable.c"
}
#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = NULL;
#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2111 "CameraTable.c"
+#line 2112 "CameraTable.c"
}
static gpointer _discovered_camera_ref0 (gpointer self) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? discovered_camera_ref (self) : NULL;
-#line 2118 "CameraTable.c"
+#line 2119 "CameraTable.c"
}
-static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
+static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2129 "CameraTable.c"
+#line 2130 "CameraTable.c"
}
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[(*length)++] = value;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(*array)[*length] = NULL;
-#line 2135 "CameraTable.c"
+#line 2136 "CameraTable.c"
}
@@ -2185,7 +2186,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2187 "CameraTable.c"
+#line 2188 "CameraTable.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2195,7 +2196,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2197 "CameraTable.c"
+#line 2198 "CameraTable.c"
}
}
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2214,7 +2215,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2216 "CameraTable.c"
+#line 2217 "CameraTable.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2224,7 +2225,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2226 "CameraTable.c"
+#line 2227 "CameraTable.c"
}
}
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2247,7 +2248,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2249 "CameraTable.c"
+#line 2250 "CameraTable.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2259,7 +2260,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2261 "CameraTable.c"
+#line 2262 "CameraTable.c"
}
}
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2286,7 +2287,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2288 "CameraTable.c"
+#line 2289 "CameraTable.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2298,7 +2299,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2300 "CameraTable.c"
+#line 2301 "CameraTable.c"
}
}
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2313,19 +2314,19 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
usb_cameras_length1 = _tmp12_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_usb_cameras_size_ = usb_cameras_length1;
-#line 2315 "CameraTable.c"
+#line 2316 "CameraTable.c"
{
gint ctr = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = 0;
-#line 2320 "CameraTable.c"
+#line 2321 "CameraTable.c"
{
gboolean _tmp14_ = FALSE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = TRUE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2327 "CameraTable.c"
+#line 2328 "CameraTable.c"
gint _tmp16_;
CameraList* _tmp17_;
gint _tmp18_;
@@ -2353,13 +2354,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
const gchar* _tmp46_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!_tmp14_) {
-#line 2355 "CameraTable.c"
+#line 2356 "CameraTable.c"
gint _tmp15_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = ctr;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = _tmp15_ + 1;
-#line 2361 "CameraTable.c"
+#line 2362 "CameraTable.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = FALSE;
@@ -2373,7 +2374,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
if (!(_tmp16_ < _tmp18_)) {
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2375 "CameraTable.c"
+#line 2376 "CameraTable.c"
}
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp19_ = camera_list;
@@ -2407,7 +2408,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2409 "CameraTable.c"
+#line 2410 "CameraTable.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
@@ -2425,7 +2426,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2427 "CameraTable.c"
+#line 2428 "CameraTable.c"
}
}
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2462,7 +2463,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2464 "CameraTable.c"
+#line 2465 "CameraTable.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
@@ -2482,7 +2483,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2484 "CameraTable.c"
+#line 2485 "CameraTable.c"
}
}
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2503,7 +2504,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp35_ = g_str_has_prefix (_tmp34_, "usb:");
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp35_) {
-#line 2505 "CameraTable.c"
+#line 2506 "CameraTable.c"
gchar* full_port = NULL;
CameraList* _tmp36_;
gint _tmp37_;
@@ -2540,7 +2541,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (name);
#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 2542 "CameraTable.c"
+#line 2543 "CameraTable.c"
}
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp42_ = full_port;
@@ -2552,7 +2553,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
port = _tmp43_;
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (full_port);
-#line 2554 "CameraTable.c"
+#line 2555 "CameraTable.c"
}
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp44_ = detected_map;
@@ -2566,7 +2567,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (port);
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 2568 "CameraTable.c"
+#line 2569 "CameraTable.c"
}
}
}
@@ -2578,7 +2579,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
missing_length1 = 0;
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_missing_size_ = missing_length1;
-#line 2580 "CameraTable.c"
+#line 2581 "CameraTable.c"
{
GeeIterator* _camera_it = NULL;
GeeHashMap* _tmp48_;
@@ -2605,7 +2606,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_camera_it = _tmp53_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2607 "CameraTable.c"
+#line 2608 "CameraTable.c"
GeeIterator* _tmp54_;
gboolean _tmp55_;
DiscoveredCamera* camera = NULL;
@@ -2642,7 +2643,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
if (!_tmp55_) {
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2644 "CameraTable.c"
+#line 2645 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp56_ = _camera_it;
@@ -2688,7 +2689,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2690 "CameraTable.c"
+#line 2691 "CameraTable.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2714,7 +2715,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2716 "CameraTable.c"
+#line 2717 "CameraTable.c"
}
}
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2765,7 +2766,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2767 "CameraTable.c"
+#line 2768 "CameraTable.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2793,7 +2794,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2795 "CameraTable.c"
+#line 2796 "CameraTable.c"
}
}
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2804,7 +2805,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp70_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp69_);
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp70_) {
-#line 2806 "CameraTable.c"
+#line 2807 "CameraTable.c"
CameraAbilities _tmp71_;
const gchar* _tmp72_;
const gchar* _tmp73_;
@@ -2826,7 +2827,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_discovered_camera_unref0 (camera);
#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 2828 "CameraTable.c"
+#line 2829 "CameraTable.c"
}
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp74_ = abilities;
@@ -2845,7 +2846,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp79_ = _discovered_camera_ref0 (_tmp78_);
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add67 (&missing, &missing_length1, &_missing_size_, _tmp79_);
+ _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp79_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2854,17 +2855,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
(port_info);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
-#line 2856 "CameraTable.c"
+#line 2857 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_camera_it);
-#line 2860 "CameraTable.c"
+#line 2861 "CameraTable.c"
}
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp80_ = missing;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp80__length1 = missing_length1;
-#line 2866 "CameraTable.c"
+#line 2867 "CameraTable.c"
{
DiscoveredCamera** camera_collection = NULL;
gint camera_collection_length1 = 0;
@@ -2876,14 +2877,14 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
camera_collection_length1 = _tmp80__length1;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (camera_it = 0; camera_it < _tmp80__length1; camera_it = camera_it + 1) {
-#line 2878 "CameraTable.c"
+#line 2879 "CameraTable.c"
DiscoveredCamera* _tmp81_;
DiscoveredCamera* camera = NULL;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera = _tmp81_;
-#line 2885 "CameraTable.c"
+#line 2886 "CameraTable.c"
{
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
@@ -2942,7 +2943,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2944 "CameraTable.c"
+#line 2945 "CameraTable.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2966,7 +2967,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2968 "CameraTable.c"
+#line 2969 "CameraTable.c"
}
}
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3015,7 +3016,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3017 "CameraTable.c"
+#line 3018 "CameraTable.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -3041,7 +3042,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3043 "CameraTable.c"
+#line 3044 "CameraTable.c"
}
}
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3076,7 +3077,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
(port_info);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
-#line 3078 "CameraTable.c"
+#line 3079 "CameraTable.c"
}
}
}
@@ -3106,7 +3107,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_port_it = _tmp105_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 3108 "CameraTable.c"
+#line 3109 "CameraTable.c"
GeeIterator* _tmp106_;
gboolean _tmp107_;
gchar* port = NULL;
@@ -3129,67 +3130,69 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
gchar* _tmp121_;
const gchar* _tmp122_;
const gchar* _tmp142_;
+ gboolean _tmp143_;
+ const gchar* _tmp162_;
gint index = 0;
- GPPortInfoList* _tmp145_;
- const gchar* _tmp146_;
- gint _tmp147_;
- gint _tmp148_;
+ GPPortInfoList* _tmp165_;
+ const gchar* _tmp166_;
+ gint _tmp167_;
+ gint _tmp168_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- GPPortInfoList* _tmp153_;
- gint _tmp154_;
- GPPortInfo _tmp155_ = {0};
- int _tmp156_;
- const gchar* _tmp157_;
- gchar* _tmp158_;
- gchar* _tmp159_;
- const gchar* _tmp160_ = NULL;
- gchar* _tmp161_;
- const gchar* _tmp162_;
- const gchar* _tmp163_;
- CameraAbilitiesList* _tmp164_;
- const gchar* _tmp165_;
- gint _tmp166_;
- gint _tmp167_;
- CameraAbilities camera_abilities = {0};
- CameraAbilitiesList* _tmp172_;
- gint _tmp173_;
- CameraAbilities _tmp174_ = {0};
- int _tmp175_;
- const gchar* _tmp176_;
- gchar* _tmp177_;
+ GPPortInfoList* _tmp173_;
+ gint _tmp174_;
+ GPPortInfo _tmp175_ = {0};
+ int _tmp176_;
+ const gchar* _tmp177_;
gchar* _tmp178_;
+ gchar* _tmp179_;
+ const gchar* _tmp180_ = NULL;
+ gchar* _tmp181_;
+ const gchar* _tmp182_;
+ const gchar* _tmp183_;
+ CameraAbilitiesList* _tmp184_;
+ const gchar* _tmp185_;
+ gint _tmp186_;
+ gint _tmp187_;
+ CameraAbilities camera_abilities = {0};
+ CameraAbilitiesList* _tmp192_;
+ gint _tmp193_;
+ CameraAbilities _tmp194_ = {0};
+ int _tmp195_;
+ const gchar* _tmp196_;
+ gchar* _tmp197_;
+ gchar* _tmp198_;
Camera* gcamera = NULL;
- Camera* _tmp179_ = NULL;
- int _tmp180_;
- const gchar* _tmp181_;
- gchar* _tmp182_;
- gchar* _tmp183_;
- Camera* _tmp184_;
- CameraAbilities _tmp185_;
- int _tmp186_;
- const gchar* _tmp187_;
- gchar* _tmp188_;
- gchar* _tmp189_;
- Camera* _tmp190_;
- GPPortInfo _tmp191_;
- int _tmp192_;
- const gchar* _tmp193_;
- const gchar* _tmp194_;
- gchar* _tmp195_;
- gchar* _tmp196_;
- const gchar* _tmp197_;
- const gchar* _tmp198_;
- DiscoveredCamera* camera = NULL;
- Camera* _tmp199_;
- const gchar* _tmp200_;
+ Camera* _tmp199_ = NULL;
+ int _tmp200_;
const gchar* _tmp201_;
- const gchar* _tmp202_;
- DiscoveredCamera* _tmp203_;
- GeeHashMap* _tmp204_;
- const gchar* _tmp205_;
- DiscoveredCamera* _tmp206_;
- DiscoveredCamera* _tmp207_;
+ gchar* _tmp202_;
+ gchar* _tmp203_;
+ Camera* _tmp204_;
+ CameraAbilities _tmp205_;
+ int _tmp206_;
+ const gchar* _tmp207_;
+ gchar* _tmp208_;
+ gchar* _tmp209_;
+ Camera* _tmp210_;
+ GPPortInfo _tmp211_;
+ int _tmp212_;
+ const gchar* _tmp213_;
+ const gchar* _tmp214_;
+ gchar* _tmp215_;
+ gchar* _tmp216_;
+ const gchar* _tmp217_;
+ const gchar* _tmp218_;
+ DiscoveredCamera* camera = NULL;
+ Camera* _tmp219_;
+ const gchar* _tmp220_;
+ const gchar* _tmp221_;
+ const gchar* _tmp222_;
+ DiscoveredCamera* _tmp223_;
+ GeeHashMap* _tmp224_;
+ const gchar* _tmp225_;
+ DiscoveredCamera* _tmp226_;
+ DiscoveredCamera* _tmp227_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp106_ = _port_it;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3198,7 +3201,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
if (!_tmp107_) {
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 3200 "CameraTable.c"
+#line 3203 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp108_ = _port_it;
@@ -3232,7 +3235,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp117_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_);
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp117_) {
-#line 3234 "CameraTable.c"
+#line 3237 "CameraTable.c"
const gchar* _tmp118_;
const gchar* _tmp119_;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3253,7 +3256,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (port);
#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 3255 "CameraTable.c"
+#line 3258 "CameraTable.c"
}
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp120_ = port;
@@ -3265,7 +3268,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp122_ = path;
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL != _tmp122_) {
-#line 3267 "CameraTable.c"
+#line 3270 "CameraTable.c"
GUdevDevice* device = NULL;
GUdevClient* _tmp123_;
const gchar* _tmp124_;
@@ -3297,7 +3300,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp129_ = serial;
#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL != _tmp129_) {
-#line 3299 "CameraTable.c"
+#line 3302 "CameraTable.c"
const gchar* _tmp130_;
gchar* _tmp131_;
const gchar* _tmp132_;
@@ -3318,13 +3321,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (icon);
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
icon = _tmp133_;
-#line 3320 "CameraTable.c"
+#line 3323 "CameraTable.c"
}
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp134_ = display_name;
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL == _tmp134_) {
-#line 3326 "CameraTable.c"
+#line 3329 "CameraTable.c"
GUdevDevice* _tmp135_;
const gchar* _tmp136_;
gchar* _tmp137_;
@@ -3338,13 +3341,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (display_name);
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = _tmp137_;
-#line 3340 "CameraTable.c"
+#line 3343 "CameraTable.c"
}
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp138_ = display_name;
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (NULL == _tmp138_) {
-#line 3346 "CameraTable.c"
+#line 3349 "CameraTable.c"
GUdevDevice* _tmp139_;
const gchar* _tmp140_;
gchar* _tmp141_;
@@ -3358,770 +3361,946 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (display_name);
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = _tmp141_;
-#line 3360 "CameraTable.c"
+#line 3363 "CameraTable.c"
}
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (serial);
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (device);
-#line 3366 "CameraTable.c"
+#line 3369 "CameraTable.c"
}
-#line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp142_ = display_name;
-#line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL == _tmp142_) {
-#line 3372 "CameraTable.c"
- const gchar* _tmp143_;
- gchar* _tmp144_;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp143_ = name;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp144_ = g_strdup (_tmp143_);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (display_name);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp144_;
-#line 3383 "CameraTable.c"
- }
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp145_ = port_info_list;
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp146_ = port;
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp147_ = gp_port_info_list_lookup_path (_tmp145_, _tmp146_);
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp147_;
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp142_ = port;
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp143_ = g_str_has_prefix (_tmp142_, "disk:");
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_tmp143_) {
+#line 3377 "CameraTable.c"
+ {
+ GMount* mount = NULL;
+ const gchar* _tmp144_;
+ gchar* _tmp145_;
+ gchar* _tmp146_;
+ GFile* _tmp147_;
+ GFile* _tmp148_;
+ GMount* _tmp149_;
+ GMount* _tmp150_;
+ GVolume* volume = NULL;
+ GMount* _tmp151_;
+ GVolume* _tmp152_;
+ const gchar* _tmp153_;
+ GVolume* _tmp154_;
+ gchar* _tmp155_;
+ gchar* _tmp156_;
+ gchar* _tmp157_;
+ GVolume* _tmp158_;
+ GIcon* _tmp159_;
+ GIcon* _tmp160_;
+ gchar* _tmp161_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp144_ = port;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp145_ = string_substring (_tmp144_, (glong) 5, (glong) -1);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp146_ = _tmp145_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp147_ = g_file_new_for_path (_tmp146_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp148_ = _tmp147_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp149_ = g_file_find_enclosing_mount (_tmp148_, NULL, &_inner_error_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp150_ = _tmp149_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_tmp148_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp146_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ mount = _tmp150_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3421 "CameraTable.c"
+ goto __catch67_g_error;
+ }
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp151_ = mount;
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp152_ = g_mount_get_volume (_tmp151_);
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ volume = _tmp152_;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp153_ = name;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp154_ = volume;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp155_ = g_volume_get_name (_tmp154_);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp148_ = index;
+ _tmp156_ = _tmp155_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp148_ < 0) {
-#line 3397 "CameraTable.c"
- gint _tmp149_;
- const gchar* _tmp150_;
- gchar* _tmp151_;
- gchar* _tmp152_;
+ _tmp157_ = g_strdup_printf (_ ("%s (%s)"), _tmp153_, _tmp156_);
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ display_name = _tmp157_;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp156_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp149_ = index;
+ _tmp158_ = volume;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp150_ = port;
+ _tmp159_ = g_volume_get_icon (_tmp158_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp151_ = g_strdup_printf ("lookup port %s", _tmp150_);
+ _tmp160_ = _tmp159_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp152_ = _tmp151_;
+ _tmp161_ = g_icon_to_string (_tmp160_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp149_, _tmp152_, &_inner_error_);
+ _g_free0 (icon);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp152_);
+ icon = _tmp161_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_tmp160_);
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (volume);
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (mount);
+#line 3464 "CameraTable.c"
+ }
+ goto __finally67;
+ __catch67_g_error:
+ {
+ GError* e = NULL;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ e = _inner_error_;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _inner_error_ = NULL;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_error_free0 (e);
+#line 3476 "CameraTable.c"
+ }
+ __finally67:
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3446 "CameraTable.c"
+#line 3511 "CameraTable.c"
} else {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3478 "CameraTable.c"
+#line 3543 "CameraTable.c"
}
}
}
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp153_ = port_info_list;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp154_ = index;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp156_ = gp_port_info_list_get_info (_tmp153_, _tmp154_, &_tmp155_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp162_ = display_name;
+#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (NULL == _tmp162_) {
+#line 3551 "CameraTable.c"
+ const gchar* _tmp163_;
+ gchar* _tmp164_;
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp163_ = name;
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp164_ = g_strdup (_tmp163_);
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ display_name = _tmp164_;
+#line 3562 "CameraTable.c"
+ }
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp165_ = port_info_list;
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp166_ = port;
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp167_ = gp_port_info_list_lookup_path (_tmp165_, _tmp166_);
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ index = _tmp167_;
+#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp168_ = index;
+#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_tmp168_ < 0) {
+#line 3576 "CameraTable.c"
+ gint _tmp169_;
+ const gchar* _tmp170_;
+ gchar* _tmp171_;
+ gchar* _tmp172_;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp169_ = index;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp170_ = port;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp171_ = g_strdup_printf ("lookup port %s", _tmp170_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp172_ = _tmp171_;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, (int) _tmp169_, _tmp172_, &_inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp172_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_inner_error_->domain == GPHOTO_ERROR) {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_propagate_error (error, _inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (path);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (uri);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (icon);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (port);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_port_it);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (detected_map);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_list_unref0 (camera_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_port_info_list_free0 (port_info_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ return;
+#line 3625 "CameraTable.c"
+ } else {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (path);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (uri);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (icon);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (display_name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (port);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (_port_it);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_object_unref0 (detected_map);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_list_unref0 (camera_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _gp_port_info_list_free0 (port_info_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_clear_error (&_inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ return;
+#line 3657 "CameraTable.c"
+ }
+ }
+ }
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp173_ = port_info_list;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp174_ = index;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp176_ = gp_port_info_list_get_info (_tmp173_, _tmp174_, &_tmp175_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp155_;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp157_ = port;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp158_ = g_strdup_printf ("get port info for %s", _tmp157_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp159_ = _tmp158_;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp156_, _tmp159_, &_inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp159_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ port_info = _tmp175_;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp177_ = port;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp178_ = g_strdup_printf ("get port info for %s", _tmp177_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp179_ = _tmp178_;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp176_, _tmp179_, &_inner_error_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp179_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3538 "CameraTable.c"
+#line 3717 "CameraTable.c"
} else {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3574 "CameraTable.c"
+#line 3753 "CameraTable.c"
}
}
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp160_);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ gp_port_info_get_path (port_info, &_tmp180_);
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp161_ = g_strdup (_tmp160_);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp161_;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp162_ = port;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp163_ = tmp_path;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_assert (g_strcmp0 (_tmp162_, _tmp163_) == 0, "port == tmp_path");
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp164_ = self->priv->abilities_list;
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp165_ = name;
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp166_ = gp_abilities_list_lookup_model (_tmp164_, _tmp165_);
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp166_;
-#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp167_ = index;
-#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp167_ < 0) {
-#line 3603 "CameraTable.c"
- gint _tmp168_;
- const gchar* _tmp169_;
- gchar* _tmp170_;
- gchar* _tmp171_;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp168_ = index;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp169_ = name;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp170_ = g_strdup_printf ("lookup camera model %s", _tmp169_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp171_ = _tmp170_;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp168_, _tmp171_, &_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp171_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp181_ = g_strdup (_tmp180_);
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ tmp_path = _tmp181_;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp182_ = port;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp183_ = tmp_path;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _vala_assert (g_strcmp0 (_tmp182_, _tmp183_) == 0, "port == tmp_path");
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp184_ = self->priv->abilities_list;
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp185_ = name;
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp186_ = gp_abilities_list_lookup_model (_tmp184_, _tmp185_);
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ index = _tmp186_;
+#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp187_ = index;
+#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ if (_tmp187_ < 0) {
+#line 3782 "CameraTable.c"
+ gint _tmp188_;
+ const gchar* _tmp189_;
+ gchar* _tmp190_;
+ gchar* _tmp191_;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp188_ = index;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp189_ = name;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp190_ = g_strdup_printf ("lookup camera model %s", _tmp189_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp191_ = _tmp190_;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, (int) _tmp188_, _tmp191_, &_inner_error_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp191_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3656 "CameraTable.c"
+#line 3835 "CameraTable.c"
} else {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3692 "CameraTable.c"
+#line 3871 "CameraTable.c"
}
}
}
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp172_ = self->priv->abilities_list;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp173_ = index;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp175_ = gp_abilities_list_get_abilities (_tmp172_, _tmp173_, &_tmp174_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp192_ = self->priv->abilities_list;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp193_ = index;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp195_ = gp_abilities_list_get_abilities (_tmp192_, _tmp193_, &_tmp194_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_abilities = _tmp174_;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp176_ = name;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp177_ = g_strdup_printf ("lookup camera abilities for %s", _tmp176_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp178_ = _tmp177_;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp175_, _tmp178_, &_inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp178_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_abilities = _tmp194_;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp196_ = name;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp197_ = g_strdup_printf ("lookup camera abilities for %s", _tmp196_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp198_ = _tmp197_;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp195_, _tmp198_, &_inner_error_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp198_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3754 "CameraTable.c"
+#line 3933 "CameraTable.c"
} else {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3792 "CameraTable.c"
+#line 3971 "CameraTable.c"
}
}
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp180_ = gp_camera_new (&_tmp179_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp200_ = gp_camera_new (&_tmp199_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gcamera = _tmp179_;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp181_ = name;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp182_ = g_strdup_printf ("create camera object for %s", _tmp181_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp183_ = _tmp182_;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp180_, _tmp183_, &_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp183_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ gcamera = _tmp199_;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp201_ = name;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp202_ = g_strdup_printf ("create camera object for %s", _tmp201_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp203_ = _tmp202_;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp200_, _tmp203_, &_inner_error_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp203_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3851 "CameraTable.c"
+#line 4030 "CameraTable.c"
} else {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3891 "CameraTable.c"
+#line 4070 "CameraTable.c"
}
}
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp184_ = gcamera;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp185_ = camera_abilities;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp186_ = gp_camera_set_abilities (_tmp184_, _tmp185_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp187_ = name;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp188_ = g_strdup_printf ("set camera abilities for %s", _tmp187_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp189_ = _tmp188_;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp186_, _tmp189_, &_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp189_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp204_ = gcamera;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp205_ = camera_abilities;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp206_ = gp_camera_set_abilities (_tmp204_, _tmp205_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp207_ = name;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp208_ = g_strdup_printf ("set camera abilities for %s", _tmp207_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp209_ = _tmp208_;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp206_, _tmp209_, &_inner_error_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp209_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3950 "CameraTable.c"
+#line 4129 "CameraTable.c"
} else {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3990 "CameraTable.c"
+#line 4169 "CameraTable.c"
}
}
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp190_ = gcamera;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp191_ = port_info;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp192_ = gp_camera_set_port_info (_tmp190_, _tmp191_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp193_ = name;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp194_ = port;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp195_ = g_strdup_printf ("set port info for %s on %s", _tmp193_, _tmp194_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp196_ = _tmp195_;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp192_, _tmp196_, &_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp196_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp210_ = gcamera;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp211_ = port_info;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp212_ = gp_camera_set_port_info (_tmp210_, _tmp211_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp213_ = name;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp214_ = port;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp215_ = g_strdup_printf ("set port info for %s on %s", _tmp213_, _tmp214_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp216_ = _tmp215_;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera_table_do_op (self, _tmp212_, _tmp216_, &_inner_error_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _g_free0 (_tmp216_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4051 "CameraTable.c"
+#line 4230 "CameraTable.c"
} else {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (detected_map);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4091 "CameraTable.c"
+#line 4270 "CameraTable.c"
}
}
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp197_ = name;
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp198_ = port;
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:376: Adding to camera table: %s @ %s", _tmp197_, _tmp198_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp199_ = gcamera;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp200_ = uri;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp201_ = display_name;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp202_ = icon;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp203_ = discovered_camera_new (_tmp199_, _tmp200_, _tmp201_, _tmp202_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp203_;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp204_ = self->priv->camera_map;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp205_ = uri;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp206_ = camera;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp205_, _tmp206_);
-#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp207_ = camera;
-#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp207_);
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp217_ = name;
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp218_ = port;
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp217_, _tmp218_);
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp219_ = gcamera;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp220_ = uri;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp221_ = display_name;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp222_ = icon;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp223_ = discovered_camera_new (_tmp219_, _tmp220_, _tmp221_, _tmp222_);
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ camera = _tmp223_;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp224_ = self->priv->camera_map;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp225_ = uri;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp226_ = camera;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp225_, _tmp226_);
+#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ _tmp227_ = camera;
+#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp227_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4144,11 +4323,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (name);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
-#line 4146 "CameraTable.c"
+#line 4325 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 4150 "CameraTable.c"
+#line 4329 "CameraTable.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4160,7 +4339,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_list_unref0 (camera_list);
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
-#line 4162 "CameraTable.c"
+#line 4341 "CameraTable.c"
}
@@ -4169,104 +4348,104 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
GUdevDevice* _tmp1_;
const gchar* _tmp2_;
OneShotScheduler* _tmp3_;
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (action != NULL);
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_UDEV_IS_DEVICE (device));
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = action;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = device;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = g_udev_device_get_name (_tmp1_);
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:386: udev event: %s on %s", _tmp0_, _tmp2_);
-#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_debug ("CameraTable.vala:396: udev event: %s on %s", _tmp0_, _tmp2_);
+#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = self->priv->camera_update_scheduler;
-#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4189 "CameraTable.c"
+#line 4368 "CameraTable.c"
}
void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
OneShotScheduler* _tmp0_;
-#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_IS_VOLUME (volume));
-#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_update_scheduler;
-#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4203 "CameraTable.c"
+#line 4382 "CameraTable.c"
}
static void camera_table_on_update_cameras (CameraTable* self) {
GError * _inner_error_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4211 "CameraTable.c"
+#line 4390 "CameraTable.c"
{
CameraTable* _tmp0_;
CameraTable* _tmp1_;
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = camera_table_get_instance ();
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = _tmp0_;
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_update_camera_table (_tmp1_, &_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_camera_table_unref0 (_tmp1_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4227 "CameraTable.c"
- goto __catch61_gphoto_error;
+#line 4406 "CameraTable.c"
+ goto __catch68_gphoto_error;
}
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4236 "CameraTable.c"
+#line 4415 "CameraTable.c"
}
}
- goto __finally61;
- __catch61_gphoto_error:
+ goto __finally68;
+ __catch68_gphoto_error:
{
GError* err = NULL;
GError* _tmp2_;
const gchar* _tmp3_;
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_inner_error_ = NULL;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = err;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = _tmp2_->message;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_warning ("CameraTable.vala:401: Error updating camera table: %s", _tmp3_);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ g_warning ("CameraTable.vala:411: Error updating camera table: %s", _tmp3_);
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 4257 "CameraTable.c"
+#line 4436 "CameraTable.c"
}
- __finally61:
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+ __finally68:
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4268 "CameraTable.c"
+#line 4447 "CameraTable.c"
}
}
@@ -4286,26 +4465,26 @@ static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
data1 = closure->data;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
data2 = param_values->data[0].v_pointer;
-#line 4288 "CameraTable.c"
+#line 4467 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
data1 = param_values->data[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
data2 = closure->data;
-#line 4294 "CameraTable.c"
+#line 4473 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
callback = (GMarshalFunc_VOID__DISCOVERED_CAMERA) (marshal_data ? marshal_data : cc->callback);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
callback (data1, value_get_discovered_camera (param_values + 1), data2);
-#line 4300 "CameraTable.c"
+#line 4479 "CameraTable.c"
}
static void value_camera_table_init (GValue* value) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4307 "CameraTable.c"
+#line 4486 "CameraTable.c"
}
@@ -4314,7 +4493,7 @@ static void value_camera_table_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_unref (value->data[0].v_pointer);
-#line 4316 "CameraTable.c"
+#line 4495 "CameraTable.c"
}
}
@@ -4324,11 +4503,11 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
if (src_value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = camera_table_ref (src_value->data[0].v_pointer);
-#line 4326 "CameraTable.c"
+#line 4505 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4330 "CameraTable.c"
+#line 4509 "CameraTable.c"
}
}
@@ -4336,37 +4515,37 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
static gpointer value_camera_table_peek_pointer (const GValue* value) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 4338 "CameraTable.c"
+#line 4517 "CameraTable.c"
}
static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (collect_values[0].v_pointer) {
-#line 4345 "CameraTable.c"
+#line 4524 "CameraTable.c"
CameraTable * object;
object = collect_values[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (object->parent_instance.g_class == NULL) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4352 "CameraTable.c"
+#line 4531 "CameraTable.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4356 "CameraTable.c"
+#line 4535 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = camera_table_ref (object);
-#line 4360 "CameraTable.c"
+#line 4539 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4364 "CameraTable.c"
+#line 4543 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4368 "CameraTable.c"
+#line 4547 "CameraTable.c"
}
@@ -4377,25 +4556,25 @@ static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_colle
if (!object_p) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4379 "CameraTable.c"
+#line 4558 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!value->data[0].v_pointer) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = NULL;
-#line 4385 "CameraTable.c"
+#line 4564 "CameraTable.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = value->data[0].v_pointer;
-#line 4389 "CameraTable.c"
+#line 4568 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4393 "CameraTable.c"
+#line 4572 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4397 "CameraTable.c"
+#line 4576 "CameraTable.c"
}
@@ -4409,7 +4588,7 @@ GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return G_PARAM_SPEC (spec);
-#line 4411 "CameraTable.c"
+#line 4590 "CameraTable.c"
}
@@ -4418,7 +4597,7 @@ gpointer value_get_camera_table (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE), NULL);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 4420 "CameraTable.c"
+#line 4599 "CameraTable.c"
}
@@ -4438,17 +4617,17 @@ void value_set_camera_table (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_ref (value->data[0].v_pointer);
-#line 4440 "CameraTable.c"
+#line 4619 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4444 "CameraTable.c"
+#line 4623 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_unref (old);
-#line 4450 "CameraTable.c"
+#line 4629 "CameraTable.c"
}
}
@@ -4467,17 +4646,17 @@ void value_take_camera_table (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = v_object;
-#line 4469 "CameraTable.c"
+#line 4648 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4473 "CameraTable.c"
+#line 4652 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_unref (old);
-#line 4479 "CameraTable.c"
+#line 4658 "CameraTable.c"
}
}
@@ -4493,7 +4672,7 @@ static void camera_table_class_init (CameraTableClass * klass) {
camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
-#line 4495 "CameraTable.c"
+#line 4674 "CameraTable.c"
}
@@ -4519,7 +4698,7 @@ static void camera_table_instance_init (CameraTable * self) {
self->priv->camera_map = _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 4521 "CameraTable.c"
+#line 4700 "CameraTable.c"
}
@@ -4541,7 +4720,7 @@ static void camera_table_finalize (CameraTable * obj) {
_g_object_unref0 (self->priv->volume_monitor);
#line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (self->priv->camera_map);
-#line 4543 "CameraTable.c"
+#line 4722 "CameraTable.c"
}
@@ -4566,7 +4745,7 @@ gpointer camera_table_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 4568 "CameraTable.c"
+#line 4747 "CameraTable.c"
}
@@ -4579,7 +4758,7 @@ void camera_table_unref (gpointer instance) {
CAMERA_TABLE_GET_CLASS (self)->finalize (self);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4581 "CameraTable.c"
+#line 4760 "CameraTable.c"
}
}
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));
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index 6deedf6..b1865ed 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -19,10 +19,10 @@
#include <gphoto2/gphoto2-filesys.h>
#include <gphoto2/gphoto2-result.h>
#include <gphoto2/gphoto2-port-result.h>
+#include <gphoto2/gphoto2-file.h>
#include <gphoto2/gphoto2-port-info-list.h>
#include <gio/gio.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gphoto2/gphoto2-file.h>
#include <fcntl.h>
#include <sys/types.h>
#include <errno.h>
@@ -75,6 +75,7 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
#define _g_free0(var) (var = (g_free (var), NULL))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
+#define _g_bytes_unref0(var) ((var == NULL) ? NULL : (var = (g_bytes_unref (var), NULL)))
#define TYPE_PHOTO_PREVIEW (photo_preview_get_type ())
#define PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_PREVIEW, PhotoPreview))
@@ -182,6 +183,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
#define GP_MAX_FILENAME_LENGTH 63
#define GP_MAX_BASEDIR_LENGTH 255
gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error);
+GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file);
gpointer media_metadata_ref (gpointer instance);
void media_metadata_unref (gpointer instance);
GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -194,8 +196,8 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
PhotoMetadata* photo_metadata_new (void);
PhotoMetadata* photo_metadata_construct (GType object_type);
void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error);
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, guint8** raw, int* raw_length1, gsize* raw_length, GError** error);
-guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, int* result_length1, GError** error);
+GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error);
+GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error);
guint photo_metadata_get_preview_count (PhotoMetadata* self);
gpointer photo_preview_ref (gpointer instance);
void photo_preview_unref (gpointer instance);
@@ -205,17 +207,13 @@ void value_take_photo_preview (GValue* value, gpointer v_object);
gpointer value_get_photo_preview (const GValue* value);
GType photo_preview_get_type (void) G_GNUC_CONST;
PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
-guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-static guint8* _vala_array_dup23 (guint8* self, int length);
+GBytes* photo_preview_flatten (PhotoPreview* self, GError** error);
#define IMPORT_PREVIEW_MAX_SCALE 128
GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error);
void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error);
PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
-void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error);
-static guint8* _vala_array_dup24 (guint8* self, int length);
-void gp_on_mins_destroyed (void* data);
-static void _gp_on_mins_destroyed_gdestroy_notify (void* data);
+void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error);
GFile* app_dirs_get_temp_dir (void);
@@ -227,28 +225,28 @@ GQuark gphoto_error_quark (void) {
static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) {
#line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_idle ((GPContextWrapper*) self, context);
-#line 231 "GPhoto.c"
+#line 229 "GPhoto.c"
}
static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) {
#line 19 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_error ((GPContextWrapper*) self, context, text);
-#line 238 "GPhoto.c"
+#line 236 "GPhoto.c"
}
static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) {
#line 20 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_status ((GPContextWrapper*) self, context, text);
-#line 245 "GPhoto.c"
+#line 243 "GPhoto.c"
}
static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) {
#line 21 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_message ((GPContextWrapper*) self, context, text);
-#line 252 "GPhoto.c"
+#line 250 "GPhoto.c"
}
@@ -257,21 +255,21 @@ static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_fun
result = gp_context_wrapper_on_progress_start ((GPContextWrapper*) self, context, target, text);
#line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 261 "GPhoto.c"
+#line 259 "GPhoto.c"
}
static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) {
#line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_progress_update ((GPContextWrapper*) self, context, id, current);
-#line 268 "GPhoto.c"
+#line 266 "GPhoto.c"
}
static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) {
#line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_progress_stop ((GPContextWrapper*) self, context, id);
-#line 275 "GPhoto.c"
+#line 273 "GPhoto.c"
}
@@ -306,14 +304,14 @@ GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
gp_context_set_progress_funcs (_tmp4_, _gp_context_wrapper_on_progress_start_gp_context_progress_start_func, _gp_context_wrapper_on_progress_update_gp_context_progress_update_func, _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func, self);
#line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return self;
-#line 310 "GPhoto.c"
+#line 308 "GPhoto.c"
}
GPContextWrapper* gp_context_wrapper_new (void) {
#line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return gp_context_wrapper_construct (GP_TYPE_CONTEXT_WRAPPER);
-#line 317 "GPhoto.c"
+#line 315 "GPhoto.c"
}
@@ -326,14 +324,14 @@ void gp_context_wrapper_idle (GPContextWrapper* self) {
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->idle (self);
-#line 330 "GPhoto.c"
+#line 328 "GPhoto.c"
}
static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) {
#line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 337 "GPhoto.c"
+#line 335 "GPhoto.c"
}
@@ -342,14 +340,14 @@ void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void*
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->error (self, text, data);
-#line 346 "GPhoto.c"
+#line 344 "GPhoto.c"
}
static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) {
#line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 353 "GPhoto.c"
+#line 351 "GPhoto.c"
}
@@ -358,14 +356,14 @@ void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void*
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->status (self, text, data);
-#line 362 "GPhoto.c"
+#line 360 "GPhoto.c"
}
static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) {
#line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 369 "GPhoto.c"
+#line 367 "GPhoto.c"
}
@@ -374,14 +372,14 @@ void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->message (self, text, data);
-#line 378 "GPhoto.c"
+#line 376 "GPhoto.c"
}
static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
#line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 385 "GPhoto.c"
+#line 383 "GPhoto.c"
}
@@ -390,7 +388,7 @@ void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current,
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_start (self, current, text, data);
-#line 394 "GPhoto.c"
+#line 392 "GPhoto.c"
}
@@ -403,7 +401,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_update (self, current, data);
-#line 407 "GPhoto.c"
+#line 405 "GPhoto.c"
}
@@ -416,7 +414,7 @@ void gp_context_wrapper_progress_stop (GPContextWrapper* self) {
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_stop (self);
-#line 420 "GPhoto.c"
+#line 418 "GPhoto.c"
}
@@ -427,7 +425,7 @@ static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* conte
g_return_if_fail (context != NULL);
#line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_idle (self);
-#line 431 "GPhoto.c"
+#line 429 "GPhoto.c"
}
@@ -443,7 +441,7 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont
_tmp0_ = text;
#line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_error (self, _tmp0_, NULL);
-#line 447 "GPhoto.c"
+#line 445 "GPhoto.c"
}
@@ -459,7 +457,7 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con
_tmp0_ = text;
#line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_status (self, _tmp0_, NULL);
-#line 463 "GPhoto.c"
+#line 461 "GPhoto.c"
}
@@ -475,7 +473,7 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co
_tmp0_ = text;
#line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_message (self, _tmp0_, NULL);
-#line 479 "GPhoto.c"
+#line 477 "GPhoto.c"
}
@@ -499,7 +497,7 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon
result = (guint) 0;
#line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 503 "GPhoto.c"
+#line 501 "GPhoto.c"
}
@@ -513,7 +511,7 @@ static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPCon
_tmp0_ = current;
#line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_progress_update (self, _tmp0_, NULL);
-#line 517 "GPhoto.c"
+#line 515 "GPhoto.c"
}
@@ -524,14 +522,14 @@ static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPConte
g_return_if_fail (context != NULL);
#line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_progress_stop (self);
-#line 528 "GPhoto.c"
+#line 526 "GPhoto.c"
}
static void gp_value_context_wrapper_init (GValue* value) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 535 "GPhoto.c"
+#line 533 "GPhoto.c"
}
@@ -540,7 +538,7 @@ static void gp_value_context_wrapper_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_unref (value->data[0].v_pointer);
-#line 544 "GPhoto.c"
+#line 542 "GPhoto.c"
}
}
@@ -550,11 +548,11 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
if (src_value->data[0].v_pointer) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
dest_value->data[0].v_pointer = gp_context_wrapper_ref (src_value->data[0].v_pointer);
-#line 554 "GPhoto.c"
+#line 552 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
dest_value->data[0].v_pointer = NULL;
-#line 558 "GPhoto.c"
+#line 556 "GPhoto.c"
}
}
@@ -562,37 +560,37 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return value->data[0].v_pointer;
-#line 566 "GPhoto.c"
+#line 564 "GPhoto.c"
}
static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (collect_values[0].v_pointer) {
-#line 573 "GPhoto.c"
+#line 571 "GPhoto.c"
GPContextWrapper * object;
object = collect_values[0].v_pointer;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (object->parent_instance.g_class == NULL) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 580 "GPhoto.c"
+#line 578 "GPhoto.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 584 "GPhoto.c"
+#line 582 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 588 "GPhoto.c"
+#line 586 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 592 "GPhoto.c"
+#line 590 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 596 "GPhoto.c"
+#line 594 "GPhoto.c"
}
@@ -603,25 +601,25 @@ static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n
if (!object_p) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 607 "GPhoto.c"
+#line 605 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (!value->data[0].v_pointer) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*object_p = NULL;
-#line 613 "GPhoto.c"
+#line 611 "GPhoto.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*object_p = value->data[0].v_pointer;
-#line 617 "GPhoto.c"
+#line 615 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*object_p = gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 621 "GPhoto.c"
+#line 619 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 625 "GPhoto.c"
+#line 623 "GPhoto.c"
}
@@ -635,7 +633,7 @@ GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return G_PARAM_SPEC (spec);
-#line 639 "GPhoto.c"
+#line 637 "GPhoto.c"
}
@@ -644,7 +642,7 @@ gpointer gp_value_get_context_wrapper (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER), NULL);
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return value->data[0].v_pointer;
-#line 648 "GPhoto.c"
+#line 646 "GPhoto.c"
}
@@ -664,17 +662,17 @@ void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 668 "GPhoto.c"
+#line 666 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 672 "GPhoto.c"
+#line 670 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (old) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_unref (old);
-#line 678 "GPhoto.c"
+#line 676 "GPhoto.c"
}
}
@@ -693,17 +691,17 @@ void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = v_object;
-#line 697 "GPhoto.c"
+#line 695 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 701 "GPhoto.c"
+#line 699 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (old) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_unref (old);
-#line 707 "GPhoto.c"
+#line 705 "GPhoto.c"
}
}
@@ -727,7 +725,7 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_context_wrapper_real_progress_update;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
((GPContextWrapperClass *) klass)->progress_stop = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_progress_stop;
-#line 731 "GPhoto.c"
+#line 729 "GPhoto.c"
}
@@ -739,7 +737,7 @@ static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
self->context = _tmp0_;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self->ref_count = 1;
-#line 743 "GPhoto.c"
+#line 741 "GPhoto.c"
}
@@ -751,7 +749,7 @@ static void gp_context_wrapper_finalize (GPContextWrapper * obj) {
g_signal_handlers_destroy (self);
#line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_context_unref0 (self->context);
-#line 755 "GPhoto.c"
+#line 753 "GPhoto.c"
}
@@ -776,7 +774,7 @@ gpointer gp_context_wrapper_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return instance;
-#line 780 "GPhoto.c"
+#line 778 "GPhoto.c"
}
@@ -789,7 +787,7 @@ void gp_context_wrapper_unref (gpointer instance) {
GP_CONTEXT_WRAPPER_GET_CLASS (self)->finalize (self);
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 793 "GPhoto.c"
+#line 791 "GPhoto.c"
}
}
@@ -800,14 +798,14 @@ GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) {
self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type);
#line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return self;
-#line 804 "GPhoto.c"
+#line 802 "GPhoto.c"
}
GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) {
#line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return gp_spin_idle_wrapper_construct (GP_TYPE_SPIN_IDLE_WRAPPER);
-#line 811 "GPhoto.c"
+#line 809 "GPhoto.c"
}
@@ -819,7 +817,7 @@ static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) {
GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->idle (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper));
#line 85 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
spin_event_loop ();
-#line 823 "GPhoto.c"
+#line 821 "GPhoto.c"
}
@@ -837,7 +835,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), _tmp0_, _tmp1_);
#line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
spin_event_loop ();
-#line 841 "GPhoto.c"
+#line 839 "GPhoto.c"
}
@@ -848,7 +846,7 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
((GPContextWrapperClass *) klass)->idle = (void (*) (GPContextWrapper *)) gp_spin_idle_wrapper_real_idle;
#line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
-#line 852 "GPhoto.c"
+#line 850 "GPhoto.c"
}
@@ -902,7 +900,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) {
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = TRUE;
-#line 906 "GPhoto.c"
+#line 904 "GPhoto.c"
} else {
const gchar* _tmp4_;
gint _tmp5_;
@@ -915,11 +913,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
_tmp6_ = _tmp5_;
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH;
-#line 919 "GPhoto.c"
+#line 917 "GPhoto.c"
}
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp0_) {
-#line 923 "GPhoto.c"
+#line 921 "GPhoto.c"
CameraFileInfo _tmp7_ = {0};
#line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
@@ -931,15 +929,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
if (info) {
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*info = _vala_info;
-#line 935 "GPhoto.c"
+#line 933 "GPhoto.c"
} else {
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
-#line 939 "GPhoto.c"
+#line 937 "GPhoto.c"
}
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 943 "GPhoto.c"
+#line 941 "GPhoto.c"
}
#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = camera;
@@ -961,7 +959,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
_tmp14_ = res;
#line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp14_ != GP_OK) {
-#line 965 "GPhoto.c"
+#line 963 "GPhoto.c"
int _tmp15_;
const gchar* _tmp16_;
const gchar* _tmp17_;
@@ -987,7 +985,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
g_propagate_error (error, _inner_error_);
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return _tmp21_;
-#line 991 "GPhoto.c"
+#line 989 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = TRUE;
@@ -995,15 +993,99 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
if (info) {
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*info = _vala_info;
-#line 999 "GPhoto.c"
+#line 997 "GPhoto.c"
} else {
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
-#line 1003 "GPhoto.c"
+#line 1001 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1007 "GPhoto.c"
+#line 1005 "GPhoto.c"
+}
+
+
+static gpointer _GPHOTO_REF_FILE0 (gpointer self) {
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ return self ? GPHOTO_REF_FILE (self) : NULL;
+#line 1012 "GPhoto.c"
+}
+
+
+GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file) {
+ GBytes* result = NULL;
+ guint8* data = NULL;
+ gulong data_len = 0UL;
+ int res = 0;
+ CameraFile* _tmp0_;
+ guint8* _tmp1_ = NULL;
+ gulong _tmp2_ = 0UL;
+ int _tmp3_;
+ int _tmp4_;
+ guint8* buffer = NULL;
+ guint8* _tmp5_;
+ gint buffer_length1;
+ gint _buffer_size_;
+ gulong _tmp6_;
+ gint _tmp7_;
+ guint8* _tmp8_;
+ gint _tmp8__length1;
+ CameraFile* _tmp9_;
+ CameraFile* _tmp10_;
+ GBytes* _tmp11_;
+#line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ g_return_val_if_fail (context != NULL, NULL);
+#line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ g_return_val_if_fail (file != NULL, NULL);
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp0_ = file;
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp3_ = gp_file_get_data_and_size (_tmp0_, &_tmp1_, &_tmp2_);
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ data = _tmp1_;
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ data_len = _tmp2_;
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ res = _tmp3_;
+#line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp4_ = res;
+#line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (_tmp4_ != GP_OK) {
+#line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ result = NULL;
+#line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ return result;
+#line 1059 "GPhoto.c"
+ }
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp5_ = data;
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ buffer = (guint8*) _tmp5_;
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ buffer_length1 = sizeof (guint8) / sizeof (guint8);
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _buffer_size_ = buffer_length1;
+#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp6_ = data_len;
+#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ buffer_length1 = (gint) _tmp6_;
+#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp7_ = buffer_length1;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp8_ = buffer;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp8__length1 = buffer_length1;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp9_ = file;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp10_ = _GPHOTO_REF_FILE0 (_tmp9_);
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp11_ = g_bytes_new_with_free_func (_tmp8_, (gsize) _tmp8__length1, gp_file_unref, _tmp10_);
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ result = _tmp11_;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ return result;
+#line 1089 "GPhoto.c"
}
@@ -1036,7 +1118,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp2_ = start;
#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
-#line 1040 "GPhoto.c"
+#line 1122 "GPhoto.c"
glong _tmp3_;
glong _tmp4_;
#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1045,13 +1127,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp4_ = start;
#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
-#line 1049 "GPhoto.c"
+#line 1131 "GPhoto.c"
}
#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
-#line 1055 "GPhoto.c"
+#line 1137 "GPhoto.c"
glong _tmp6_;
glong _tmp7_;
#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1060,13 +1142,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp7_ = end;
#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
-#line 1064 "GPhoto.c"
+#line 1146 "GPhoto.c"
}
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = start;
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
-#line 1070 "GPhoto.c"
+#line 1152 "GPhoto.c"
glong _tmp10_;
glong _tmp11_;
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1075,11 +1157,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp11_ = string_length;
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1079 "GPhoto.c"
+#line 1161 "GPhoto.c"
} else {
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
-#line 1083 "GPhoto.c"
+#line 1165 "GPhoto.c"
}
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
@@ -1087,7 +1169,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp13_ = end;
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
-#line 1091 "GPhoto.c"
+#line 1173 "GPhoto.c"
glong _tmp14_;
glong _tmp15_;
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1096,11 +1178,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp15_ = string_length;
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1100 "GPhoto.c"
+#line 1182 "GPhoto.c"
} else {
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 1104 "GPhoto.c"
+#line 1186 "GPhoto.c"
}
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
@@ -1122,7 +1204,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
result = _tmp21_;
#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1126 "GPhoto.c"
+#line 1208 "GPhoto.c"
}
@@ -1146,53 +1228,53 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
PhotoMetadata* metadata = NULL;
PhotoMetadata* _tmp17_;
GError * _inner_error_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 122 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
sifs = NULL;
-#line 123 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
count = 0;
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = camera;
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = context;
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp2_, _tmp1_);
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
count = _tmp2_;
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = camera;
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_camera_get_port_info (_tmp3_, &_tmp4_);
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(port_info);
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
port_info = _tmp4_;
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_port_info_get_path (port_info, &_tmp5_);
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (path);
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = g_strdup (_tmp5_);
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
path = _tmp6_;
-#line 132 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = g_strdup ("disk:");
-#line 132 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
prefix = _tmp7_;
-#line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = path;
-#line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = g_str_has_prefix (_tmp8_, prefix);
-#line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp9_) {
-#line 1196 "GPhoto.c"
+#line 1278 "GPhoto.c"
const gchar* _tmp10_;
gint _tmp11_;
gint _tmp12_;
@@ -1200,43 +1282,43 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
gint _tmp14_;
gint _tmp15_;
gchar* _tmp16_;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = path;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = strlen (prefix);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = _tmp11_;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = path;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = strlen (_tmp13_);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = _tmp14_;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = string_slice (_tmp10_, (glong) _tmp12_, (glong) _tmp15_);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (path);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
path = _tmp16_;
-#line 1222 "GPhoto.c"
+#line 1304 "GPhoto.c"
} else {
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (prefix);
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (path);
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(port_info);
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1234 "GPhoto.c"
+#line 1316 "GPhoto.c"
}
-#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = photo_metadata_new ();
-#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
metadata = _tmp17_;
-#line 1240 "GPhoto.c"
+#line 1322 "GPhoto.c"
{
PhotoMetadata* _tmp18_;
const gchar* _tmp19_;
@@ -1250,463 +1332,394 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
gchar* _tmp27_;
GFile* _tmp28_;
GFile* _tmp29_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = metadata;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp19_ = path;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp20_ = folder;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp21_ = g_strconcat (_tmp19_, _tmp20_, NULL);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp22_ = _tmp21_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp23_ = g_strconcat (_tmp22_, "/", NULL);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp24_ = _tmp23_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp25_ = filename;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26_ = g_strconcat (_tmp24_, _tmp25_, NULL);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp27_ = _tmp26_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp28_ = g_file_new_for_path (_tmp27_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29_ = _tmp28_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp29_, &_inner_error_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (_tmp29_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp27_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp24_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp22_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1290 "GPhoto.c"
- goto __catch62_g_error;
+#line 1372 "GPhoto.c"
+ goto __catch69_g_error;
}
}
- goto __finally62;
- __catch62_g_error:
+ goto __finally69;
+ __catch69_g_error:
{
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
metadata = NULL;
-#line 1305 "GPhoto.c"
+#line 1387 "GPhoto.c"
}
- __finally62:
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ __finally69:
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (prefix);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (path);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(port_info);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1324 "GPhoto.c"
+#line 1406 "GPhoto.c"
}
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (prefix);
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (path);
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(port_info);
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1336 "GPhoto.c"
+#line 1418 "GPhoto.c"
}
-static guint8* _vala_array_dup23 (guint8* self, int length) {
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return g_memdup (self, length * sizeof (guint8));
-#line 1343 "GPhoto.c"
+static gpointer _g_bytes_ref0 (gpointer self) {
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ return self ? g_bytes_ref (self) : NULL;
+#line 1425 "GPhoto.c"
}
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, guint8** raw, int* raw_length1, gsize* raw_length, GError** error) {
- guint8* _vala_raw = NULL;
- int _vala_raw_length1 = 0;
- gsize _vala_raw_length = 0UL;
+GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error) {
+ gchar* _vala_preview_md5 = NULL;
GdkPixbuf* result = NULL;
- guint8* _tmp25_;
- gint _tmp25__length1;
- guint8* _tmp26_;
- gint _tmp26__length1;
+ GBytes* raw = NULL;
+ GBytes* out_bytes = NULL;
+ GBytes* _tmp25_;
+ GBytes* _tmp26_;
+ GBytes* _tmp27_;
+ gchar* _tmp28_;
GMemoryInputStream* mins = NULL;
- guint8* _tmp27_;
- gint _tmp27__length1;
- guint8* _tmp28_;
- gint _tmp28__length1;
- GMemoryInputStream* _tmp29_;
- GdkPixbuf* _tmp30_ = NULL;
- GMemoryInputStream* _tmp31_;
- GdkPixbuf* _tmp32_;
+ GBytes* _tmp29_;
+ GMemoryInputStream* _tmp30_;
+ GdkPixbuf* _tmp31_ = NULL;
+ GMemoryInputStream* _tmp32_;
GdkPixbuf* _tmp33_;
+ GdkPixbuf* _tmp34_;
GError * _inner_error_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = (g_free (_vala_raw), NULL);
-#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = NULL;
-#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw_length1 = 0;
-#line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw_length = (gsize) 0;
-#line 1383 "GPhoto.c"
+#line 166 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ raw = NULL;
+#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ out_bytes = NULL;
+#line 168 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_vala_preview_md5);
+#line 168 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _vala_preview_md5 = NULL;
+#line 1462 "GPhoto.c"
{
- guint8* _tmp0_ = NULL;
+ GBytes* _tmp0_ = NULL;
GPContext* _tmp1_;
Camera* _tmp2_;
const gchar* _tmp3_;
const gchar* _tmp4_;
- gint _tmp5_;
- guint8* _tmp6_;
- gint _tmp0__length1;
- gint __tmp0__size_;
- guint8* _tmp7_;
- gint _tmp7__length1;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ GBytes* _tmp5_;
+ GBytes* _tmp6_;
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = context;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = camera;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = folder;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = filename;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_PREVIEW, &_tmp5_, &_inner_error_);
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = _tmp6_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0__length1 = _tmp5_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- __tmp0__size_ = _tmp0__length1;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_PREVIEW, &_inner_error_);
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp0_ = _tmp5_;
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1414 "GPhoto.c"
- goto __catch63_g_error;
+#line 1485 "GPhoto.c"
+ goto __catch70_g_error;
}
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = _tmp0_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7__length1 = _tmp0__length1;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp6_ = _tmp0_;
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = NULL;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0__length1 = 0;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = (g_free (_vala_raw), NULL);
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = _tmp7_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw_length1 = _tmp7__length1;
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = (g_free (_tmp0_), NULL);
-#line 1433 "GPhoto.c"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (raw);
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ raw = _tmp6_;
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (_tmp0_);
+#line 1498 "GPhoto.c"
}
- goto __finally63;
- __catch63_g_error:
+ goto __finally70;
+ __catch70_g_error:
{
PhotoMetadata* metadata = NULL;
- Camera* _tmp8_;
- GPContext* _tmp9_;
+ Camera* _tmp7_;
+ GPContext* _tmp8_;
+ const gchar* _tmp9_;
const gchar* _tmp10_;
- const gchar* _tmp11_;
+ PhotoMetadata* _tmp11_;
PhotoMetadata* _tmp12_;
PhotoMetadata* _tmp13_;
- PhotoMetadata* _tmp14_;
- guint _tmp15_;
+ guint _tmp14_;
PhotoPreview* preview = NULL;
+ PhotoMetadata* _tmp15_;
PhotoMetadata* _tmp16_;
- PhotoMetadata* _tmp17_;
- guint _tmp18_;
- PhotoPreview* _tmp19_;
- guint8* _tmp20_ = NULL;
- PhotoPreview* _tmp21_;
- gint _tmp22_;
- guint8* _tmp23_;
- gint _tmp20__length1;
- gint __tmp20__size_;
- guint8* _tmp24_;
- gint _tmp24__length1;
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ guint _tmp17_;
+ PhotoPreview* _tmp18_;
+ GBytes* _tmp19_ = NULL;
+ PhotoPreview* _tmp20_;
+ GBytes* _tmp21_;
+ GBytes* _tmp22_;
+ GBytes* _tmp23_;
+ gchar* _tmp24_;
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = camera;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = context;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = folder;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = filename;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- metadata = _tmp12_;
-#line 157 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = metadata;
-#line 157 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (NULL == _tmp13_) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp7_ = camera;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp8_ = context;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp9_ = folder;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp10_ = filename;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ metadata = _tmp11_;
+#line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp12_ = metadata;
+#line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (NULL == _tmp12_) {
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw = _vala_raw;
-#line 1488 "GPhoto.c"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (out_bytes);
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (raw);
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (preview_md5) {
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ *preview_md5 = _vala_preview_md5;
+#line 1555 "GPhoto.c"
} else {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = (g_free (_vala_raw), NULL);
-#line 1492 "GPhoto.c"
- }
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length1) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length1 = _vala_raw_length1;
-#line 1498 "GPhoto.c"
- }
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length = _vala_raw_length;
-#line 1504 "GPhoto.c"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_vala_preview_md5);
+#line 1559 "GPhoto.c"
}
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1508 "GPhoto.c"
+#line 1563 "GPhoto.c"
}
-#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = metadata;
-#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = photo_metadata_get_preview_count (_tmp14_);
-#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (((guint) 0) == _tmp15_) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp13_ = metadata;
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp14_ = photo_metadata_get_preview_count (_tmp13_);
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (((guint) 0) == _tmp14_) {
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw = _vala_raw;
-#line 1524 "GPhoto.c"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (out_bytes);
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (raw);
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (preview_md5) {
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ *preview_md5 = _vala_preview_md5;
+#line 1583 "GPhoto.c"
} else {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = (g_free (_vala_raw), NULL);
-#line 1528 "GPhoto.c"
- }
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length1) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length1 = _vala_raw_length1;
-#line 1534 "GPhoto.c"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_vala_preview_md5);
+#line 1587 "GPhoto.c"
}
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length = _vala_raw_length;
-#line 1540 "GPhoto.c"
- }
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1544 "GPhoto.c"
+#line 1591 "GPhoto.c"
}
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp15_ = metadata;
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = metadata;
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = metadata;
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = photo_metadata_get_preview_count (_tmp17_);
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = photo_metadata_get_preview (_tmp16_, _tmp18_ - 1);
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- preview = _tmp19_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = preview;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = photo_preview_flatten (_tmp21_, &_tmp22_, &_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = _tmp23_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20__length1 = _tmp22_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- __tmp20__size_ = _tmp20__length1;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp17_ = photo_metadata_get_preview_count (_tmp16_);
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp18_ = photo_metadata_get_preview (_tmp15_, _tmp17_ - 1);
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ preview = _tmp18_;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp20_ = preview;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp21_ = photo_preview_flatten (_tmp20_, &_inner_error_);
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp19_ = _tmp21_;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_photo_preview_unref0 (preview);
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 1572 "GPhoto.c"
- goto __finally63;
+#line 1615 "GPhoto.c"
+ goto __finally70;
}
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = _tmp20_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24__length1 = _tmp20__length1;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20__length1 = 0;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = (g_free (_vala_raw), NULL);
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = _tmp24_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw_length1 = _tmp24__length1;
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = (g_free (_tmp20_), NULL);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp22_ = _tmp19_;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp19_ = NULL;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (raw);
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ raw = _tmp22_;
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp23_ = raw;
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp24_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp23_);
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_vala_preview_md5);
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _vala_preview_md5 = _tmp24_;
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (_tmp19_);
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_photo_preview_unref0 (preview);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 1595 "GPhoto.c"
+#line 1640 "GPhoto.c"
}
- __finally63:
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ __finally70:
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return NULL;
-#line 1604 "GPhoto.c"
- }
-#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = _vala_raw;
-#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25__length1 = _vala_raw_length1;
-#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp25_ == NULL) {
-#line 166 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw_length = (gsize) 0;
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = NULL;
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw) {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw = _vala_raw;
-#line 1620 "GPhoto.c"
- } else {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = (g_free (_vala_raw), NULL);
-#line 1624 "GPhoto.c"
- }
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length1) {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length1 = _vala_raw_length1;
-#line 1630 "GPhoto.c"
- }
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length) {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length = _vala_raw_length;
-#line 1636 "GPhoto.c"
- }
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return result;
-#line 1640 "GPhoto.c"
- }
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = _vala_raw;
+ _g_bytes_unref0 (out_bytes);
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26__length1 = _vala_raw_length1;
+ _g_bytes_unref0 (raw);
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw_length = (gsize) _tmp26__length1;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = _vala_raw;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27__length1 = _vala_raw_length1;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = (_tmp27_ != NULL) ? _vala_array_dup23 (_tmp27_, _tmp27__length1) : ((gpointer) _tmp27_);
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28__length1 = _tmp27__length1;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp28_, _tmp28__length1, NULL);
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- mins = _tmp29_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = mins;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = _tmp32_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ return NULL;
+#line 1653 "GPhoto.c"
+ }
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp25_ = raw;
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp26_ = _g_bytes_ref0 (_tmp25_);
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (out_bytes);
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ out_bytes = _tmp26_;
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp27_ = out_bytes;
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp28_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp27_);
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_vala_preview_md5);
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _vala_preview_md5 = _tmp28_;
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp29_ = raw;
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp30_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp29_);
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ mins = _tmp30_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp32_ = mins;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp33_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp31_ = _tmp33_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (mins);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (out_bytes);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (raw);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1674 "GPhoto.c"
+#line 1695 "GPhoto.c"
}
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp33_ = _tmp30_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = NULL;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp33_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp30_);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp34_ = _tmp31_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp31_ = NULL;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ result = _tmp34_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_object_unref0 (_tmp31_);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (mins);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw = _vala_raw;
-#line 1690 "GPhoto.c"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (out_bytes);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (raw);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (preview_md5) {
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ *preview_md5 = _vala_preview_md5;
+#line 1715 "GPhoto.c"
} else {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw = (g_free (_vala_raw), NULL);
-#line 1694 "GPhoto.c"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_vala_preview_md5);
+#line 1719 "GPhoto.c"
}
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length1) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length1 = _vala_raw_length1;
-#line 1700 "GPhoto.c"
- }
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (raw_length) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *raw_length = _vala_raw_length;
-#line 1706 "GPhoto.c"
- }
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1710 "GPhoto.c"
+#line 1723 "GPhoto.c"
}
@@ -1724,75 +1737,75 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
GdkPixbuf* _tmp8_;
GdkPixbuf* _tmp9_;
GError * _inner_error_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = context;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = camera;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = folder;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = filename;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = gp_load_file_into_stream (_tmp0_, _tmp1_, _tmp2_, _tmp3_, GP_FILE_TYPE_NORMAL, &_inner_error_);
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
ins = _tmp4_;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1754 "GPhoto.c"
+#line 1767 "GPhoto.c"
}
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = ins;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp5_ == NULL) {
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1766 "GPhoto.c"
+#line 1779 "GPhoto.c"
}
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = ins;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = gdk_pixbuf_new_from_stream (_tmp7_, NULL, &_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = _tmp8_;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1782 "GPhoto.c"
+#line 1795 "GPhoto.c"
}
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = _tmp6_;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = _tmp9_;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (_tmp6_);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1796 "GPhoto.c"
+#line 1809 "GPhoto.c"
}
@@ -1818,351 +1831,327 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
int _tmp25_;
int _tmp26_;
GError * _inner_error_ = NULL;
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (context != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (camera != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (folder != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (filename != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (G_IS_FILE (dest_file));
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = dest_file;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = _tmp1_;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = creat (_tmp2_, (mode_t) 0640);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = _tmp3_;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp2_);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
fd = _tmp4_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = fd;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp5_ < 0) {
-#line 1850 "GPhoto.c"
+#line 1863 "GPhoto.c"
gint _tmp6_;
GFile* _tmp7_;
gchar* _tmp8_;
gchar* _tmp9_;
GError* _tmp10_;
GError* _tmp11_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = errno;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = dest_file;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = g_file_get_path (_tmp7_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = _tmp8_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = _tmp10_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp9_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp11_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1877 "GPhoto.c"
+#line 1890 "GPhoto.c"
}
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = fd;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_file = _tmp13_;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp14_;
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = res;
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp15_ != GP_OK) {
-#line 1893 "GPhoto.c"
+#line 1906 "GPhoto.c"
int _tmp16_;
int _tmp17_;
const gchar* _tmp18_;
GError* _tmp19_;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = res;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = res;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp16_, _tmp18_);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp19_;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1914 "GPhoto.c"
+#line 1927 "GPhoto.c"
}
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp20_ = camera;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp21_ = folder;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp22_ = filename;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp23_ = camera_file;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp24_ = context;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp25_ = gp_camera_file_get (_tmp20_, _tmp21_, _tmp22_, GP_FILE_TYPE_NORMAL, _tmp23_, _tmp24_);
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp25_;
-#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26_ = res;
-#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp26_ != GP_OK) {
-#line 1934 "GPhoto.c"
+#line 1947 "GPhoto.c"
int _tmp27_;
const gchar* _tmp28_;
const gchar* _tmp29_;
int _tmp30_;
const gchar* _tmp31_;
GError* _tmp32_;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp27_ = res;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp28_ = folder;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29_ = filename;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp30_ = res;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp31_ = gp_port_result_as_string (_tmp30_);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp32_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp27_, _tmp28_, _tmp29_, _tmp31_);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp32_;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1961 "GPhoto.c"
+#line 1974 "GPhoto.c"
}
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 1965 "GPhoto.c"
+#line 1978 "GPhoto.c"
+}
+
+
+static gint _vala_g_bytes_get_length (GBytes* self) {
+ gint result;
+ gsize _tmp0_;
+#line 5013 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (self != NULL, 0);
+#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = g_bytes_get_size (self);
+#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = (gint) _tmp0_;
+#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ return result;
+#line 1993 "GPhoto.c"
}
PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
PhotoMetadata* result = NULL;
- guint8* camera_raw = NULL;
- gint camera_raw_length1;
- gint _camera_raw_size_;
- gboolean _tmp13_ = FALSE;
- guint8* _tmp14_;
- gint _tmp14__length1;
+ GBytes* camera_raw = NULL;
+ gboolean _tmp12_ = FALSE;
+ GBytes* _tmp13_;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp16_;
PhotoMetadata* _tmp17_;
- guint8* _tmp18_;
- gint _tmp18__length1;
+ PhotoMetadata* _tmp18_;
+ GBytes* _tmp19_;
GError * _inner_error_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = NULL;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw_length1 = 0;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _camera_raw_size_ = camera_raw_length1;
-#line 1997 "GPhoto.c"
+#line 2017 "GPhoto.c"
{
- guint8* _tmp0_ = NULL;
+ GBytes* _tmp0_ = NULL;
GPContext* _tmp1_;
Camera* _tmp2_;
const gchar* _tmp3_;
const gchar* _tmp4_;
- gint _tmp5_;
- guint8* _tmp6_;
- gint _tmp0__length1;
- gint __tmp0__size_;
- guint8* _tmp7_;
- gint _tmp7__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ GBytes* _tmp5_;
+ GBytes* _tmp6_;
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = context;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = camera;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = folder;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = filename;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_tmp5_, &_inner_error_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = _tmp6_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0__length1 = _tmp5_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- __tmp0__size_ = _tmp0__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_inner_error_);
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp0_ = _tmp5_;
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2028 "GPhoto.c"
- goto __catch64_g_error;
+#line 2040 "GPhoto.c"
+ goto __catch71_g_error;
}
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = _tmp0_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7__length1 = _tmp0__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp6_ = _tmp0_;
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0__length1 = 0;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = (g_free (camera_raw), NULL);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = _tmp7_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw_length1 = _tmp7__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _camera_raw_size_ = camera_raw_length1;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = (g_free (_tmp0_), NULL);
-#line 2049 "GPhoto.c"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (camera_raw);
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ camera_raw = _tmp6_;
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (_tmp0_);
+#line 2053 "GPhoto.c"
}
- goto __finally64;
- __catch64_g_error:
+ goto __finally71;
+ __catch71_g_error:
{
- Camera* _tmp8_;
- GPContext* _tmp9_;
+ Camera* _tmp7_;
+ GPContext* _tmp8_;
+ const gchar* _tmp9_;
const gchar* _tmp10_;
- const gchar* _tmp11_;
- PhotoMetadata* _tmp12_;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ PhotoMetadata* _tmp11_;
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = NULL;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = camera;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = context;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = folder;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = filename;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp12_;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = (g_free (camera_raw), NULL);
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp7_ = camera;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp8_ = context;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp9_ = folder;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp10_ = filename;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_);
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ result = _tmp11_;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (camera_raw);
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2079 "GPhoto.c"
+#line 2083 "GPhoto.c"
}
- __finally64:
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ __finally71:
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = (g_free (camera_raw), NULL);
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (camera_raw);
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2090 "GPhoto.c"
+#line 2094 "GPhoto.c"
}
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = camera_raw;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14__length1 = camera_raw_length1;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp14_ == NULL) {
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = TRUE;
-#line 2100 "GPhoto.c"
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp13_ = camera_raw;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (_tmp13_ == NULL) {
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp12_ = TRUE;
+#line 2102 "GPhoto.c"
} else {
- guint8* _tmp15_;
- gint _tmp15__length1;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = camera_raw;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15__length1 = camera_raw_length1;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = _tmp15__length1 == 0;
-#line 2110 "GPhoto.c"
+ GBytes* _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp14_ = camera_raw;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp15_ = _vala_g_bytes_get_length (_tmp14_);
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp16_ = _tmp15_;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp12_ = _tmp16_ == 0;
+#line 2115 "GPhoto.c"
}
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp13_) {
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (_tmp12_) {
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = (g_free (camera_raw), NULL);
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (camera_raw);
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2120 "GPhoto.c"
+#line 2125 "GPhoto.c"
}
-#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = photo_metadata_new ();
-#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- metadata = _tmp16_;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = metadata;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = camera_raw;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18__length1 = camera_raw_length1;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- photo_metadata_read_from_app1_segment (_tmp17_, _tmp18_, _tmp18__length1, 0, &_inner_error_);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp17_ = photo_metadata_new ();
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ metadata = _tmp17_;
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp18_ = metadata;
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp19_ = camera_raw;
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ photo_metadata_read_from_app1_segment (_tmp18_, _tmp19_, &_inner_error_);
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = (g_free (camera_raw), NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (camera_raw);
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2144 "GPhoto.c"
+#line 2147 "GPhoto.c"
}
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = (g_free (camera_raw), NULL);
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (camera_raw);
+#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2152 "GPhoto.c"
-}
-
-
-static guint8* _vala_array_dup24 (guint8* self, int length) {
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return g_memdup (self, length * sizeof (guint8));
-#line 2159 "GPhoto.c"
-}
-
-
-static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_on_mins_destroyed (data);
-#line 2166 "GPhoto.c"
+#line 2155 "GPhoto.c"
}
@@ -2180,308 +2169,259 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
GPContext* _tmp11_;
int _tmp12_;
int _tmp13_;
- guint8* data = NULL;
- gulong data_len = 0UL;
- guint8* _tmp20_ = NULL;
- gulong _tmp21_ = 0UL;
- int _tmp22_;
- int _tmp23_;
+ GBytes* bytes = NULL;
+ GPContext* _tmp20_;
+ GBytes* _tmp21_;
+ GBytes* _tmp22_;
GFile* temp = NULL;
- GFile* _tmp32_;
- GFile* _tmp33_;
- GFile* _tmp34_;
- GFile* _tmp35_;
- GFile* _tmp36_;
- gchar* _tmp37_;
- gchar* _tmp38_;
- int _tmp39_;
- int _tmp40_;
- GFileInputStream* _tmp51_ = NULL;
- GFile* _tmp52_;
- GFileInputStream* _tmp53_;
- GFileInputStream* _tmp54_;
+ GFile* _tmp25_;
+ GFile* _tmp26_;
+ GFile* _tmp27_;
+ GFile* _tmp28_;
+ GFile* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ int _tmp32_;
+ int _tmp33_;
+ GFileInputStream* _tmp44_ = NULL;
+ GFile* _tmp45_;
+ GFileInputStream* _tmp46_;
+ GFileInputStream* _tmp47_;
GError * _inner_error_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = gp_file_new (&_tmp0_);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_file = _tmp0_;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp1_;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = res;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2225 "GPhoto.c"
+#line 2212 "GPhoto.c"
int _tmp3_;
int _tmp4_;
const gchar* _tmp5_;
GError* _tmp6_;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = res;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = res;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp6_;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2246 "GPhoto.c"
+#line 2233 "GPhoto.c"
}
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = camera;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = folder;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = filename;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = filetype;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = context;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp12_;
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = res;
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp13_ != GP_OK) {
-#line 2266 "GPhoto.c"
+#line 2253 "GPhoto.c"
int _tmp14_;
const gchar* _tmp15_;
const gchar* _tmp16_;
int _tmp17_;
const gchar* _tmp18_;
GError* _tmp19_;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = res;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = folder;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = filename;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = res;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp19_;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2293 "GPhoto.c"
+#line 2280 "GPhoto.c"
}
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- data = _tmp20_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- data_len = _tmp21_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp22_;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp23_ == GP_OK) {
-#line 2307 "GPhoto.c"
- guint8* buffer = NULL;
- gulong _tmp24_;
- guint8* _tmp25_;
- gint buffer_length1;
- gint _buffer_size_;
- guint8* _tmp26_;
- gint _tmp26__length1;
- guint8* _tmp27_;
- guint8* _tmp28_;
- gint _tmp28__length1;
- guint8* _tmp29_;
- gint _tmp29__length1;
- guint8* _tmp30_;
- gint _tmp30__length1;
- GMemoryInputStream* _tmp31_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = data_len;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = g_new0 (guint8, _tmp24_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- buffer = _tmp25_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- buffer_length1 = _tmp24_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _buffer_size_ = buffer_length1;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = buffer;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26__length1 = buffer_length1;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = data;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = buffer;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28__length1 = buffer_length1;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- memcpy (_tmp26_, _tmp27_, (gsize) _tmp28__length1);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = buffer;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29__length1 = buffer_length1;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = (_tmp29_ != NULL) ? _vala_array_dup24 (_tmp29_, _tmp29__length1) : ((gpointer) _tmp29_);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30__length1 = _tmp29__length1;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- buffer = (g_free (buffer), NULL);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp20_ = context;
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp21_ = gp_camera_file_to_bytes (_tmp20_, camera_file);
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ bytes = _tmp21_;
+#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp22_ = bytes;
+#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (_tmp22_ != NULL) {
+#line 2292 "GPhoto.c"
+ GBytes* _tmp23_;
+ GMemoryInputStream* _tmp24_;
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp23_ = bytes;
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp24_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp23_);
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, g_input_stream_get_type (), GInputStream);
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (bytes);
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2363 "GPhoto.c"
+#line 2307 "GPhoto.c"
}
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = app_dirs_get_temp_dir ();
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp33_ = _tmp32_;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp34_ = g_file_get_child (_tmp33_, "import.tmp");
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp35_ = _tmp34_;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp33_);
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- temp = _tmp35_;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp36_ = temp;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp37_ = g_file_get_path (_tmp36_);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp38_ = _tmp37_;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp39_ = gp_file_save (camera_file, _tmp38_);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp39_;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp38_);
-#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp40_ = res;
-#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp40_ != GP_OK) {
-#line 2393 "GPhoto.c"
- int _tmp41_;
- const gchar* _tmp42_;
- const gchar* _tmp43_;
- GFile* _tmp44_;
- gchar* _tmp45_;
- gchar* _tmp46_;
- int _tmp47_;
- const gchar* _tmp48_;
- GError* _tmp49_;
- GError* _tmp50_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp41_ = res;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp42_ = folder;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp43_ = filename;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp44_ = temp;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp45_ = g_file_get_path (_tmp44_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp46_ = _tmp45_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp47_ = res;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp48_ = gp_port_result_as_string (_tmp47_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp49_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp41_, _tmp42_, _tmp43_, _tmp46_, _tmp48_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp50_ = _tmp49_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp46_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp50_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp25_ = app_dirs_get_temp_dir ();
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp26_ = _tmp25_;
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp27_ = g_file_get_child (_tmp26_, "import.tmp");
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp28_ = _tmp27_;
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_object_unref0 (_tmp26_);
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ temp = _tmp28_;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp29_ = temp;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp30_ = g_file_get_path (_tmp29_);
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp31_ = _tmp30_;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp32_ = gp_file_save (camera_file, _tmp31_);
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ res = _tmp32_;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_tmp31_);
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp33_ = res;
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (_tmp33_ != GP_OK) {
+#line 2337 "GPhoto.c"
+ int _tmp34_;
+ const gchar* _tmp35_;
+ const gchar* _tmp36_;
+ GFile* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
+ int _tmp40_;
+ const gchar* _tmp41_;
+ GError* _tmp42_;
+ GError* _tmp43_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp34_ = res;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp35_ = folder;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp36_ = filename;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp37_ = temp;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp38_ = g_file_get_path (_tmp37_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp39_ = _tmp38_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp40_ = res;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp41_ = gp_port_result_as_string (_tmp40_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp42_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp34_, _tmp35_, _tmp36_, _tmp39_, _tmp41_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp43_ = _tmp42_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_free0 (_tmp39_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _inner_error_ = _tmp43_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (temp);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (bytes);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2436 "GPhoto.c"
+#line 2382 "GPhoto.c"
}
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp52_ = temp;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp53_ = g_file_read (_tmp52_, NULL, &_inner_error_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp51_ = _tmp53_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp45_ = temp;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp46_ = g_file_read (_tmp45_, NULL, &_inner_error_);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp44_ = _tmp46_;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (temp);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (bytes);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2454 "GPhoto.c"
+#line 2402 "GPhoto.c"
}
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp54_ = _tmp51_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp51_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp51_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp47_ = _tmp44_;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp44_ = NULL;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, g_input_stream_get_type (), GInputStream);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_object_unref0 (_tmp44_);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (temp);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_bytes_unref0 (bytes);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2470 "GPhoto.c"
+#line 2420 "GPhoto.c"
}
-void gp_on_mins_destroyed (void* data) {
- void* _tmp0_;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = data;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- g_free (_tmp0_);
-#line 2480 "GPhoto.c"
-}
-
-
-guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, int* result_length1, GError** error) {
- guint8* result = NULL;
+GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error) {
+ GBytes* result = NULL;
CameraFile* camera_file = NULL;
int res = 0;
CameraFile* _tmp0_ = NULL;
@@ -2495,192 +2435,115 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
GPContext* _tmp12_;
int _tmp13_;
int _tmp14_;
- guint8* data = NULL;
- gulong data_len = 0UL;
- CameraFile* _tmp21_;
- guint8* _tmp22_ = NULL;
- gulong _tmp23_ = 0UL;
- int _tmp24_;
- int _tmp25_;
- guint8* buffer = NULL;
- gulong _tmp27_;
- guint8* _tmp28_;
- gint buffer_length1;
- gint _buffer_size_;
- guint8* _tmp29_;
- gint _tmp29__length1;
- guint8* _tmp30_;
- guint8* _tmp31_;
- gint _tmp31__length1;
- guint8* _tmp32_;
- gint _tmp32__length1;
+ GPContext* _tmp21_;
+ CameraFile* _tmp22_;
+ GBytes* _tmp23_;
GError * _inner_error_ = NULL;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = gp_file_new (&_tmp0_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_file = _tmp0_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp1_;
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 276 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = res;
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 276 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2539 "GPhoto.c"
+#line 2463 "GPhoto.c"
int _tmp3_;
int _tmp4_;
const gchar* _tmp5_;
GError* _tmp6_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = res;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = res;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp6_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2560 "GPhoto.c"
+#line 2484 "GPhoto.c"
}
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = camera;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = folder;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = filename;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = filetype;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = camera_file;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = context;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp13_;
-#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = res;
-#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp14_ != GP_OK) {
-#line 2582 "GPhoto.c"
+#line 2506 "GPhoto.c"
int _tmp15_;
const gchar* _tmp16_;
const gchar* _tmp17_;
int _tmp18_;
const gchar* _tmp19_;
GError* _tmp20_;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = res;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = folder;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = filename;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = res;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp20_;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- g_propagate_error (error, _inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _gp_file_unref0 (camera_file);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return NULL;
-#line 2609 "GPhoto.c"
- }
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = camera_file;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = gp_file_get_data_and_size (_tmp21_, &_tmp22_, &_tmp23_);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- data = _tmp22_;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- data_len = _tmp23_;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp24_;
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = res;
+ g_propagate_error (error, _inner_error_);
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp25_ != GP_OK) {
-#line 2625 "GPhoto.c"
- guint8* _tmp26_;
- gint _tmp26__length1;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = NULL;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26__length1 = 0;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (result_length1) {
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *result_length1 = _tmp26__length1;
-#line 2636 "GPhoto.c"
- }
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp26_;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return result;
-#line 2644 "GPhoto.c"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ return NULL;
+#line 2533 "GPhoto.c"
}
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = data_len;
+ _tmp21_ = context;
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = g_new0 (guint8, _tmp27_);
+ _tmp22_ = camera_file;
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- buffer = _tmp28_;
+ _tmp23_ = gp_camera_file_to_bytes (_tmp21_, _tmp22_);
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- buffer_length1 = _tmp27_;
+ result = _tmp23_;
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _buffer_size_ = buffer_length1;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = buffer;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29__length1 = buffer_length1;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = data;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = buffer;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31__length1 = buffer_length1;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- memcpy (_tmp29_, _tmp30_, (gsize) _tmp31__length1);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = buffer;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32__length1 = buffer_length1;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (result_length1) {
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- *result_length1 = _tmp32__length1;
-#line 2676 "GPhoto.c"
- }
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp32_;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2684 "GPhoto.c"
+#line 2547 "GPhoto.c"
}
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 8dab941..39b2109 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -115,6 +115,22 @@ namespace GPhoto {
return true;
}
+ public Bytes? camera_file_to_bytes (Context context, CameraFile file) {
+ // if buffer can be loaded into memory, return a Bytes class with
+ // CameraFile being the owner of the data. This way, the CameraFile is freed
+ // when the Bytes are freed
+ unowned uint8 *data;
+ ulong data_len;
+ var res = file.get_data_and_size(out data, out data_len);
+ if (res != Result.OK)
+ return null;
+
+ unowned uint8[] buffer = (uint8[]) data;
+ buffer.length = (int) data_len;
+
+ return Bytes.new_with_owner<GPhoto.CameraFile>(buffer, file);
+ }
+
// Libgphoto will in some instances refuse to get metadata from a camera, but the camera is accessible as a
// filesystem. In these cases shotwell can access the file directly. See:
// http://redmine.yorba.org/issues/2959
@@ -146,9 +162,10 @@ namespace GPhoto {
}
public Gdk.Pixbuf? load_preview(Context context, Camera camera, string folder, string filename,
- out uint8[] raw, out size_t raw_length) throws Error {
- raw = null;
- raw_length = 0;
+ out string? preview_md5) throws Error {
+ Bytes? raw = null;
+ Bytes? out_bytes = null;
+ preview_md5 = null;
try {
raw = load_file_into_buffer(context, camera, folder, filename, GPhoto.CameraFileType.PREVIEW);
@@ -158,18 +175,18 @@ namespace GPhoto {
return null;
if(0 == metadata.get_preview_count())
return null;
- PhotoPreview? preview = metadata.get_preview(metadata.get_preview_count() - 1);
+
+ // Get the smallest preview from meta-data
+ var preview = metadata.get_preview (metadata.get_preview_count() - 1);
raw = preview.flatten();
+ preview_md5 = Checksum.compute_for_bytes(ChecksumType.MD5, raw);
}
- if (raw == null) {
- raw_length = 0;
- return null;
- }
-
- raw_length = raw.length;
-
- MemoryInputStream mins = new MemoryInputStream.from_data(raw, null);
+ out_bytes = raw;
+ preview_md5 = Checksum.compute_for_bytes(ChecksumType.MD5, out_bytes);
+
+ MemoryInputStream mins = new MemoryInputStream.from_bytes (raw);
+
return new Gdk.Pixbuf.from_stream_at_scale(mins, ImportPreview.MAX_SCALE, ImportPreview.MAX_SCALE, true, null);
}
@@ -203,7 +220,7 @@ namespace GPhoto {
public PhotoMetadata? load_metadata(Context context, Camera camera, string folder, string filename)
throws Error {
- uint8[] camera_raw = null;
+ Bytes? camera_raw = null;
try {
camera_raw = load_file_into_buffer(context, camera, folder, filename, GPhoto.CameraFileType.EXIF);
} catch {
@@ -233,17 +250,12 @@ namespace GPhoto {
throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s",
(int) res, folder, filename, res.as_string());
- // if entire file fits in memory, return a stream from that ... can't merely wrap
- // MemoryInputStream around the camera_file buffer, as that will be destroyed when the
- // function returns
- unowned uint8 *data;
- ulong data_len;
- res = camera_file.get_data_and_size(out data, out data_len);
- if (res == Result.OK) {
- uint8[] buffer = new uint8[data_len];
- Memory.copy(buffer, data, buffer.length);
-
- return new MemoryInputStream.from_data(buffer, on_mins_destroyed);
+ // if entire file fits in memory, return a stream from that ...
+ // The camera_file is set as data on the object to keep it alive while
+ // the MemoryInputStream is alive.
+ var bytes = camera_file_to_bytes (context, camera_file);
+ if (bytes != null) {
+ return new MemoryInputStream.from_bytes(bytes);
}
// if not stored in memory, try copying it to a temp file and then reading out of that
@@ -256,35 +268,20 @@ namespace GPhoto {
return temp.read(null);
}
- private static void on_mins_destroyed(void *data) {
- free(data);
- }
-
// Returns a buffer with the requested file, if within reason. Use load_file for larger files.
- public uint8[]? load_file_into_buffer(Context context, Camera camera, string folder,
+ public Bytes? load_file_into_buffer(Context context, Camera camera, string folder,
string filename, CameraFileType filetype) throws Error {
GPhoto.CameraFile camera_file;
GPhoto.Result res = GPhoto.CameraFile.create(out camera_file);
if (res != Result.OK)
throw new GPhotoError.LIBRARY("[%d] Error allocating camera file: %s", (int) res, res.as_string());
-
+
res = camera.get_file(folder, filename, filetype, camera_file, context);
if (res != Result.OK)
throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s",
(int) res, folder, filename, res.as_string());
-
- // if buffer can be loaded into memory, return a copy of that (can't return buffer itself
- // as it will be destroyed when the camera_file is unref'd)
- unowned uint8 *data;
- ulong data_len;
- res = camera_file.get_data_and_size(out data, out data_len);
- if (res != Result.OK)
- return null;
-
- uint8[] buffer = new uint8[data_len];
- Memory.copy(buffer, data, buffer.length);
-
- return buffer;
+
+ return camera_file_to_bytes (context, camera_file);
}
}
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 2f5582f..a1593ef 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1283,6 +1283,7 @@ struct _ImportPagePrivate {
ImportPageImportPageSearchViewFilter* search_filter;
ImportPageHideImportedViewFilter* hide_imported_filter;
CameraViewTracker* tracker;
+ gint claim_timeout;
};
typedef enum {
@@ -1344,6 +1345,7 @@ struct _ImportManifest {
GeeList* already_imported;
GeeList* corrupt_files;
GeeList* all;
+ GTimer* timer;
};
struct _ImportManifestClass {
@@ -1392,11 +1394,13 @@ struct _BatchImportJobClass {
gchar* (*get_basename) (BatchImportJob* self);
gchar* (*get_path) (BatchImportJob* self);
DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
+ GFile* (*get_associated_file) (BatchImportJob* self);
void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
time_t (*get_exposure_time_override) (BatchImportJob* self);
+ gboolean (*recurse) (BatchImportJob* self);
};
struct _ImportPageCameraImportJob {
@@ -1903,14 +1907,13 @@ Camera* import_page_get_camera (ImportPage* self);
gchar* import_page_get_uri (ImportPage* self);
gboolean import_page_is_busy (ImportPage* self);
static void import_page_real_init_actions (Page* base, gint selected_count, gint count);
-void page_set_action_important (Page* self, const gchar* name, gboolean important);
+void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
void page_init_actions (Page* self, gint selected_count, gint count);
gboolean import_page_is_refreshed (ImportPage* self);
gchar* import_page_get_refresh_message (ImportPage* self);
static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed);
gint view_collection_get_unfiltered_count (ViewCollection* self);
gint view_collection_get_selected_count (ViewCollection* self);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
gint data_collection_get_count (DataCollection* self);
void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display);
void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display);
@@ -1934,6 +1937,8 @@ Marker* data_collection_start_marking (DataCollection* self);
void marker_mark_all (Marker* self);
gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target);
+static gboolean ____lambda18_ (ImportPage* self);
+static gboolean _____lambda18__gsource_func (gpointer self);
static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list);
static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list);
static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list);
@@ -1949,9 +1954,8 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
void spin_event_loop (void);
void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
-gchar* md5_binary (guint8* buffer, gsize length);
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, guint8** raw, int* raw_length1, gsize* raw_length, GError** error);
+gchar* photo_metadata_exif_hash (PhotoMetadata* self);
+GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error);
gboolean data_collection_add (DataCollection* self, DataObject* object);
void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f);
@@ -2065,10 +2069,7 @@ gchar* batch_import_job_get_basename (BatchImportJob* self);
GType backing_photo_id_get_type (void) G_GNUC_CONST;
BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
void backing_photo_id_free (BackingPhotoID* self);
-static gboolean import_page_camera_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error);
-void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error);
-void photo_set_raw_developer (Photo* self, RawDeveloper d);
-RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
+static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base);
static void import_page_camera_import_job_finalize (BatchImportJob * obj);
enum {
IMPORT_PAGE_IMPORT_PAGE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
@@ -2104,14 +2105,14 @@ ImportSourceCollection* import_source_collection_construct (GType object_type, c
self = (ImportSourceCollection*) source_collection_construct (object_type, _tmp0_);
#line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 2107 "ImportPage.c"
+#line 2108 "ImportPage.c"
}
ImportSourceCollection* import_source_collection_new (const gchar* name) {
#line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_source_collection_construct (TYPE_IMPORT_SOURCE_COLLECTION, name);
-#line 2114 "ImportPage.c"
+#line 2115 "ImportPage.c"
}
@@ -2129,7 +2130,7 @@ static gboolean import_source_collection_real_holds_type_of_source (SourceCollec
result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_IMPORT_SOURCE);
#line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2132 "ImportPage.c"
+#line 2133 "ImportPage.c"
}
@@ -2138,7 +2139,7 @@ static void import_source_collection_class_init (ImportSourceCollectionClass * k
import_source_collection_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) import_source_collection_real_holds_type_of_source;
-#line 2141 "ImportPage.c"
+#line 2142 "ImportPage.c"
}
@@ -2161,7 +2162,7 @@ GType import_source_collection_get_type (void) {
static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
#line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 2164 "ImportPage.c"
+#line 2165 "ImportPage.c"
}
@@ -2244,14 +2245,14 @@ ImportSource* import_source_construct (GType object_type, const gchar* camera_na
self->priv->indexable_keywords = _tmp12_;
#line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 2247 "ImportPage.c"
+#line 2248 "ImportPage.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 2254 "ImportPage.c"
+#line 2255 "ImportPage.c"
}
@@ -2270,7 +2271,7 @@ void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) {
_g_object_unref0 (self->priv->preview);
#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->preview = _tmp1_;
-#line 2273 "ImportPage.c"
+#line 2274 "ImportPage.c"
}
@@ -2288,7 +2289,7 @@ gchar* import_source_get_camera_name (ImportSource* self) {
result = _tmp1_;
#line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2291 "ImportPage.c"
+#line 2292 "ImportPage.c"
}
@@ -2306,7 +2307,7 @@ Camera* import_source_get_camera (ImportSource* self) {
result = _tmp1_;
#line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2309 "ImportPage.c"
+#line 2310 "ImportPage.c"
}
@@ -2321,7 +2322,7 @@ gint import_source_get_fsid (ImportSource* self) {
result = _tmp0_;
#line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2324 "ImportPage.c"
+#line 2325 "ImportPage.c"
}
@@ -2339,7 +2340,7 @@ gchar* import_source_get_folder (ImportSource* self) {
result = _tmp1_;
#line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2342 "ImportPage.c"
+#line 2343 "ImportPage.c"
}
@@ -2357,7 +2358,7 @@ gchar* import_source_get_filename (ImportSource* self) {
result = _tmp1_;
#line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2360 "ImportPage.c"
+#line 2361 "ImportPage.c"
}
@@ -2372,7 +2373,7 @@ gulong import_source_get_filesize (ImportSource* self) {
result = _tmp0_;
#line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2375 "ImportPage.c"
+#line 2376 "ImportPage.c"
}
@@ -2387,7 +2388,7 @@ time_t import_source_get_modification_time (ImportSource* self) {
result = _tmp0_;
#line 69 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2390 "ImportPage.c"
+#line 2391 "ImportPage.c"
}
@@ -2403,7 +2404,7 @@ static GdkPixbuf* import_source_real_get_preview (ImportSource* self) {
result = _tmp1_;
#line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2406 "ImportPage.c"
+#line 2407 "ImportPage.c"
}
@@ -2412,7 +2413,7 @@ GdkPixbuf* import_source_get_preview (ImportSource* self) {
g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
#line 72 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return IMPORT_SOURCE_GET_CLASS (self)->get_preview (self);
-#line 2415 "ImportPage.c"
+#line 2416 "ImportPage.c"
}
@@ -2425,7 +2426,7 @@ static time_t import_source_real_get_exposure_time (ImportSource* self) {
result = _tmp0_;
#line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2428 "ImportPage.c"
+#line 2429 "ImportPage.c"
}
@@ -2434,7 +2435,7 @@ time_t import_source_get_exposure_time (ImportSource* self) {
g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0);
#line 76 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return IMPORT_SOURCE_GET_CLASS (self)->get_exposure_time (self);
-#line 2437 "ImportPage.c"
+#line 2438 "ImportPage.c"
}
@@ -2479,7 +2480,7 @@ gchar* import_source_get_fulldir (ImportSource* self) {
result = _tmp8_;
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2482 "ImportPage.c"
+#line 2483 "ImportPage.c"
}
@@ -2522,7 +2523,7 @@ static gchar* import_source_real_to_string (DataObject* base) {
result = _tmp7_;
#line 85 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2525 "ImportPage.c"
+#line 2526 "ImportPage.c"
}
@@ -2538,7 +2539,7 @@ static gchar* gp_result_to_full_string (int self) {
result = _tmp1_;
#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
return result;
-#line 2541 "ImportPage.c"
+#line 2542 "ImportPage.c"
}
@@ -2586,7 +2587,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_tmp4_ = fulldir;
#line 92 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ == NULL) {
-#line 2589 "ImportPage.c"
+#line 2590 "ImportPage.c"
gchar* _tmp5_;
gchar* _tmp6_;
const gchar* _tmp7_;
@@ -2608,7 +2609,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_tmp8_ = _tmp9_;
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2611 "ImportPage.c"
+#line 2612 "ImportPage.c"
gboolean _tmp10_ = FALSE;
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -2616,7 +2617,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_g_free0 (fulldir);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp10_;
-#line 2619 "ImportPage.c"
+#line 2620 "ImportPage.c"
}
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp8_;
@@ -2624,7 +2625,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_g_free0 (fulldir);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2627 "ImportPage.c"
+#line 2628 "ImportPage.c"
}
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = import_source_get_camera (self);
@@ -2654,7 +2655,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_tmp20_ = _result_;
#line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp20_ != GP_OK) {
-#line 2657 "ImportPage.c"
+#line 2658 "ImportPage.c"
gchar* _tmp21_;
gchar* _tmp22_;
const gchar* _tmp23_;
@@ -2679,7 +2680,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_g_free0 (_tmp26_);
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp22_);
-#line 2682 "ImportPage.c"
+#line 2683 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
@@ -2687,7 +2688,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_tmp28_ = _tmp29_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2690 "ImportPage.c"
+#line 2691 "ImportPage.c"
gboolean _tmp30_ = FALSE;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -2695,21 +2696,21 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_g_free0 (fulldir);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp30_;
-#line 2698 "ImportPage.c"
+#line 2699 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp28_) {
-#line 2702 "ImportPage.c"
+#line 2703 "ImportPage.c"
int _tmp31_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = _result_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = _tmp31_ == GP_OK;
-#line 2708 "ImportPage.c"
+#line 2709 "ImportPage.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = FALSE;
-#line 2712 "ImportPage.c"
+#line 2713 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp27_;
@@ -2717,7 +2718,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_g_free0 (fulldir);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2720 "ImportPage.c"
+#line 2721 "ImportPage.c"
}
@@ -2733,7 +2734,7 @@ static const gchar* import_source_real_get_indexable_keywords (Indexable* base)
result = _tmp0_;
#line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2736 "ImportPage.c"
+#line 2737 "ImportPage.c"
}
@@ -2752,7 +2753,7 @@ static void import_source_class_init (ImportSourceClass * klass) {
((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) import_source_real_internal_delete_backing;
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = import_source_finalize;
-#line 2755 "ImportPage.c"
+#line 2756 "ImportPage.c"
}
@@ -2761,7 +2762,7 @@ static void import_source_indexable_interface_init (IndexableIface * iface) {
import_source_indexable_parent_iface = g_type_interface_peek_parent (iface);
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) import_source_real_get_indexable_keywords;
-#line 2764 "ImportPage.c"
+#line 2765 "ImportPage.c"
}
@@ -2772,7 +2773,7 @@ static void import_source_instance_init (ImportSource * self) {
self->priv->preview = NULL;
#line 26 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->indexable_keywords = NULL;
-#line 2775 "ImportPage.c"
+#line 2776 "ImportPage.c"
}
@@ -2794,7 +2795,7 @@ static void import_source_finalize (GObject * obj) {
_g_free0 (self->priv->indexable_keywords);
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (import_source_parent_class)->finalize (obj);
-#line 2797 "ImportPage.c"
+#line 2798 "ImportPage.c"
}
@@ -2847,14 +2848,14 @@ VideoImportSource* video_import_source_construct (GType object_type, const gchar
self = (VideoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
#line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 2850 "ImportPage.c"
+#line 2851 "ImportPage.c"
}
VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
#line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return video_import_source_construct (TYPE_VIDEO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time);
-#line 2857 "ImportPage.c"
+#line 2858 "ImportPage.c"
}
@@ -2880,7 +2881,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
g_propagate_error (error, _inner_error_);
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return NULL;
-#line 2883 "ImportPage.c"
+#line 2884 "ImportPage.c"
}
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp0_;
@@ -2892,7 +2893,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
_g_object_unref0 (_tmp0_);
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2895 "ImportPage.c"
+#line 2896 "ImportPage.c"
}
@@ -2920,13 +2921,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
result = NULL;
#line 123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2923 "ImportPage.c"
+#line 2924 "ImportPage.c"
}
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = scale;
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ > 0) {
-#line 2929 "ImportPage.c"
+#line 2930 "ImportPage.c"
GdkPixbuf* _tmp5_;
GdkPixbuf* _tmp6_;
gint _tmp7_;
@@ -2945,7 +2946,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
_tmp3_ = _tmp8_;
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp6_);
-#line 2948 "ImportPage.c"
+#line 2949 "ImportPage.c"
} else {
GdkPixbuf* _tmp9_;
#line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2954,13 +2955,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
_g_object_unref0 (_tmp3_);
#line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp9_;
-#line 2957 "ImportPage.c"
+#line 2958 "ImportPage.c"
}
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp3_;
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2963 "ImportPage.c"
+#line 2964 "ImportPage.c"
}
@@ -2976,7 +2977,7 @@ static gchar* video_import_source_real_get_typename (DataSource* base) {
result = _tmp0_;
#line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2979 "ImportPage.c"
+#line 2980 "ImportPage.c"
}
@@ -2992,7 +2993,7 @@ static gint64 video_import_source_real_get_instance_id (DataSource* base) {
result = _tmp0_;
#line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2995 "ImportPage.c"
+#line 2996 "ImportPage.c"
}
@@ -3008,7 +3009,7 @@ static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (
result = _tmp0_;
#line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3011 "ImportPage.c"
+#line 3012 "ImportPage.c"
}
@@ -3024,7 +3025,7 @@ static gchar* video_import_source_real_get_name (DataObject* base) {
result = _tmp0_;
#line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3027 "ImportPage.c"
+#line 3028 "ImportPage.c"
}
@@ -3039,7 +3040,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
_tmp1_ = preview;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_ != NULL) {
-#line 3042 "ImportPage.c"
+#line 3043 "ImportPage.c"
GdkPixbuf* _tmp2_;
GdkPixbuf* _tmp3_;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3050,7 +3051,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
_g_object_unref0 (_tmp0_);
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp3_;
-#line 3053 "ImportPage.c"
+#line 3054 "ImportPage.c"
} else {
GdkPixbuf* _tmp4_;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3059,13 +3060,13 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
_g_object_unref0 (_tmp0_);
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp4_;
-#line 3062 "ImportPage.c"
+#line 3063 "ImportPage.c"
}
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_);
#line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
-#line 3068 "ImportPage.c"
+#line 3069 "ImportPage.c"
}
@@ -3084,7 +3085,7 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) {
((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) video_import_source_real_get_preferred_thumbnail_format;
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) video_import_source_real_get_name;
-#line 3087 "ImportPage.c"
+#line 3088 "ImportPage.c"
}
@@ -3144,14 +3145,14 @@ PhotoImportSource* photo_import_source_construct (GType object_type, const gchar
self->priv->file_format = _tmp7_;
#line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 3147 "ImportPage.c"
+#line 3148 "ImportPage.c"
}
PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) {
#line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return photo_import_source_construct (TYPE_PHOTO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time, file_format);
-#line 3154 "ImportPage.c"
+#line 3155 "ImportPage.c"
}
@@ -3175,7 +3176,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
_tmp3_ = is_string_empty (_tmp2_);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp3_) {
-#line 3178 "ImportPage.c"
+#line 3179 "ImportPage.c"
const gchar* _tmp4_;
gchar* _tmp5_;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3186,7 +3187,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
_g_free0 (_tmp1_);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp5_;
-#line 3189 "ImportPage.c"
+#line 3190 "ImportPage.c"
} else {
gchar* _tmp6_;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3195,7 +3196,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
_g_free0 (_tmp1_);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp6_;
-#line 3198 "ImportPage.c"
+#line 3199 "ImportPage.c"
}
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
@@ -3203,7 +3204,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
_g_free0 (title);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3206 "ImportPage.c"
+#line 3207 "ImportPage.c"
}
@@ -3219,7 +3220,7 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) {
result = _tmp0_;
#line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3222 "ImportPage.c"
+#line 3223 "ImportPage.c"
}
@@ -3235,7 +3236,7 @@ static gint64 photo_import_source_real_get_instance_id (DataSource* base) {
result = _tmp0_;
#line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3238 "ImportPage.c"
+#line 3239 "ImportPage.c"
}
@@ -3253,26 +3254,26 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
_tmp2_ = photo_file_format_can_write (_tmp1_);
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 3256 "ImportPage.c"
+#line 3257 "ImportPage.c"
PhotoFileFormat _tmp3_;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->file_format;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp3_;
-#line 3262 "ImportPage.c"
+#line 3263 "ImportPage.c"
} else {
PhotoFileFormat _tmp4_;
#line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = photo_file_format_get_system_default_format ();
#line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp4_;
-#line 3269 "ImportPage.c"
+#line 3270 "ImportPage.c"
}
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3275 "ImportPage.c"
+#line 3276 "ImportPage.c"
}
@@ -3300,13 +3301,13 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
result = NULL;
#line 188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3303 "ImportPage.c"
+#line 3304 "ImportPage.c"
}
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = scale;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ > 0) {
-#line 3309 "ImportPage.c"
+#line 3310 "ImportPage.c"
GdkPixbuf* _tmp5_;
GdkPixbuf* _tmp6_;
gint _tmp7_;
@@ -3325,7 +3326,7 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
_tmp3_ = _tmp8_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp6_);
-#line 3328 "ImportPage.c"
+#line 3329 "ImportPage.c"
} else {
GdkPixbuf* _tmp9_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3334,20 +3335,20 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
_g_object_unref0 (_tmp3_);
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp9_;
-#line 3337 "ImportPage.c"
+#line 3338 "ImportPage.c"
}
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp3_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3343 "ImportPage.c"
+#line 3344 "ImportPage.c"
}
static gpointer _media_metadata_ref0 (gpointer self) {
#line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? media_metadata_ref (self) : NULL;
-#line 3350 "ImportPage.c"
+#line 3351 "ImportPage.c"
}
@@ -3393,7 +3394,7 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co
_g_free0 (self->priv->exif_md5);
#line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->exif_md5 = _tmp6_;
-#line 3396 "ImportPage.c"
+#line 3397 "ImportPage.c"
}
@@ -3412,7 +3413,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
_tmp0_ = self->priv->metadata;
#line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ == NULL) {
-#line 3415 "ImportPage.c"
+#line 3416 "ImportPage.c"
time_t _tmp1_;
#line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3420,7 +3421,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
result = _tmp1_;
#line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3423 "ImportPage.c"
+#line 3424 "ImportPage.c"
}
#line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->metadata;
@@ -3432,7 +3433,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
_tmp5_ = date_time;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_ != NULL) {
-#line 3435 "ImportPage.c"
+#line 3436 "ImportPage.c"
MetadataDateTime* _tmp6_;
time_t _tmp7_;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3441,14 +3442,14 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
_tmp7_ = metadata_date_time_get_timestamp (_tmp6_);
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = _tmp7_;
-#line 3444 "ImportPage.c"
+#line 3445 "ImportPage.c"
} else {
time_t _tmp8_;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = _tmp8_;
-#line 3451 "ImportPage.c"
+#line 3452 "ImportPage.c"
}
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp4_;
@@ -3456,7 +3457,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
_metadata_date_time_unref0 (date_time);
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3459 "ImportPage.c"
+#line 3460 "ImportPage.c"
}
@@ -3470,7 +3471,7 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
_tmp1_ = self->priv->metadata;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_ != NULL) {
-#line 3473 "ImportPage.c"
+#line 3474 "ImportPage.c"
PhotoMetadata* _tmp2_;
gchar* _tmp3_;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3481,19 +3482,19 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
_g_free0 (_tmp0_);
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp3_;
-#line 3484 "ImportPage.c"
+#line 3485 "ImportPage.c"
} else {
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp0_);
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = NULL;
-#line 3490 "ImportPage.c"
+#line 3491 "ImportPage.c"
}
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3496 "ImportPage.c"
+#line 3497 "ImportPage.c"
}
@@ -3508,7 +3509,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
_tmp0_ = self->priv->associated;
#line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 3511 "ImportPage.c"
+#line 3512 "ImportPage.c"
PhotoImportSource* _tmp1_;
PhotoMetadata* _tmp2_;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3519,7 +3520,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
result = _tmp2_;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3522 "ImportPage.c"
+#line 3523 "ImportPage.c"
}
#line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->metadata;
@@ -3529,7 +3530,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
result = _tmp4_;
#line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3532 "ImportPage.c"
+#line 3533 "ImportPage.c"
}
@@ -3546,7 +3547,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
_tmp0_ = self->priv->associated;
#line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 3549 "ImportPage.c"
+#line 3550 "ImportPage.c"
PhotoImportSource* _tmp1_;
GdkPixbuf* _tmp2_;
#line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3557,7 +3558,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
result = _tmp2_;
#line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3560 "ImportPage.c"
+#line 3561 "ImportPage.c"
}
#line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3569,7 +3570,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
_g_object_unref0 (_tmp4_);
#line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 3572 "ImportPage.c"
+#line 3573 "ImportPage.c"
GdkPixbuf* _tmp6_;
#line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3577,13 +3578,13 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
result = _tmp6_;
#line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3580 "ImportPage.c"
+#line 3581 "ImportPage.c"
}
#line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
#line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3586 "ImportPage.c"
+#line 3587 "ImportPage.c"
}
@@ -3611,13 +3612,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
result = NULL;
#line 235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3614 "ImportPage.c"
+#line 3615 "ImportPage.c"
}
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = scale;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ > 0) {
-#line 3620 "ImportPage.c"
+#line 3621 "ImportPage.c"
GdkPixbuf* _tmp5_;
GdkPixbuf* _tmp6_;
gint _tmp7_;
@@ -3636,7 +3637,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
_tmp3_ = _tmp8_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp6_);
-#line 3639 "ImportPage.c"
+#line 3640 "ImportPage.c"
} else {
GdkPixbuf* _tmp9_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3645,13 +3646,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
_g_object_unref0 (_tmp3_);
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp9_;
-#line 3648 "ImportPage.c"
+#line 3649 "ImportPage.c"
}
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp3_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3654 "ImportPage.c"
+#line 3655 "ImportPage.c"
}
@@ -3666,7 +3667,7 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
result = _tmp0_;
#line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3669 "ImportPage.c"
+#line 3670 "ImportPage.c"
}
@@ -3684,7 +3685,7 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
result = _tmp1_;
#line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3687 "ImportPage.c"
+#line 3688 "ImportPage.c"
}
@@ -3703,7 +3704,7 @@ void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSou
_g_object_unref0 (self->priv->associated);
#line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->associated = _tmp1_;
-#line 3706 "ImportPage.c"
+#line 3707 "ImportPage.c"
}
@@ -3721,7 +3722,7 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self)
result = _tmp1_;
#line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3724 "ImportPage.c"
+#line 3725 "ImportPage.c"
}
@@ -3740,19 +3741,19 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
ret = _tmp0_;
#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3743 "ImportPage.c"
+#line 3744 "ImportPage.c"
gboolean _tmp1_ = FALSE;
#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp1_;
-#line 3749 "ImportPage.c"
+#line 3750 "ImportPage.c"
}
#line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->associated;
#line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_ != NULL) {
-#line 3755 "ImportPage.c"
+#line 3756 "ImportPage.c"
gboolean _tmp3_ = FALSE;
PhotoImportSource* _tmp4_;
gboolean _tmp5_;
@@ -3765,25 +3766,25 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
_tmp3_ = _tmp5_;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3768 "ImportPage.c"
+#line 3769 "ImportPage.c"
gboolean _tmp6_ = FALSE;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp6_;
-#line 3774 "ImportPage.c"
+#line 3775 "ImportPage.c"
}
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = ret;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ret = _tmp7_ & _tmp3_;
-#line 3780 "ImportPage.c"
+#line 3781 "ImportPage.c"
}
#line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = ret;
#line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3786 "ImportPage.c"
+#line 3787 "ImportPage.c"
}
@@ -3812,7 +3813,7 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) {
((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) photo_import_source_real_internal_delete_backing;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = photo_import_source_finalize;
-#line 3815 "ImportPage.c"
+#line 3816 "ImportPage.c"
}
@@ -3827,7 +3828,7 @@ static void photo_import_source_instance_init (PhotoImportSource * self) {
self->priv->exif_md5 = NULL;
#line 159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->associated = NULL;
-#line 3830 "ImportPage.c"
+#line 3831 "ImportPage.c"
}
@@ -3845,7 +3846,7 @@ static void photo_import_source_finalize (GObject * obj) {
_g_object_unref0 (self->priv->associated);
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (photo_import_source_parent_class)->finalize (obj);
-#line 3848 "ImportPage.c"
+#line 3849 "ImportPage.c"
}
@@ -3905,11 +3906,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
#line 278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TRUE);
-#line 3908 "ImportPage.c"
+#line 3909 "ImportPage.c"
}
#line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
pixbuf = NULL;
-#line 3912 "ImportPage.c"
+#line 3913 "ImportPage.c"
{
GdkPixbuf* _tmp6_ = NULL;
ImportSource* _tmp7_;
@@ -3923,8 +3924,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_tmp6_ = _tmp8_;
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3926 "ImportPage.c"
- goto __catch65_g_error;
+#line 3927 "ImportPage.c"
+ goto __catch72_g_error;
}
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp6_;
@@ -3936,10 +3937,10 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
pixbuf = _tmp9_;
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp6_);
-#line 3939 "ImportPage.c"
+#line 3940 "ImportPage.c"
}
- goto __finally65;
- __catch65_g_error:
+ goto __finally72;
+ __catch72_g_error:
{
GError* err = NULL;
gchar* _tmp10_;
@@ -3964,9 +3965,9 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_free0 (_tmp11_);
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 3967 "ImportPage.c"
+#line 3968 "ImportPage.c"
}
- __finally65:
+ __finally72:
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3977,7 +3978,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return NULL;
-#line 3980 "ImportPage.c"
+#line 3981 "ImportPage.c"
}
#line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = pixbuf;
@@ -3987,7 +3988,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_tmp15_ = pixbuf;
#line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp15_ == NULL) {
-#line 3990 "ImportPage.c"
+#line 3991 "ImportPage.c"
GdkPixbuf* _tmp16_;
GdkPixbuf* _tmp20_;
GdkPixbuf* _tmp21_;
@@ -3995,7 +3996,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_tmp16_ = import_preview_placeholder_preview;
#line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp16_ == NULL) {
-#line 3998 "ImportPage.c"
+#line 3999 "ImportPage.c"
GdkPixbuf* _tmp17_;
GdkPixbuf* _tmp18_;
GdkPixbuf* _tmp19_;
@@ -4013,7 +4014,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_object_unref0 (import_preview_placeholder_preview);
#line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_preview_placeholder_preview = _tmp19_;
-#line 4016 "ImportPage.c"
+#line 4017 "ImportPage.c"
}
#line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = import_preview_placeholder_preview;
@@ -4023,7 +4024,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_object_unref0 (pixbuf);
#line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
pixbuf = _tmp21_;
-#line 4026 "ImportPage.c"
+#line 4027 "ImportPage.c"
}
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = pixbuf;
@@ -4033,7 +4034,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
if (_tmp24_ > IMPORT_PREVIEW_MAX_SCALE) {
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = TRUE;
-#line 4036 "ImportPage.c"
+#line 4037 "ImportPage.c"
} else {
GdkPixbuf* _tmp25_;
gint _tmp26_;
@@ -4043,11 +4044,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_tmp26_ = gdk_pixbuf_get_height (_tmp25_);
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = _tmp26_ > IMPORT_PREVIEW_MAX_SCALE;
-#line 4046 "ImportPage.c"
+#line 4047 "ImportPage.c"
}
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp22_) {
-#line 4050 "ImportPage.c"
+#line 4051 "ImportPage.c"
GdkPixbuf* _tmp27_;
GdkPixbuf* _tmp28_;
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4058,13 +4059,13 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_object_unref0 (pixbuf);
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
pixbuf = _tmp28_;
-#line 4061 "ImportPage.c"
+#line 4062 "ImportPage.c"
}
#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = source;
#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 4067 "ImportPage.c"
+#line 4068 "ImportPage.c"
PhotoImportSource* photo_import_source = NULL;
ImportSource* _tmp30_;
PhotoImportSource* _tmp31_;
@@ -4084,7 +4085,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_tmp33_ = using_placeholder;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp33_) {
-#line 4087 "ImportPage.c"
+#line 4088 "ImportPage.c"
PhotoImportSource* _tmp34_;
PhotoMetadata* _tmp35_;
PhotoMetadata* _tmp36_;
@@ -4098,15 +4099,15 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_tmp32_ = _tmp36_ != NULL;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (_tmp36_);
-#line 4101 "ImportPage.c"
+#line 4102 "ImportPage.c"
} else {
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = FALSE;
-#line 4105 "ImportPage.c"
+#line 4106 "ImportPage.c"
}
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp32_) {
-#line 4109 "ImportPage.c"
+#line 4110 "ImportPage.c"
PhotoImportSource* _tmp37_;
PhotoMetadata* _tmp38_;
PhotoMetadata* _tmp39_;
@@ -4131,7 +4132,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
pixbuf = _tmp42_;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (_tmp39_);
-#line 4134 "ImportPage.c"
+#line 4135 "ImportPage.c"
}
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = photo_import_source;
@@ -4145,7 +4146,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_object_unref0 (_tmp45_);
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp46_) {
-#line 4148 "ImportPage.c"
+#line 4149 "ImportPage.c"
gchar* _tmp47_;
gchar* _tmp48_;
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4156,11 +4157,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp48_, TRUE, PANGO_ALIGN_LEFT);
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp48_);
-#line 4159 "ImportPage.c"
+#line 4160 "ImportPage.c"
}
#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo_import_source);
-#line 4163 "ImportPage.c"
+#line 4164 "ImportPage.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = pixbuf;
@@ -4170,14 +4171,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_object_unref0 (pixbuf);
#line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 4173 "ImportPage.c"
+#line 4174 "ImportPage.c"
}
ImportPreview* import_preview_new (ImportSource* source) {
#line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_preview_construct (TYPE_IMPORT_PREVIEW, source);
-#line 4180 "ImportPage.c"
+#line 4181 "ImportPage.c"
}
@@ -4201,7 +4202,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
if (_tmp1_ == NULL) {
#line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
-#line 4204 "ImportPage.c"
+#line 4205 "ImportPage.c"
}
#line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source = _tmp1_;
@@ -4209,7 +4210,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_tmp2_ = photo_import_source;
#line 320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_ != NULL) {
-#line 4212 "ImportPage.c"
+#line 4213 "ImportPage.c"
gchar* preview_md5 = NULL;
PhotoImportSource* _tmp3_;
gchar* _tmp4_;
@@ -4238,7 +4239,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_tmp9_ = is_string_empty (_tmp8_);
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp9_) {
-#line 4241 "ImportPage.c"
+#line 4242 "ImportPage.c"
const gchar* _tmp10_;
PhotoFileFormat _tmp11_;
gboolean _tmp12_;
@@ -4250,15 +4251,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_tmp12_ = library_photo_has_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_);
#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _tmp12_;
-#line 4253 "ImportPage.c"
+#line 4254 "ImportPage.c"
} else {
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = FALSE;
-#line 4257 "ImportPage.c"
+#line 4258 "ImportPage.c"
}
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp7_) {
-#line 4261 "ImportPage.c"
+#line 4262 "ImportPage.c"
const gchar* _tmp13_;
PhotoFileFormat _tmp14_;
PhotoID _tmp15_ = {0};
@@ -4283,13 +4284,13 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_object_unref0 (photo_import_source);
#line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4286 "ImportPage.c"
+#line 4287 "ImportPage.c"
}
#line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = file_format;
#line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4292 "ImportPage.c"
+#line 4293 "ImportPage.c"
guint64 filesize = 0ULL;
ImportSource* _tmp18_;
ImportSource* _tmp19_;
@@ -4312,7 +4313,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_tmp22_ = filesize;
#line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp22_ <= ((guint64) G_MAXINT64)) {
-#line 4315 "ImportPage.c"
+#line 4316 "ImportPage.c"
PhotoID duplicated_photo_id = {0};
LibraryPhotoSourceCollection* _tmp23_;
ImportSource* _tmp24_;
@@ -4349,7 +4350,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_tmp31_ = photo_id_is_valid (&duplicated_photo_id);
#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp31_) {
-#line 4352 "ImportPage.c"
+#line 4353 "ImportPage.c"
LibraryPhoto* duplicated_photo = NULL;
LibraryPhotoSourceCollection* _tmp32_;
PhotoID _tmp33_;
@@ -4388,7 +4389,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_tmp40_ = duplicated_photo_exposure_time;
#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp39_ == _tmp40_) {
-#line 4391 "ImportPage.c"
+#line 4392 "ImportPage.c"
LibraryPhotoSourceCollection* _tmp41_;
ImportSource* _tmp42_;
ImportSource* _tmp43_;
@@ -4431,11 +4432,11 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_object_unref0 (photo_import_source);
#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4434 "ImportPage.c"
+#line 4435 "ImportPage.c"
}
#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (duplicated_photo);
-#line 4438 "ImportPage.c"
+#line 4439 "ImportPage.c"
}
}
}
@@ -4447,7 +4448,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_object_unref0 (photo_import_source);
#line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4450 "ImportPage.c"
+#line 4451 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = import_preview_get_import_source (self);
@@ -4457,7 +4458,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
if (_tmp50_ == NULL) {
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp49_);
-#line 4460 "ImportPage.c"
+#line 4461 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
video_import_source = _tmp50_;
@@ -4465,7 +4466,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_tmp51_ = video_import_source;
#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp51_ != NULL) {
-#line 4468 "ImportPage.c"
+#line 4469 "ImportPage.c"
VideoSourceCollection* _tmp52_;
VideoImportSource* _tmp53_;
gchar* _tmp54_;
@@ -4494,7 +4495,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_free0 (_tmp55_);
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp59_) {
-#line 4497 "ImportPage.c"
+#line 4498 "ImportPage.c"
VideoSourceCollection* _tmp60_;
VideoImportSource* _tmp61_;
gchar* _tmp62_;
@@ -4533,7 +4534,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_object_unref0 (photo_import_source);
#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4536 "ImportPage.c"
+#line 4537 "ImportPage.c"
}
#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4543,7 +4544,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_object_unref0 (photo_import_source);
#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4546 "ImportPage.c"
+#line 4547 "ImportPage.c"
}
#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4553,7 +4554,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_object_unref0 (photo_import_source);
#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4556 "ImportPage.c"
+#line 4557 "ImportPage.c"
}
@@ -4572,7 +4573,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
result = NULL;
#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4575 "ImportPage.c"
+#line 4576 "ImportPage.c"
}
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->duplicated_file;
@@ -4582,7 +4583,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
result = _tmp2_;
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4585 "ImportPage.c"
+#line 4586 "ImportPage.c"
}
@@ -4597,7 +4598,7 @@ ImportSource* import_preview_get_import_source (ImportPreview* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource);
#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4600 "ImportPage.c"
+#line 4601 "ImportPage.c"
}
@@ -4608,14 +4609,14 @@ static void import_preview_class_init (ImportPreviewClass * klass) {
g_type_class_add_private (klass, sizeof (ImportPreviewPrivate));
#line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = import_preview_finalize;
-#line 4611 "ImportPage.c"
+#line 4612 "ImportPage.c"
}
static void import_preview_instance_init (ImportPreview * self) {
#line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = IMPORT_PREVIEW_GET_PRIVATE (self);
-#line 4618 "ImportPage.c"
+#line 4619 "ImportPage.c"
}
@@ -4627,7 +4628,7 @@ static void import_preview_finalize (GObject * obj) {
_g_object_unref0 (self->priv->duplicated_file);
#line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (import_preview_parent_class)->finalize (obj);
-#line 4630 "ImportPage.c"
+#line 4631 "ImportPage.c"
}
@@ -4665,14 +4666,14 @@ CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollect
core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 4668 "ImportPage.c"
+#line 4669 "ImportPage.c"
}
CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) {
#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return camera_view_tracker_construct (TYPE_CAMERA_VIEW_TRACKER, collection);
-#line 4675 "ImportPage.c"
+#line 4676 "ImportPage.c"
}
@@ -4681,7 +4682,7 @@ static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) {
camera_view_tracker_parent_class = g_type_class_peek_parent (klass);
#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((CoreTrackerClass *) klass)->finalize = camera_view_tracker_finalize;
-#line 4684 "ImportPage.c"
+#line 4685 "ImportPage.c"
}
@@ -4701,7 +4702,7 @@ static void camera_view_tracker_instance_init (CameraViewTracker * self) {
_tmp2_ = camera_accumulator_new ();
#line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->selected = _tmp2_;
-#line 4704 "ImportPage.c"
+#line 4705 "ImportPage.c"
}
@@ -4717,7 +4718,7 @@ static void camera_view_tracker_finalize (CoreTracker * obj) {
_g_object_unref0 (self->selected);
#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
CORE_TRACKER_CLASS (camera_view_tracker_parent_class)->finalize (obj);
-#line 4720 "ImportPage.c"
+#line 4721 "ImportPage.c"
}
@@ -4769,7 +4770,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
_tmp6_ = photo;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp6_ != NULL) {
-#line 4772 "ImportPage.c"
+#line 4773 "ImportPage.c"
PhotoImportSource* _tmp7_;
PhotoFileFormat _tmp8_;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4778,21 +4779,21 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
_tmp8_ = photo_import_source_get_file_format (_tmp7_);
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4781 "ImportPage.c"
+#line 4782 "ImportPage.c"
} else {
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = FALSE;
-#line 4785 "ImportPage.c"
+#line 4786 "ImportPage.c"
}
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 4789 "ImportPage.c"
+#line 4790 "ImportPage.c"
gint _tmp9_;
#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = self->priv->_photos;
#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_photos (self, _tmp9_ + 1);
-#line 4795 "ImportPage.c"
+#line 4796 "ImportPage.c"
} else {
gboolean _tmp10_ = FALSE;
PhotoImportSource* _tmp11_;
@@ -4800,7 +4801,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
_tmp11_ = photo;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_ != NULL) {
-#line 4803 "ImportPage.c"
+#line 4804 "ImportPage.c"
PhotoImportSource* _tmp12_;
PhotoFileFormat _tmp13_;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4809,34 +4810,34 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
_tmp13_ = photo_import_source_get_file_format (_tmp12_);
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 4812 "ImportPage.c"
+#line 4813 "ImportPage.c"
} else {
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = FALSE;
-#line 4816 "ImportPage.c"
+#line 4817 "ImportPage.c"
}
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp10_) {
-#line 4820 "ImportPage.c"
+#line 4821 "ImportPage.c"
gint _tmp14_;
#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = self->priv->_raw;
#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_raw (self, _tmp14_ + 1);
-#line 4826 "ImportPage.c"
+#line 4827 "ImportPage.c"
} else {
ImportSource* _tmp15_;
#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = source;
#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4833 "ImportPage.c"
+#line 4834 "ImportPage.c"
gint _tmp16_;
#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = self->priv->_videos;
#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_videos (self, _tmp16_ + 1);
-#line 4839 "ImportPage.c"
+#line 4840 "ImportPage.c"
}
}
}
@@ -4848,7 +4849,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
_g_object_unref0 (source);
#line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4851 "ImportPage.c"
+#line 4852 "ImportPage.c"
}
@@ -4888,7 +4889,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp6_ = photo;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp6_ != NULL) {
-#line 4891 "ImportPage.c"
+#line 4892 "ImportPage.c"
PhotoImportSource* _tmp7_;
PhotoFileFormat _tmp8_;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4897,15 +4898,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp8_ = photo_import_source_get_file_format (_tmp7_);
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4900 "ImportPage.c"
+#line 4901 "ImportPage.c"
} else {
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = FALSE;
-#line 4904 "ImportPage.c"
+#line 4905 "ImportPage.c"
}
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 4908 "ImportPage.c"
+#line 4909 "ImportPage.c"
gint _tmp9_;
gint _tmp10_;
#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4916,7 +4917,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp10_ = self->priv->_photos;
#line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_photos (self, _tmp10_ - 1);
-#line 4919 "ImportPage.c"
+#line 4920 "ImportPage.c"
} else {
gboolean _tmp11_ = FALSE;
PhotoImportSource* _tmp12_;
@@ -4924,7 +4925,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp12_ = photo;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp12_ != NULL) {
-#line 4927 "ImportPage.c"
+#line 4928 "ImportPage.c"
PhotoImportSource* _tmp13_;
PhotoFileFormat _tmp14_;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4933,15 +4934,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp14_ = photo_import_source_get_file_format (_tmp13_);
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW;
-#line 4936 "ImportPage.c"
+#line 4937 "ImportPage.c"
} else {
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = FALSE;
-#line 4940 "ImportPage.c"
+#line 4941 "ImportPage.c"
}
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_) {
-#line 4944 "ImportPage.c"
+#line 4945 "ImportPage.c"
gint _tmp15_;
gint _tmp16_;
#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4952,14 +4953,14 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp16_ = self->priv->_raw;
#line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_raw (self, _tmp16_ - 1);
-#line 4955 "ImportPage.c"
+#line 4956 "ImportPage.c"
} else {
ImportSource* _tmp17_;
#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = source;
#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4962 "ImportPage.c"
+#line 4963 "ImportPage.c"
gint _tmp18_;
gint _tmp19_;
#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4970,7 +4971,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp19_ = self->priv->_videos;
#line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_videos (self, _tmp19_ - 1);
-#line 4973 "ImportPage.c"
+#line 4974 "ImportPage.c"
}
}
}
@@ -4982,7 +4983,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_g_object_unref0 (source);
#line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4985 "ImportPage.c"
+#line 4986 "ImportPage.c"
}
@@ -4999,7 +5000,7 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D
result = FALSE;
#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5002 "ImportPage.c"
+#line 5003 "ImportPage.c"
}
@@ -5026,7 +5027,7 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
result = _tmp4_;
#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5029 "ImportPage.c"
+#line 5030 "ImportPage.c"
}
@@ -5036,14 +5037,14 @@ CameraAccumulator* camera_accumulator_construct (GType object_type) {
self = (CameraAccumulator*) g_object_new (object_type, NULL);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 5039 "ImportPage.c"
+#line 5040 "ImportPage.c"
}
CameraAccumulator* camera_accumulator_new (void) {
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR);
-#line 5046 "ImportPage.c"
+#line 5047 "ImportPage.c"
}
@@ -5058,7 +5059,7 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
result = _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5061 "ImportPage.c"
+#line 5062 "ImportPage.c"
}
@@ -5067,7 +5068,7 @@ static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (camera_accumulator_get_total (self) != value) {
-#line 5070 "ImportPage.c"
+#line 5071 "ImportPage.c"
gint _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = value;
@@ -5075,7 +5076,7 @@ static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
self->priv->_total = _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_notify ((GObject *) self, "total");
-#line 5078 "ImportPage.c"
+#line 5079 "ImportPage.c"
}
}
@@ -5091,7 +5092,7 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
result = _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5094 "ImportPage.c"
+#line 5095 "ImportPage.c"
}
@@ -5100,7 +5101,7 @@ static void camera_accumulator_set_photos (CameraAccumulator* self, gint value)
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (camera_accumulator_get_photos (self) != value) {
-#line 5103 "ImportPage.c"
+#line 5104 "ImportPage.c"
gint _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = value;
@@ -5108,7 +5109,7 @@ static void camera_accumulator_set_photos (CameraAccumulator* self, gint value)
self->priv->_photos = _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_notify ((GObject *) self, "photos");
-#line 5111 "ImportPage.c"
+#line 5112 "ImportPage.c"
}
}
@@ -5124,7 +5125,7 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
result = _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5127 "ImportPage.c"
+#line 5128 "ImportPage.c"
}
@@ -5133,7 +5134,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value)
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (camera_accumulator_get_videos (self) != value) {
-#line 5136 "ImportPage.c"
+#line 5137 "ImportPage.c"
gint _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = value;
@@ -5141,7 +5142,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value)
self->priv->_videos = _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_notify ((GObject *) self, "videos");
-#line 5144 "ImportPage.c"
+#line 5145 "ImportPage.c"
}
}
@@ -5157,7 +5158,7 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
result = _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5160 "ImportPage.c"
+#line 5161 "ImportPage.c"
}
@@ -5166,7 +5167,7 @@ static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (camera_accumulator_get_raw (self) != value) {
-#line 5169 "ImportPage.c"
+#line 5170 "ImportPage.c"
gint _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = value;
@@ -5174,7 +5175,7 @@ static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
self->priv->_raw = _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_notify ((GObject *) self, "raw");
-#line 5177 "ImportPage.c"
+#line 5178 "ImportPage.c"
}
}
@@ -5198,7 +5199,7 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 5201 "ImportPage.c"
+#line 5202 "ImportPage.c"
}
@@ -5211,7 +5212,7 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac
iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) camera_accumulator_real_uninclude;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) camera_accumulator_real_altered;
-#line 5214 "ImportPage.c"
+#line 5215 "ImportPage.c"
}
@@ -5226,7 +5227,7 @@ static void camera_accumulator_instance_init (CameraAccumulator * self) {
self->priv->_videos = 0;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->_raw = 0;
-#line 5229 "ImportPage.c"
+#line 5230 "ImportPage.c"
}
@@ -5236,7 +5237,7 @@ static void camera_accumulator_finalize (GObject * obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (camera_accumulator_parent_class)->finalize (obj);
-#line 5239 "ImportPage.c"
+#line 5240 "ImportPage.c"
}
@@ -5283,13 +5284,13 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
g_value_set_int (value, camera_accumulator_get_raw (self));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5286 "ImportPage.c"
+#line 5287 "ImportPage.c"
default:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5292 "ImportPage.c"
+#line 5293 "ImportPage.c"
}
}
@@ -5323,21 +5324,21 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
camera_accumulator_set_raw (self, g_value_get_int (value));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5326 "ImportPage.c"
+#line 5327 "ImportPage.c"
default:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5332 "ImportPage.c"
+#line 5333 "ImportPage.c"
}
}
static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_media_added_removed ((ImportPage*) self);
-#line 5340 "ImportPage.c"
+#line 5341 "ImportPage.c"
}
@@ -5354,69 +5355,69 @@ GType import_page_refresh_result_get_type (void) {
static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_import_selected ((ImportPage*) self);
-#line 5359 "ImportPage.c"
+#line 5360 "ImportPage.c"
}
static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_import_all ((ImportPage*) self);
-#line 5366 "ImportPage.c"
+#line 5367 "ImportPage.c"
}
static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_on_action_toggle ((Page*) self, action, parameter);
-#line 5373 "ImportPage.c"
+#line 5374 "ImportPage.c"
}
static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_display_titles ((ImportPage*) self, action, value);
-#line 5380 "ImportPage.c"
+#line 5381 "ImportPage.c"
}
static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpointer self) {
gint64 result;
result = import_page_preview_comparator (a, b);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5389 "ImportPage.c"
+#line 5390 "ImportPage.c"
}
static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
gboolean result;
result = import_page_preview_comparator_predicate (object, alteration);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5398 "ImportPage.c"
+#line 5399 "ImportPage.c"
}
static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed ((ImportPage*) self);
-#line 5405 "ImportPage.c"
+#line 5406 "ImportPage.c"
}
static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed ((ImportPage*) self);
-#line 5412 "ImportPage.c"
+#line 5413 "ImportPage.c"
}
static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed ((ImportPage*) self);
-#line 5419 "ImportPage.c"
+#line 5420 "ImportPage.c"
}
@@ -5462,78 +5463,78 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
GValue _tmp49_ = {0};
LibraryPhotoSourceCollection* _tmp50_;
VideoSourceCollection* _tmp51_;
-#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (uri != NULL, NULL);
-#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportPage*) checkerboard_page_construct (object_type, _ ("Camera"));
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = camera;
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_camera_unref0 (self->priv->camera);
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->camera = _tmp1_;
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = uri;
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->uri);
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->uri = _tmp3_;
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = uri;
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = g_strdup_printf ("ImportSources for %s", _tmp4_);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp5_;
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = import_source_collection_new (_tmp6_);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (self->priv->import_sources);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp6_);
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = icon;
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = g_strdup (_tmp8_);
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->icon);
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->icon = _tmp9_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp10_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = camera_view_tracker_new (_tmp11_);
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_core_tracker_unref0 (self->priv->tracker);
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->tracker = _tmp12_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp11_);
-#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = display_name;
-#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (NULL != _tmp13_) {
-#line 5525 "ImportPage.c"
+#line 5526 "ImportPage.c"
const gchar* _tmp14_;
gchar* _tmp15_;
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = display_name;
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = g_strdup (_tmp14_);
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->camera_name = _tmp15_;
-#line 5536 "ImportPage.c"
+#line 5537 "ImportPage.c"
} else {
CameraAbilities abilities = {0};
int res = 0;
@@ -5541,186 +5542,186 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
CameraAbilities _tmp17_ = {0};
int _tmp18_;
int _tmp19_;
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = camera;
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = gp_camera_get_abilities (_tmp16_, &_tmp17_);
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(abilities);
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
abilities = _tmp17_;
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
res = _tmp18_;
-#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = res;
-#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp19_ != GP_OK) {
-#line 5558 "ImportPage.c"
+#line 5559 "ImportPage.c"
int _tmp20_;
gchar* _tmp21_;
gchar* _tmp22_;
gchar* _tmp23_;
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = res;
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = gp_result_to_full_string (_tmp20_);
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = _tmp21_;
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp22_);
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:726: Unable to get camera abilities: %s", _tmp22_);
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp22_);
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = g_strdup (_ ("Camera"));
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->camera_name = _tmp23_;
-#line 5579 "ImportPage.c"
+#line 5580 "ImportPage.c"
}
-#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(abilities);
-#line 5583 "ImportPage.c"
+#line 5584 "ImportPage.c"
}
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = self->priv->camera_label;
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = self->priv->camera_name;
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_label_set_text (_tmp24_, _tmp25_);
-#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->camera_name;
-#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp26_);
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = g_volume_monitor_get ();
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->volume_monitor);
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->volume_monitor = _tmp27_;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = import_page_null_context;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp28_ == NULL) {
-#line 5605 "ImportPage.c"
+#line 5606 "ImportPage.c"
GPContextWrapper* _tmp29_;
-#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = gp_context_wrapper_new ();
-#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_context_wrapper_unref0 (import_page_null_context);
-#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_null_context = _tmp29_;
-#line 5613 "ImportPage.c"
+#line 5614 "ImportPage.c"
}
-#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = import_page_spin_idle_context;
-#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp30_ == NULL) {
-#line 5619 "ImportPage.c"
+#line 5620 "ImportPage.c"
GPSpinIdleWrapper* _tmp31_;
-#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = gp_spin_idle_wrapper_new ();
-#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_context_wrapper_unref0 (import_page_spin_idle_context);
-#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_spin_idle_context = _tmp31_;
-#line 5627 "ImportPage.c"
+#line 5628 "ImportPage.c"
}
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = _tmp32_;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = self->priv->import_sources;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = import_page_import_view_manager_new (self);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = _tmp35_;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp37_ = view_collection_monitor_source_collection (_tmp33_, _tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp38_ = _tmp37_;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_view_collection_monitor_unref0 (_tmp38_);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_view_manager_unref0 (_tmp36_);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp33_);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = _tmp39_;
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp40_);
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = _tmp41_;
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (_tmp42_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp42_);
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp44_ = _tmp43_;
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp44_);
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp46_ = _tmp45_;
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (_tmp46_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp46_);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = _tmp47_;
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_value_init (&_tmp49_, G_TYPE_BOOLEAN);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_value_set_boolean (&_tmp49_, TRUE);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp49_, NULL, NULL);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_IS_VALUE (&_tmp49_) ? (g_value_unset (&_tmp49_), NULL) : NULL;
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp48_);
-#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = library_photo_global;
-#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
-#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp51_ = video_global;
-#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
-#line 769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
-#line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
-#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 5709 "ImportPage.c"
+#line 5710 "ImportPage.c"
}
ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
-#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon);
-#line 5716 "ImportPage.c"
+#line 5717 "ImportPage.c"
}
static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_hide_imported ((ImportPage*) self);
-#line 5723 "ImportPage.c"
+#line 5724 "ImportPage.c"
}
@@ -5730,13 +5731,13 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
GtkToolbar* _tmp0_;
GtkToolbar* _tmp55_;
GtkToolbar* _tmp56_;
-#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ == NULL) {
-#line 5739 "ImportPage.c"
+#line 5740 "ImportPage.c"
GtkToolbar* _tmp1_;
GtkToolbar* _tmp2_;
GtkCheckButton* _tmp3_;
@@ -5797,250 +5798,250 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
GtkToolbar* _tmp52_;
GtkToolButton* _tmp53_;
GtkProgressBar* _tmp54_;
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = PAGE_CLASS (import_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp1_;
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp2_);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Hide photos already imported"));
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp3_);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->hide_imported);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->hide_imported = _tmp3_;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->hide_imported;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _ ("Only display photos that have not been imported"));
-#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = self->priv->hide_imported;
-#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0);
-#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = self->priv->hide_imported;
-#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = self->priv->hide_imported;
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = config_facade_get_instance ();
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp8_;
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp10_);
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = gtk_tool_item_new ();
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp11_);
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
hide_item = _tmp11_;
-#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = hide_item;
-#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_item_set_is_important (_tmp12_, TRUE);
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = hide_item;
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = self->priv->hide_imported;
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = hide_item;
-#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toolbar_insert (_tmp15_, _tmp16_, -1);
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp17_);
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
separator = _tmp17_;
-#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = separator;
-#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_separator_tool_item_set_draw (_tmp18_, FALSE);
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = separator;
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toolbar_insert (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = self->priv->progress_bar;
-#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
-#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = self->priv->progress_bar;
-#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = gtk_tool_item_new ();
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp23_);
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
progress_item = _tmp23_;
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = progress_item;
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_item_set_expand (_tmp24_, TRUE);
-#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = progress_item;
-#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->progress_bar;
-#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = self->priv->progress_bar;
-#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_show_text (_tmp27_, TRUE);
-#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = progress_item;
-#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toolbar_insert (_tmp28_, _tmp29_, -1);
-#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
-#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp30_);
-#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
find_button = _tmp30_;
-#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = find_button;
-#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
-#line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = find_button;
-#line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
-#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = find_button;
-#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp36_);
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp37_ = _tmp36_;
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp37_);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp38_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp38_);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_selected_button = _tmp38_;
-#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = import_selected_button;
-#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_button_set_icon_name (_tmp39_, "import");
-#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = import_selected_button;
-#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_button_set_label (_tmp40_, _ ("Import _Selected"));
-#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = import_selected_button;
-#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = import_selected_button;
-#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_button_set_use_underline (_tmp42_, TRUE);
-#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = import_selected_button;
-#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
-#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = import_selected_button;
-#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp46_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
-#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp46_);
-#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_all_button = _tmp46_;
-#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp47_ = import_all_button;
-#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_button_set_icon_name (_tmp47_, "import-all");
-#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = import_all_button;
-#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_button_set_label (_tmp48_, _ ("Import _All"));
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = import_all_button;
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = import_all_button;
-#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_tool_button_set_use_underline (_tmp50_, TRUE);
-#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp51_ = import_all_button;
-#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = import_all_button;
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp54_ = self->priv->progress_bar;
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 844 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_toolbar_state (self);
-#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 839 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_all_button);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_selected_button);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (find_button);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (progress_item);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (separator);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (hide_item);
-#line 6026 "ImportPage.c"
+#line 6027 "ImportPage.c"
}
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp56_;
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6036 "ImportPage.c"
+#line 6037 "ImportPage.c"
}
static gpointer _core_tracker_ref0 (gpointer self) {
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? core_tracker_ref (self) : NULL;
-#line 6043 "ImportPage.c"
+#line 6044 "ImportPage.c"
}
@@ -6049,17 +6050,17 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas
CoreViewTracker* result = NULL;
CameraViewTracker* _tmp0_;
CoreViewTracker* _tmp1_;
-#line 852 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->tracker;
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6062 "ImportPage.c"
+#line 6063 "ImportPage.c"
}
@@ -6067,15 +6068,15 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
ImportPage * self;
gchar* result = NULL;
gchar* _tmp0_;
-#line 856 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = g_strdup (_ ("The camera seems to be empty. No photos/videos found to import"));
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6078 "ImportPage.c"
+#line 6079 "ImportPage.c"
}
@@ -6083,15 +6084,15 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba
ImportPage * self;
gchar* result = NULL;
gchar* _tmp0_;
-#line 860 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = g_strdup (_ ("No new photos/videos found on camera"));
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6094 "ImportPage.c"
+#line 6095 "ImportPage.c"
}
@@ -6106,33 +6107,33 @@ static gint64 import_page_preview_comparator (void* a, void* b) {
ImportSource* _tmp6_;
time_t _tmp7_;
gint64 _tmp8_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = a;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp1_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_source_get_exposure_time (_tmp2_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = b;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp4_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp5_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = import_source_get_exposure_time (_tmp6_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = (gint64) (_tmp3_ - _tmp7_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp6_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp2_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp8_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6135 "ImportPage.c"
+#line 6136 "ImportPage.c"
}
@@ -6140,19 +6141,19 @@ static gboolean import_page_preview_comparator_predicate (DataObject* object, Al
gboolean result = FALSE;
Alteration* _tmp0_;
gboolean _tmp1_;
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = alteration;
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time");
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6155 "ImportPage.c"
+#line 6156 "ImportPage.c"
}
@@ -6162,21 +6163,21 @@ static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void
time_t _tmp1_;
void* _tmp2_;
time_t _tmp3_;
-#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL);
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = a;
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob));
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = b;
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp2_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob));
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = (gint64) (_tmp1_ - _tmp3_);
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6179 "ImportPage.c"
+#line 6180 "ImportPage.c"
}
@@ -6184,26 +6185,26 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_
ImportPage * self;
GeeList* _tmp0_;
GeeList* _tmp1_;
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = ui_filenames;
-#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
PAGE_CLASS (import_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = ui_filenames;
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
-#line 6199 "ImportPage.c"
+#line 6200 "ImportPage.c"
}
static GVariant* _variant_new15 (gboolean value) {
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6206 "ImportPage.c"
+#line 6207 "ImportPage.c"
}
@@ -6217,83 +6218,83 @@ static void import_page_real_add_actions (Page* base, GActionMap* map) {
ConfigFacade* _tmp5_;
gboolean _tmp6_;
GVariant* _tmp7_;
-#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = map;
-#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = map;
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_action_map_add_action_entries (_tmp1_, IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = config_facade_get_instance ();
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _tmp4_;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _variant_new15 (_tmp6_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_action_change_state (_tmp3_, _tmp7_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_variant_unref0 (_tmp7_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp5_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
-#line 6252 "ImportPage.c"
+#line 6253 "ImportPage.c"
}
static void import_page_real_remove_actions (Page* base, GActionMap* map) {
ImportPage * self;
GActionMap* _tmp0_;
-#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = map;
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
PAGE_CLASS (import_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 6267 "ImportPage.c"
+#line 6268 "ImportPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
gint _entry_collection_size_ = 0;
gint entry_it = 0;
-#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
entry_collection = IMPORT_PAGE_entries;
-#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
entry_collection_length1 = G_N_ELEMENTS (IMPORT_PAGE_entries);
-#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_PAGE_entries); entry_it = entry_it + 1) {
-#line 6279 "ImportPage.c"
+#line 6280 "ImportPage.c"
GActionEntry entry = {0};
-#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
entry = entry_collection[entry_it];
-#line 6283 "ImportPage.c"
+#line 6284 "ImportPage.c"
{
GActionMap* _tmp1_;
GActionEntry _tmp2_;
const gchar* _tmp3_;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = map;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = entry;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_.name;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 6296 "ImportPage.c"
+#line 6297 "ImportPage.c"
}
}
}
@@ -6304,17 +6305,17 @@ Camera* import_page_get_camera (ImportPage* self) {
Camera* result = NULL;
Camera* _tmp0_;
Camera* _tmp1_;
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->camera;
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6317 "ImportPage.c"
+#line 6318 "ImportPage.c"
}
@@ -6322,32 +6323,32 @@ gchar* import_page_get_uri (ImportPage* self) {
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
-#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->uri;
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6335 "ImportPage.c"
+#line 6336 "ImportPage.c"
}
gboolean import_page_is_busy (ImportPage* self) {
gboolean result = FALSE;
gboolean _tmp0_;
-#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->busy;
-#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
-#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6350 "ImportPage.c"
+#line 6351 "ImportPage.c"
}
@@ -6355,21 +6356,21 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
ImportPage * self;
gint _tmp0_;
gint _tmp1_;
-#line 917 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", TRUE);
-#line 921 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE);
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", TRUE);
+#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE);
+#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = selected_count;
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = count;
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 6372 "ImportPage.c"
+#line 6373 "ImportPage.c"
}
@@ -6377,29 +6378,29 @@ gboolean import_page_is_refreshed (ImportPage* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_;
-#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 919 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->refreshed;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6386 "ImportPage.c"
+#line 6387 "ImportPage.c"
gboolean _tmp2_;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = !_tmp2_;
-#line 6392 "ImportPage.c"
+#line 6393 "ImportPage.c"
} else {
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6396 "ImportPage.c"
+#line 6397 "ImportPage.c"
}
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6402 "ImportPage.c"
+#line 6403 "ImportPage.c"
}
@@ -6407,130 +6408,130 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
gchar* result = NULL;
gchar* msg = NULL;
const gchar* _tmp0_;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 931 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = NULL;
-#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->refresh_error;
-#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 6418 "ImportPage.c"
+#line 6419 "ImportPage.c"
const gchar* _tmp1_;
gchar* _tmp2_;
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->refresh_error;
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (msg);
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp2_;
-#line 6429 "ImportPage.c"
+#line 6430 "ImportPage.c"
} else {
int _tmp3_;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->refresh_result;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp3_ == GP_OK) {
-#line 6436 "ImportPage.c"
+#line 6437 "ImportPage.c"
} else {
int _tmp4_;
gchar* _tmp5_;
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->refresh_result;
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = gp_result_to_full_string (_tmp4_);
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (msg);
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp5_;
-#line 6448 "ImportPage.c"
+#line 6449 "ImportPage.c"
}
}
-#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = msg;
-#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6455 "ImportPage.c"
+#line 6456 "ImportPage.c"
}
static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) {
gboolean _tmp0_;
gboolean _tmp1_;
-#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = busy;
-#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->busy = _tmp0_;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = refreshed;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refreshed = _tmp1_;
-#line 947 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 6474 "ImportPage.c"
+#line 6475 "ImportPage.c"
}
static void import_page_update_toolbar_state (ImportPage* self) {
GtkCheckButton* _tmp0_;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->hide_imported;
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 6486 "ImportPage.c"
+#line 6487 "ImportPage.c"
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
gboolean _tmp3_;
GtkCheckButton* _tmp8_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->busy;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp3_) {
-#line 6495 "ImportPage.c"
+#line 6496 "ImportPage.c"
gboolean _tmp4_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->refreshed;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp4_;
-#line 6501 "ImportPage.c"
+#line 6502 "ImportPage.c"
} else {
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = FALSE;
-#line 6505 "ImportPage.c"
+#line 6506 "ImportPage.c"
}
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 6509 "ImportPage.c"
+#line 6510 "ImportPage.c"
ViewCollection* _tmp5_;
ViewCollection* _tmp6_;
gint _tmp7_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp5_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = view_collection_get_unfiltered_count (_tmp6_);
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp7_ > 0;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp6_);
-#line 6523 "ImportPage.c"
+#line 6524 "ImportPage.c"
} else {
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6527 "ImportPage.c"
+#line 6528 "ImportPage.c"
}
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->hide_imported;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6533 "ImportPage.c"
+#line 6534 "ImportPage.c"
}
}
@@ -6544,129 +6545,129 @@ static void import_page_on_view_changed (ImportPage* self) {
gboolean _tmp9_;
gboolean _tmp14_ = FALSE;
gboolean _tmp15_;
-#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp2_) {
-#line 6553 "ImportPage.c"
+#line 6554 "ImportPage.c"
gboolean _tmp3_;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->refreshed;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp3_;
-#line 6559 "ImportPage.c"
+#line 6560 "ImportPage.c"
} else {
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6563 "ImportPage.c"
+#line 6564 "ImportPage.c"
}
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6567 "ImportPage.c"
+#line 6568 "ImportPage.c"
ViewCollection* _tmp4_;
ViewCollection* _tmp5_;
gint _tmp6_;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _tmp4_;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp6_ > 0;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp5_);
-#line 6581 "ImportPage.c"
+#line 6582 "ImportPage.c"
} else {
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6585 "ImportPage.c"
+#line 6586 "ImportPage.c"
}
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = self->priv->busy;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp9_) {
-#line 6593 "ImportPage.c"
+#line 6594 "ImportPage.c"
gboolean _tmp10_;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = self->priv->refreshed;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = _tmp10_;
-#line 6599 "ImportPage.c"
+#line 6600 "ImportPage.c"
} else {
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = FALSE;
-#line 6603 "ImportPage.c"
+#line 6604 "ImportPage.c"
}
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp8_) {
-#line 6607 "ImportPage.c"
+#line 6608 "ImportPage.c"
ViewCollection* _tmp11_;
ViewCollection* _tmp12_;
gint _tmp13_;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = _tmp11_;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _tmp13_ > 0;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp12_);
-#line 6621 "ImportPage.c"
+#line 6622 "ImportPage.c"
} else {
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = FALSE;
-#line 6625 "ImportPage.c"
+#line 6626 "ImportPage.c"
}
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = self->priv->busy;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp15_) {
-#line 6633 "ImportPage.c"
+#line 6634 "ImportPage.c"
ViewCollection* _tmp16_;
ViewCollection* _tmp17_;
gint _tmp18_;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = _tmp16_;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = _tmp18_ > 0;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp17_);
-#line 6647 "ImportPage.c"
+#line 6648 "ImportPage.c"
} else {
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = FALSE;
-#line 6651 "ImportPage.c"
+#line 6652 "ImportPage.c"
}
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_);
-#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_toolbar_state (self);
-#line 6657 "ImportPage.c"
+#line 6658 "ImportPage.c"
}
static void import_page_on_media_added_removed (ImportPage* self) {
ImportPageImportPageSearchViewFilter* _tmp0_;
-#line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->search_filter;
-#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6669 "ImportPage.c"
+#line 6670 "ImportPage.c"
}
@@ -6678,33 +6679,33 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti
ConfigFacade* _tmp3_;
GSimpleAction* _tmp4_;
GVariant* _tmp5_;
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = value;
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
display = _tmp1_;
-#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = config_facade_get_instance ();
-#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_;
-#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
-#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = action;
-#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = value;
-#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6707 "ImportPage.c"
+#line 6708 "ImportPage.c"
}
@@ -6713,36 +6714,204 @@ static void import_page_real_switched_to (Page* base) {
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
gboolean _tmp2_;
-#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = config_facade_get_instance ();
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp0_;
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp2_);
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp1_);
-#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
PAGE_CLASS (import_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 6730 "ImportPage.c"
+#line 6731 "ImportPage.c"
}
static void import_page_real_ready (Page* base) {
ImportPage * self;
ImportPageHideImportedViewFilter* _tmp0_;
-#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_try_refreshing_camera (self, FALSE);
-#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->hide_imported_filter;
-#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6745 "ImportPage.c"
+#line 6746 "ImportPage.c"
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+ glong result = 0L;
+ gchar* end = NULL;
+ gchar* _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = str;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = maxlen;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ end = _tmp2_;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp3_ = end;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp3_ == NULL) {
+#line 6769 "ImportPage.c"
+ glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp4_ = maxlen;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ return result;
+#line 6777 "ImportPage.c"
+ } else {
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp5_ = end;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp6_ = str;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp5_ - _tmp6_);
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ return result;
+#line 6789 "ImportPage.c"
+ }
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+ gchar* result = NULL;
+ glong string_length = 0L;
+ gboolean _tmp0_ = FALSE;
+ glong _tmp1_;
+ glong _tmp8_;
+ glong _tmp14_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ glong _tmp21_;
+ gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (self != NULL, NULL);
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = offset;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp1_ >= ((glong) 0)) {
+#line 6813 "ImportPage.c"
+ glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp2_ = len;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = _tmp2_ >= ((glong) 0);
+#line 6819 "ImportPage.c"
+ } else {
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = FALSE;
+#line 6823 "ImportPage.c"
+ }
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 6827 "ImportPage.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp3_ = offset;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp4_ = len;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ string_length = _tmp5_;
+#line 6839 "ImportPage.c"
+ } else {
+ gint _tmp6_;
+ gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp6_ = strlen (self);
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp6_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp7_;
+#line 6849 "ImportPage.c"
+ }
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp8_ = offset;
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp8_ < ((glong) 0)) {
+#line 6855 "ImportPage.c"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp9_ = string_length;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp10_ = offset;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ offset = _tmp9_ + _tmp10_;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp11_ = offset;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 6869 "ImportPage.c"
+ } else {
+ glong _tmp12_;
+ glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp12_ = offset;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp13_ = string_length;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 6879 "ImportPage.c"
+ }
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp14_ = len;
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp14_ < ((glong) 0)) {
+#line 6885 "ImportPage.c"
+ glong _tmp15_;
+ glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp15_ = string_length;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp16_ = offset;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ len = _tmp15_ - _tmp16_;
+#line 6894 "ImportPage.c"
+ }
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp17_ = offset;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp18_ = len;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp19_ = string_length;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp20_ = offset;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp21_ = len;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp22_;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ return result;
+#line 6914 "ImportPage.c"
}
@@ -6753,50 +6922,50 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
ImportPageRefreshResult _tmp3_;
ImportPageRefreshResult _tmp4_;
GError * _inner_error_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->refreshed;
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
-#line 6764 "ImportPage.c"
+#line 6933 "ImportPage.c"
} else {
gboolean _tmp2_;
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp2_;
-#line 6771 "ImportPage.c"
+#line 6940 "ImportPage.c"
}
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 6777 "ImportPage.c"
+#line 6946 "ImportPage.c"
}
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_page_refresh_camera (self);
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
res = _tmp3_;
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = res;
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
switch (_tmp4_) {
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_OK:
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6791 "ImportPage.c"
+#line 6960 "ImportPage.c"
{
-#line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 6795 "ImportPage.c"
+#line 6964 "ImportPage.c"
}
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6799 "ImportPage.c"
+#line 6968 "ImportPage.c"
{
gboolean _tmp5_;
const gchar* _tmp6_;
@@ -6804,278 +6973,385 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
const gchar* _tmp7_;
GFile* _tmp8_;
GMount* mount = NULL;
- GMount* _tmp13_;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gboolean _tmp13_ = FALSE;
+ GMount* _tmp14_;
+ GMount* _tmp27_;
+#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = fail_on_locked;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 6816 "ImportPage.c"
+#line 6987 "ImportPage.c"
}
-#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = self->priv->uri;
-#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1008: Checking if %s is mounted…", _tmp6_);
-#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1001: Checking if %s is mounted…", _tmp6_);
+#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = self->priv->uri;
-#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
uri = _tmp8_;
-#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
mount = NULL;
-#line 6830 "ImportPage.c"
+#line 7001 "ImportPage.c"
{
GMount* _tmp9_ = NULL;
GFile* _tmp10_;
GMount* _tmp11_;
GMount* _tmp12_;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = uri;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp11_;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6844 "ImportPage.c"
- goto __catch66_g_error;
+#line 7015 "ImportPage.c"
+ goto __catch73_g_error;
}
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = _tmp9_;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
mount = _tmp12_;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
-#line 6857 "ImportPage.c"
+#line 7028 "ImportPage.c"
}
- goto __finally66;
- __catch66_g_error:
+ goto __finally73;
+ __catch73_g_error:
{
GError* err = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 6869 "ImportPage.c"
+#line 7040 "ImportPage.c"
}
- __finally66:
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ __finally73:
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (uri);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 6884 "ImportPage.c"
+#line 7055 "ImportPage.c"
}
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = mount;
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp13_ != NULL) {
-#line 6890 "ImportPage.c"
- gchar* mounted_message = NULL;
- gchar* _tmp14_;
- GtkMessageDialog* dialog = NULL;
- AppWindow* _tmp15_;
- AppWindow* _tmp16_;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp14_ = mount;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp14_ == NULL) {
+#line 7061 "ImportPage.c"
+ const gchar* _tmp15_;
+ gboolean _tmp16_;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp15_ = self->priv->uri;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp16_ = g_str_has_prefix (_tmp15_, "gphoto2");
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp13_ = _tmp16_;
+#line 7070 "ImportPage.c"
+ } else {
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp13_ = FALSE;
+#line 7074 "ImportPage.c"
+ }
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp13_) {
+#line 7078 "ImportPage.c"
const gchar* _tmp17_;
- GtkMessageDialog* _tmp18_;
- GtkMessageDialog* _tmp19_;
- GtkMessageDialog* _tmp20_;
- GtkMessageDialog* _tmp21_;
- gint dialog_res = 0;
- GtkMessageDialog* _tmp22_;
- gint _tmp23_;
- GtkMessageDialog* _tmp24_;
- gint _tmp25_;
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
-"ccess it. Continue?"));
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- mounted_message = _tmp14_;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = app_window_get_instance ();
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = _tmp15_;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = mounted_message;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp17_);
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp18_);
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
+ GFile* _tmp22_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp17_ = self->priv->uri;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp18_ = string_substring (_tmp17_, (glong) 7, (glong) -1);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _tmp18_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp20_ = g_strconcat ("mtp", _tmp19_, NULL);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp21_ = _tmp20_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp22_ = g_file_new_for_uri (_tmp21_);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (uri);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ uri = _tmp22_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp21_);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp19_);
+#line 7105 "ImportPage.c"
+ {
+ GMount* _tmp23_ = NULL;
+ GFile* _tmp24_;
+ GMount* _tmp25_;
+ GMount* _tmp26_;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp24_ = uri;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp25_ = g_file_find_enclosing_mount (_tmp24_, NULL, &_inner_error_);
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp23_ = _tmp25_;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 7119 "ImportPage.c"
+ goto __catch74_g_error;
+ }
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp26_ = _tmp23_;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp23_ = NULL;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (mount);
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ mount = _tmp26_;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (_tmp23_);
+#line 7132 "ImportPage.c"
+ }
+ goto __finally74;
+ __catch74_g_error:
+ {
+ GError* err = NULL;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ err = _inner_error_;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _inner_error_ = NULL;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_error_free0 (err);
+#line 7144 "ImportPage.c"
+ }
+ __finally74:
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (mount);
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (uri);
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_clear_error (&_inner_error_);
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ return;
+#line 7159 "ImportPage.c"
+ }
+ }
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp16_);
+ _tmp27_ = mount;
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog = _tmp19_;
-#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = dialog;
-#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+ if (_tmp27_ != NULL) {
+#line 7166 "ImportPage.c"
+ gchar* mounted_message = NULL;
+ gchar* _tmp28_;
+ GtkMessageDialog* dialog = NULL;
+ AppWindow* _tmp29_;
+ AppWindow* _tmp30_;
+ const gchar* _tmp31_;
+ GtkMessageDialog* _tmp32_;
+ GtkMessageDialog* _tmp33_;
+ GtkMessageDialog* _tmp34_;
+ GtkMessageDialog* _tmp35_;
+ gint dialog_res = 0;
+ GtkMessageDialog* _tmp36_;
+ gint _tmp37_;
+ GtkMessageDialog* _tmp38_;
+ gint _tmp39_;
+#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp28_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
+"ccess it. Continue?"));
+#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ mounted_message = _tmp28_;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp29_ = app_window_get_instance ();
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp30_ = _tmp29_;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp31_ = mounted_message;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp31_);
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = dialog;
+ g_object_ref_sink (_tmp32_);
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
-#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = dialog;
-#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
-#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog_res = _tmp23_;
-#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = dialog;
-#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
+ _tmp33_ = _tmp32_;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (_tmp30_);
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ dialog = _tmp33_;
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp34_ = dialog;
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = dialog_res;
+ _tmp35_ = dialog;
#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp25_ != ((gint) GTK_RESPONSE_YES)) {
+ gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
+#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp36_ = dialog;
+#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ dialog_res = _tmp37_;
+#line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp38_ = dialog;
+#line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
+#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp39_ = dialog_res;
+#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp39_ != ((gint) GTK_RESPONSE_YES)) {
+#line 1036 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please unmount the camera."));
-#line 6950 "ImportPage.c"
+#line 7226 "ImportPage.c"
} else {
- GMount* _tmp26_;
-#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = mount;
-#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_unmount_camera (self, _tmp26_);
-#line 6957 "ImportPage.c"
+ GMount* _tmp40_;
+#line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp40_ = mount;
+#line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_unmount_camera (self, _tmp40_);
+#line 7233 "ImportPage.c"
}
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dialog);
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (mounted_message);
-#line 6963 "ImportPage.c"
+#line 7239 "ImportPage.c"
} else {
gchar* locked_message = NULL;
- gchar* _tmp27_;
+ gchar* _tmp41_;
GtkMessageDialog* dialog = NULL;
- AppWindow* _tmp28_;
- AppWindow* _tmp29_;
- const gchar* _tmp30_;
- GtkMessageDialog* _tmp31_;
- GtkMessageDialog* _tmp32_;
- GtkMessageDialog* _tmp33_;
- GtkMessageDialog* _tmp34_;
- GtkMessageDialog* _tmp35_;
-#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \
+ AppWindow* _tmp42_;
+ AppWindow* _tmp43_;
+ const gchar* _tmp44_;
+ GtkMessageDialog* _tmp45_;
+ GtkMessageDialog* _tmp46_;
+ GtkMessageDialog* _tmp47_;
+ GtkMessageDialog* _tmp48_;
+ GtkMessageDialog* _tmp49_;
+#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp41_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \
"the camera when it’s unlocked. Please close any other application usin" \
"g the camera and try again."));
-#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- locked_message = _tmp27_;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = app_window_get_instance ();
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = _tmp28_;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = locked_message;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp30_);
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp31_);
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = _tmp31_;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp29_);
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog = _tmp32_;
-#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = dialog;
-#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ locked_message = _tmp41_;
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = dialog;
+ _tmp42_ = app_window_get_instance ();
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_dialog_get_type (), GtkDialog));
-#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = dialog;
-#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
+ _tmp43_ = _tmp42_;
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp44_ = locked_message;
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp45_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp44_);
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_object_ref_sink (_tmp45_);
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp46_ = _tmp45_;
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (_tmp43_);
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ dialog = _tmp46_;
+#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp47_ = dialog;
#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+#line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp48_ = dialog;
+#line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_dialog_get_type (), GtkDialog));
+#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp49_ = dialog;
+#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+#line 1051 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please close any other application using the camera."));
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dialog);
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (locked_message);
-#line 7014 "ImportPage.c"
+#line 7290 "ImportPage.c"
}
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (uri);
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7022 "ImportPage.c"
+#line 7298 "ImportPage.c"
}
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7026 "ImportPage.c"
+#line 7302 "ImportPage.c"
{
- gchar* _tmp36_;
- gchar* _tmp37_;
- gchar* _tmp38_;
- gchar* _tmp39_;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = import_page_get_refresh_message (self);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = _tmp36_;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp37_);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = _tmp38_;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- app_window_error_message (_tmp39_, NULL);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp39_);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp37_);
-#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp50_;
+ gchar* _tmp51_;
+ gchar* _tmp52_;
+ gchar* _tmp53_;
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp50_ = import_page_get_refresh_message (self);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp51_ = _tmp50_;
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp52_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp51_);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp53_ = _tmp52_;
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ app_window_error_message (_tmp53_, NULL);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp53_);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp51_);
+#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7048 "ImportPage.c"
+#line 7324 "ImportPage.c"
}
default:
{
- ImportPageRefreshResult _tmp40_;
-#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = res;
-#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp40_);
-#line 7057 "ImportPage.c"
+ ImportPageRefreshResult _tmp54_;
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp54_ = res;
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_error ("ImportPage.vala:1061: Unknown result type %d", (gint) _tmp54_);
+#line 7333 "ImportPage.c"
}
}
}
static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) {
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 7066 "ImportPage.c"
+#line 7342 "ImportPage.c"
}
static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_unref (self);
-#line 7075 "ImportPage.c"
+#line 7351 "ImportPage.c"
}
@@ -7092,65 +7368,65 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
AppWindow* _tmp8_;
GtkMountOperation* _tmp9_;
GtkMountOperation* _tmp10_;
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
-#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->busy;
-#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7104 "ImportPage.c"
+#line 7380 "ImportPage.c"
}
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, TRUE, FALSE);
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->progress_bar;
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->progress_bar;
-#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_fraction (_tmp2_, 0.0);
-#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->progress_bar;
-#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_NONE);
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->progress_bar;
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_text (_tmp4_, _ ("Unmounting…"));
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = mount;
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (_tmp5_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
-#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1076: Unmounting camera…");
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1080: Unmounting camera…");
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = mount;
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = app_window_get_instance ();
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = _tmp7_;
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _tmp9_;
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_mount_unmount_with_operation (_tmp6_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp10_);
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp8_);
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7150 "ImportPage.c"
+#line 7426 "ImportPage.c"
}
@@ -7159,35 +7435,35 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
GObject* _tmp0_;
GMount* _tmp1_;
GError * _inner_error_ = NULL;
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail ((source == NULL) || G_IS_OBJECT (source));
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_ASYNC_RESULT (aresult));
-#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1084: Async unmount finished");
-#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1088: Async unmount finished");
+#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = source;
-#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount));
-#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
mount = _tmp1_;
-#line 7173 "ImportPage.c"
+#line 7449 "ImportPage.c"
{
GAsyncResult* _tmp2_;
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = aresult;
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7182 "ImportPage.c"
- goto __catch67_g_error;
+#line 7458 "ImportPage.c"
+ goto __catch75_g_error;
}
}
- goto __finally67;
- __catch67_g_error:
+ goto __finally75;
+ __catch75_g_error:
{
GError* err = NULL;
guint _tmp3_;
@@ -7195,52 +7471,52 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
GtkProgressBar* _tmp5_;
GtkProgressBar* _tmp6_;
GtkProgressBar* _tmp7_;
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp3_, NULL, FALSE);
-#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_handlers_disconnect_matched (mount, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _import_page_on_unmounted_g_mount_unmounted, self);
-#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->refreshed;
-#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, _tmp4_);
-#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = self->priv->progress_bar;
-#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_ellipsize (_tmp5_, PANGO_ELLIPSIZE_NONE);
-#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = self->priv->progress_bar;
-#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_text (_tmp6_, "");
-#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = self->priv->progress_bar;
-#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 7223 "ImportPage.c"
+#line 7499 "ImportPage.c"
}
- __finally67:
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ __finally75:
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 7236 "ImportPage.c"
+#line 7512 "ImportPage.c"
}
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 7240 "ImportPage.c"
+#line 7516 "ImportPage.c"
}
@@ -7249,31 +7525,31 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
GtkProgressBar* _tmp1_;
GtkProgressBar* _tmp2_;
GtkProgressBar* _tmp3_;
-#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_MOUNT (mount));
-#line 1103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1103: on_unmounted");
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1107: on_unmounted");
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->refreshed;
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, _tmp0_);
-#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->progress_bar;
-#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_ellipsize (_tmp1_, PANGO_ELLIPSIZE_NONE);
-#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->progress_bar;
-#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_text (_tmp2_, "");
-#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->progress_bar;
-#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_try_refreshing_camera (self, TRUE);
-#line 7273 "ImportPage.c"
+#line 7549 "ImportPage.c"
}
@@ -7282,23 +7558,23 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
SourceCollection* _tmp0_;
Marker* _tmp1_;
SourceCollection* _tmp2_;
-#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->import_sources;
-#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
marker = _tmp1_;
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
marker_mark_all (marker);
-#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1120 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->import_sources;
-#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1120 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
-#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (marker);
-#line 7298 "ImportPage.c"
+#line 7574 "ImportPage.c"
}
@@ -7332,93 +7608,93 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
gint list_len = 0;
CameraList* _tmp15_;
gint _tmp16_;
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (dir != NULL, FALSE);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (search_target != NULL, FALSE);
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->camera;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->camera_name;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = fsid;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = dir;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- fulldir = _tmp4_;
#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ fulldir = _tmp4_;
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = gp_list_new (&_tmp5_);
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
folders = _tmp5_;
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_result_ = _tmp6_;
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _result_;
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp7_ != GP_OK) {
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7370 "ImportPage.c"
+#line 7646 "ImportPage.c"
}
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->camera;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = fulldir;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = folders;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = import_page_spin_idle_context;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = gp_camera_folder_list_folders (_tmp8_, _tmp9_, _tmp10_, _tmp12_);
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_result_ = _tmp13_;
-#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = _result_;
-#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp14_ != GP_OK) {
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7398 "ImportPage.c"
+#line 7674 "ImportPage.c"
}
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = folders;
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = gp_list_count (_tmp15_);
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_len = _tmp16_;
-#line 7406 "ImportPage.c"
+#line 7682 "ImportPage.c"
{
gint list_index = 0;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_index = 0;
-#line 7411 "ImportPage.c"
+#line 7687 "ImportPage.c"
{
gboolean _tmp17_ = FALSE;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = TRUE;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 7418 "ImportPage.c"
+#line 7694 "ImportPage.c"
gint _tmp19_;
gint _tmp20_;
gchar* tmp = NULL;
@@ -7428,73 +7704,94 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
gchar* _tmp24_;
const gchar* _tmp25_;
const gchar* _tmp26_;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp17_) {
-#line 7430 "ImportPage.c"
+#line 7706 "ImportPage.c"
gint _tmp18_;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = list_index;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_index = _tmp18_ + 1;
-#line 7436 "ImportPage.c"
+#line 7712 "ImportPage.c"
}
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = FALSE;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = list_index;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = list_len;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!(_tmp19_ < _tmp20_)) {
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7448 "ImportPage.c"
+#line 7724 "ImportPage.c"
}
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = folders;
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = list_index;
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gp_list_get_name (_tmp21_, _tmp22_, &_tmp23_);
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (tmp);
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = g_strdup (_tmp23_);
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
tmp = _tmp24_;
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = tmp;
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = search_target;
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (g_strcmp0 (_tmp25_, _tmp26_) == 0) {
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (tmp);
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7478 "ImportPage.c"
+#line 7754 "ImportPage.c"
}
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (tmp);
-#line 7482 "ImportPage.c"
+#line 7758 "ImportPage.c"
}
}
}
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ return result;
+#line 7770 "ImportPage.c"
+}
+
+
+static gboolean ____lambda18_ (ImportPage* self) {
+ gboolean result = FALSE;
+#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_refresh_camera (self);
+#line 1181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ result = FALSE;
+#line 1181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7494 "ImportPage.c"
+#line 7782 "ImportPage.c"
+}
+
+
+static gboolean _____lambda18__gsource_func (gpointer self) {
+ gboolean result;
+ result = ____lambda18_ ((ImportPage*) self);
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ return result;
+#line 7791 "ImportPage.c"
}
@@ -7507,174 +7804,205 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
GPContext* _tmp4_;
int _tmp5_;
int _tmp6_;
- gboolean _tmp12_;
- GtkProgressBar* _tmp13_;
- GtkProgressBar* _tmp14_;
- GtkProgressBar* _tmp15_;
- GtkProgressBar* _tmp16_;
+ int _tmp10_;
+ gboolean _tmp16_;
GtkProgressBar* _tmp17_;
+ GtkProgressBar* _tmp18_;
+ GtkProgressBar* _tmp19_;
+ GtkProgressBar* _tmp20_;
+ GtkProgressBar* _tmp21_;
GeeArrayList* import_list = NULL;
- GeeArrayList* _tmp18_;
+ GeeArrayList* _tmp22_;
CameraStorageInformation* sifs = NULL;
gint count = 0;
- Camera* _tmp19_;
- GPSpinIdleWrapper* _tmp20_;
- GPContext* _tmp21_;
- gint _tmp22_ = 0;
- int _tmp23_;
- int _tmp24_;
- GeeArrayList* _tmp73_;
- GeeArrayList* _tmp74_;
- GtkProgressBar* _tmp75_;
- GtkProgressBar* _tmp76_;
- GtkProgressBar* _tmp77_;
- GtkProgressBar* _tmp78_;
+ Camera* _tmp23_;
+ GPSpinIdleWrapper* _tmp24_;
+ GPContext* _tmp25_;
+ gint _tmp26_ = 0;
+ int _tmp27_;
+ int _tmp28_;
+ GeeArrayList* _tmp77_;
+ GeeArrayList* _tmp78_;
+ GtkProgressBar* _tmp79_;
+ GtkProgressBar* _tmp80_;
+ GtkProgressBar* _tmp81_;
+ GtkProgressBar* _tmp82_;
int res = 0;
- Camera* _tmp79_;
- GPSpinIdleWrapper* _tmp80_;
- GPContext* _tmp81_;
- int _tmp82_;
- int _tmp83_;
+ Camera* _tmp83_;
+ GPSpinIdleWrapper* _tmp84_;
+ GPContext* _tmp85_;
+ int _tmp86_;
int _tmp87_;
- int _tmp92_;
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ int _tmp91_;
+ int _tmp96_;
+#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), 0);
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->busy;
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7547 "ImportPage.c"
+#line 7845 "ImportPage.c"
}
-#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Starting import, please wait…"));
-#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Connecting to camera, please wait…"));
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->busy;
-#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, _tmp1_, FALSE);
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->refresh_error);
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_error = NULL;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->camera;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_page_spin_idle_context;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = gp_camera_init (_tmp2_, _tmp4_);
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = _tmp5_;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = self->priv->refresh_result;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp6_ != GP_OK) {
-#line 7573 "ImportPage.c"
- int _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- ImportPageRefreshResult _tmp10_ = 0;
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp6_ == GP_ERROR_IO_USB_CLAIM) {
+#line 7871 "ImportPage.c"
+ gint _tmp7_;
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp7_ = self->priv->claim_timeout;
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp7_ < 4000) {
+#line 7877 "ImportPage.c"
+ gint _tmp8_;
+ gint _tmp9_;
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp8_ = self->priv->claim_timeout;
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp8_, _____lambda18__gsource_func, g_object_ref (self), g_object_unref);
+#line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp9_ = self->priv->claim_timeout;
+#line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->claim_timeout = _tmp9_ * 2;
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ return result;
+#line 7892 "ImportPage.c"
+ }
+ }
+#line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->claim_timeout = 500;
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp10_ = self->priv->refresh_result;
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp10_ != GP_OK) {
+#line 7901 "ImportPage.c"
int _tmp11_;
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = self->priv->refresh_result;
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = gp_result_to_full_string (_tmp7_);
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp8_;
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp9_);
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp9_);
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp12_;
+ gchar* _tmp13_;
+ ImportPageRefreshResult _tmp14_ = 0;
+ int _tmp15_;
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = self->priv->refresh_result;
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp11_ == GP_ERROR_IO_LOCK) {
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7595 "ImportPage.c"
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp12_ = gp_result_to_full_string (_tmp11_);
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp13_ = _tmp12_;
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1193: Unable to initialize camera: %s", _tmp13_);
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp13_);
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp15_ = self->priv->refresh_result;
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp15_ == GP_ERROR_IO_LOCK) {
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
+#line 7923 "ImportPage.c"
} else {
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7599 "ImportPage.c"
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
+#line 7927 "ImportPage.c"
}
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp10_;
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ result = _tmp14_;
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7605 "ImportPage.c"
+#line 7933 "ImportPage.c"
}
-#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = self->priv->refreshed;
-#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, TRUE, _tmp12_);
-#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Starting import, please wait…"));
+#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp16_ = self->priv->refreshed;
+#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_update_status (self, TRUE, _tmp16_);
+#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = self->priv->progress_bar;
-#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp13_, PANGO_ELLIPSIZE_NONE);
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = self->priv->progress_bar;
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp14_, _ ("Fetching photo information"));
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = self->priv->progress_bar;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp15_, 0.0);
-#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = self->priv->progress_bar;
-#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_pulse_step (_tmp16_, 0.01);
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = self->priv->progress_bar;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_list = _tmp18_;
-#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_ellipsize (_tmp17_, PANGO_ELLIPSIZE_NONE);
+#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp18_ = self->priv->progress_bar;
+#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_text (_tmp18_, _ ("Fetching photo information"));
+#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp19_ = self->priv->progress_bar;
+#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_fraction (_tmp19_, 0.0);
+#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp20_ = self->priv->progress_bar;
+#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_pulse_step (_tmp20_, 0.01);
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp21_ = self->priv->progress_bar;
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp22_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_list = _tmp22_;
+#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
sifs = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
count = 0;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = self->priv->camera;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = import_page_spin_idle_context;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = gp_camera_get_storageinfo (_tmp19_, &sifs, &_tmp22_, _tmp21_);
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- count = _tmp22_;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp23_;
-#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = self->priv->refresh_result;
-#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp24_ == GP_OK) {
-#line 7657 "ImportPage.c"
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp23_ = self->priv->camera;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp24_ = import_page_spin_idle_context;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp27_ = gp_camera_get_storageinfo (_tmp23_, &sifs, &_tmp26_, _tmp25_);
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ count = _tmp26_;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->refresh_result = _tmp27_;
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp28_ = self->priv->refresh_result;
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp28_ == GP_OK) {
+#line 7987 "ImportPage.c"
{
gint fsid = 0;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
fsid = 0;
-#line 7662 "ImportPage.c"
+#line 7992 "ImportPage.c"
{
- gboolean _tmp25_ = FALSE;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = TRUE;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gboolean _tmp29_ = FALSE;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp29_ = TRUE;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 7669 "ImportPage.c"
- gint _tmp27_;
- gint _tmp28_;
+#line 7999 "ImportPage.c"
+ gint _tmp31_;
+ gint _tmp32_;
gboolean got_well_known_dir = FALSE;
- gint _tmp29_;
- gboolean _tmp30_;
gint _tmp33_;
gboolean _tmp34_;
gint _tmp37_;
@@ -7693,382 +8021,384 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
gboolean _tmp62_;
gint _tmp65_;
gboolean _tmp66_;
- gboolean _tmp69_;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp25_) {
-#line 7696 "ImportPage.c"
- gint _tmp26_;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = fsid;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- fsid = _tmp26_ + 1;
-#line 7702 "ImportPage.c"
+ gint _tmp69_;
+ gboolean _tmp70_;
+ gboolean _tmp73_;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!_tmp29_) {
+#line 8026 "ImportPage.c"
+ gint _tmp30_;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp30_ = fsid;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ fsid = _tmp30_ + 1;
+#line 8032 "ImportPage.c"
}
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = FALSE;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = fsid;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = count;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp27_ < _tmp28_)) {
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp29_ = FALSE;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp31_ = fsid;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp32_ = count;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!(_tmp31_ < _tmp32_)) {
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7714 "ImportPage.c"
+#line 8044 "ImportPage.c"
}
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = FALSE;
-#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = fsid;
-#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = import_page_check_directory_exists (self, _tmp29_, "/", "DCIM");
-#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp30_) {
-#line 7724 "ImportPage.c"
- gint _tmp31_;
- GeeArrayList* _tmp32_;
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = fsid;
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = import_list;
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp31_, "/DCIM", _tmp32_);
-#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- got_well_known_dir = TRUE;
-#line 7735 "ImportPage.c"
- }
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = fsid;
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "dcim");
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "DCIM");
+#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp34_) {
-#line 7743 "ImportPage.c"
+#line 8054 "ImportPage.c"
gint _tmp35_;
GeeArrayList* _tmp36_;
-#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = fsid;
-#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = import_list;
-#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp35_, "/dcim", _tmp36_);
-#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp35_, "/DCIM", _tmp36_);
+#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7754 "ImportPage.c"
+#line 8065 "ImportPage.c"
}
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp37_ = fsid;
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/PRIVATE/", "AVCHD");
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/", "dcim");
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp38_) {
-#line 7762 "ImportPage.c"
+#line 8073 "ImportPage.c"
gint _tmp39_;
GeeArrayList* _tmp40_;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = fsid;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = import_list;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp39_, "/PRIVATE/AVCHD", _tmp40_);
-#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp39_, "/dcim", _tmp40_);
+#line 1228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7773 "ImportPage.c"
+#line 8084 "ImportPage.c"
}
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = fsid;
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/private/", "avchd");
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/PRIVATE/", "AVCHD");
+#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp42_) {
-#line 7781 "ImportPage.c"
+#line 8092 "ImportPage.c"
gint _tmp43_;
GeeArrayList* _tmp44_;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = fsid;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp44_ = import_list;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp43_, "/private/avchd", _tmp44_);
-#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp43_, "/PRIVATE/AVCHD", _tmp44_);
+#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7792 "ImportPage.c"
+#line 8103 "ImportPage.c"
}
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = fsid;
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/", "AVCHD");
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/private/", "avchd");
+#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp46_) {
-#line 7800 "ImportPage.c"
+#line 8111 "ImportPage.c"
gint _tmp47_;
GeeArrayList* _tmp48_;
-#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp47_ = fsid;
-#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = import_list;
-#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp47_, "/AVCHD", _tmp48_);
-#line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp47_, "/private/avchd", _tmp48_);
+#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7811 "ImportPage.c"
+#line 8122 "ImportPage.c"
}
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = fsid;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "avchd");
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "AVCHD");
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp50_) {
-#line 7819 "ImportPage.c"
+#line 8130 "ImportPage.c"
gint _tmp51_;
GeeArrayList* _tmp52_;
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp51_ = fsid;
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = import_list;
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp51_, "/avchd", _tmp52_);
-#line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp51_, "/AVCHD", _tmp52_);
+#line 1243 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7830 "ImportPage.c"
+#line 8141 "ImportPage.c"
}
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = fsid;
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/PRIVATE/", "SONY");
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/", "avchd");
+#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp54_) {
-#line 7838 "ImportPage.c"
+#line 8149 "ImportPage.c"
gint _tmp55_;
GeeArrayList* _tmp56_;
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = fsid;
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp56_ = import_list;
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp55_, "/PRIVATE/SONY", _tmp56_);
-#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp55_, "/avchd", _tmp56_);
+#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7849 "ImportPage.c"
+#line 8160 "ImportPage.c"
}
-#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp57_ = fsid;
-#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/private/", "sony");
-#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/PRIVATE/", "SONY");
+#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp58_) {
-#line 7857 "ImportPage.c"
+#line 8168 "ImportPage.c"
gint _tmp59_;
GeeArrayList* _tmp60_;
-#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = fsid;
-#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp60_ = import_list;
-#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp59_, "/private/sony", _tmp60_);
-#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp59_, "/PRIVATE/SONY", _tmp60_);
+#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7868 "ImportPage.c"
+#line 8179 "ImportPage.c"
}
-#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp61_ = fsid;
-#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/", "MP_ROOT");
-#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/private/", "sony");
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp62_) {
-#line 7876 "ImportPage.c"
+#line 8187 "ImportPage.c"
gint _tmp63_;
GeeArrayList* _tmp64_;
-#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp63_ = fsid;
-#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp64_ = import_list;
-#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp63_, "/MP_ROOT", _tmp64_);
-#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp63_, "/private/sony", _tmp64_);
+#line 1258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7887 "ImportPage.c"
+#line 8198 "ImportPage.c"
}
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp65_ = fsid;
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "mp_root");
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "MP_ROOT");
+#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp66_) {
-#line 7895 "ImportPage.c"
+#line 8206 "ImportPage.c"
gint _tmp67_;
GeeArrayList* _tmp68_;
-#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp67_ = fsid;
-#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp68_ = import_list;
-#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp67_, "/mp_root", _tmp68_);
-#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp67_, "/MP_ROOT", _tmp68_);
+#line 1264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7906 "ImportPage.c"
+#line 8217 "ImportPage.c"
}
-#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = got_well_known_dir;
-#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp69_) {
-#line 7912 "ImportPage.c"
- gint _tmp70_;
- GeeArrayList* _tmp71_;
- gboolean _tmp72_;
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = fsid;
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = import_list;
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = import_page_enumerate_files (self, _tmp70_, "/", _tmp71_);
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp72_) {
-#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp69_ = fsid;
+#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp70_ = import_page_check_directory_exists (self, _tmp69_, "/", "mp_root");
+#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp70_) {
+#line 8225 "ImportPage.c"
+ gint _tmp71_;
+ GeeArrayList* _tmp72_;
+#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp71_ = fsid;
+#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp72_ = import_list;
+#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_enumerate_files (self, _tmp71_, "/mp_root", _tmp72_);
+#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ got_well_known_dir = TRUE;
+#line 8236 "ImportPage.c"
+ }
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp73_ = got_well_known_dir;
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!_tmp73_) {
+#line 8242 "ImportPage.c"
+ gint _tmp74_;
+ GeeArrayList* _tmp75_;
+ gboolean _tmp76_;
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp74_ = fsid;
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp75_ = import_list;
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp76_ = import_page_enumerate_files (self, _tmp74_, "/", _tmp75_);
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!_tmp76_) {
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7926 "ImportPage.c"
+#line 8256 "ImportPage.c"
}
}
}
}
}
}
-#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1280 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_clear_all_import_sources (self);
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = import_list;
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_auto_match_raw_jpeg (self, _tmp73_);
-#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = import_list;
-#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_LIST, GeeList));
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = self->priv->progress_bar;
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = self->priv->progress_bar;
-#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp76_, PANGO_ELLIPSIZE_NONE);
-#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = self->priv->progress_bar;
-#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp77_, "");
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = self->priv->progress_bar;
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp78_, 0.0);
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = self->priv->camera;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = import_page_spin_idle_context;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = gp_camera_exit (_tmp79_, _tmp81_);
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp82_;
-#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = res;
-#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp83_ != GP_OK) {
-#line 7973 "ImportPage.c"
- int _tmp84_;
- gchar* _tmp85_;
- gchar* _tmp86_;
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = res;
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = gp_result_to_full_string (_tmp84_);
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = _tmp85_;
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp86_);
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp86_);
-#line 7987 "ImportPage.c"
- }
-#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = self->priv->refresh_result;
-#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp87_ == GP_OK) {
-#line 7993 "ImportPage.c"
- SourceCollection* _tmp88_;
- gint _tmp89_;
-#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = self->priv->import_sources;
-#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp89_ == 0) {
-#line 8002 "ImportPage.c"
- gchar* _tmp90_;
- gchar* _tmp91_;
-#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = _tmp90_;
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp91_);
+ _tmp77_ = import_list;
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp91_);
-#line 8013 "ImportPage.c"
+ import_page_auto_match_raw_jpeg (self, _tmp77_);
+#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp78_ = import_list;
+#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList));
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp79_ = self->priv->progress_bar;
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp80_ = self->priv->progress_bar;
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_ellipsize (_tmp80_, PANGO_ELLIPSIZE_NONE);
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp81_ = self->priv->progress_bar;
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_text (_tmp81_, "");
+#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp82_ = self->priv->progress_bar;
+#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_fraction (_tmp82_, 0.0);
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp83_ = self->priv->camera;
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp84_ = import_page_spin_idle_context;
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp86_ = gp_camera_exit (_tmp83_, _tmp85_);
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ res = _tmp86_;
+#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp87_ = res;
+#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp87_ != GP_OK) {
+#line 8303 "ImportPage.c"
+ int _tmp88_;
+ gchar* _tmp89_;
+ gchar* _tmp90_;
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp88_ = res;
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp89_ = gp_result_to_full_string (_tmp88_);
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp90_ = _tmp89_;
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1305: Unable to unlock camera: %s", _tmp90_);
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp90_);
+#line 8317 "ImportPage.c"
+ }
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp91_ = self->priv->refresh_result;
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp91_ == GP_OK) {
+#line 8323 "ImportPage.c"
+ SourceCollection* _tmp92_;
+ gint _tmp93_;
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp92_ = self->priv->import_sources;
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp93_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_DATA_COLLECTION, DataCollection));
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp93_ == 0) {
+#line 8332 "ImportPage.c"
+ gchar* _tmp94_;
+ gchar* _tmp95_;
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp94_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp95_ = _tmp94_;
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp95_);
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp95_);
+#line 8343 "ImportPage.c"
}
-#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, TRUE);
-#line 8017 "ImportPage.c"
+#line 8347 "ImportPage.c"
} else {
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, FALSE);
-#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_clear_all_import_sources (self);
-#line 8023 "ImportPage.c"
+#line 8353 "ImportPage.c"
}
-#line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = self->priv->refresh_result;
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- switch (_tmp92_) {
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp96_ = self->priv->refresh_result;
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ switch (_tmp96_) {
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_OK:
-#line 8033 "ImportPage.c"
+#line 8363 "ImportPage.c"
{
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_OK;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_list);
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8041 "ImportPage.c"
+#line 8371 "ImportPage.c"
}
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_ERROR_IO_LOCK:
-#line 8045 "ImportPage.c"
+#line 8375 "ImportPage.c"
{
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_list);
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8053 "ImportPage.c"
+#line 8383 "ImportPage.c"
}
default:
{
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_list);
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8063 "ImportPage.c"
+#line 8393 "ImportPage.c"
}
}
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_list);
-#line 8068 "ImportPage.c"
+#line 8398 "ImportPage.c"
}
@@ -8086,7 +8416,7 @@ static gchar string_get (const gchar* self, glong index) {
result = _tmp1_;
#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 8086 "ImportPage.c"
+#line 8416 "ImportPage.c"
}
@@ -8119,7 +8449,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp2_ = start;
#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
-#line 8119 "ImportPage.c"
+#line 8449 "ImportPage.c"
glong _tmp3_;
glong _tmp4_;
#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8128,13 +8458,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp4_ = start;
#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
-#line 8128 "ImportPage.c"
+#line 8458 "ImportPage.c"
}
#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
-#line 8134 "ImportPage.c"
+#line 8464 "ImportPage.c"
glong _tmp6_;
glong _tmp7_;
#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8143,13 +8473,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp7_ = end;
#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
-#line 8143 "ImportPage.c"
+#line 8473 "ImportPage.c"
}
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = start;
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
-#line 8149 "ImportPage.c"
+#line 8479 "ImportPage.c"
glong _tmp10_;
glong _tmp11_;
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8158,11 +8488,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp11_ = string_length;
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8158 "ImportPage.c"
+#line 8488 "ImportPage.c"
} else {
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
-#line 8162 "ImportPage.c"
+#line 8492 "ImportPage.c"
}
#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
@@ -8170,7 +8500,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp13_ = end;
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
-#line 8170 "ImportPage.c"
+#line 8500 "ImportPage.c"
glong _tmp14_;
glong _tmp15_;
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8179,11 +8509,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp15_ = string_length;
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8179 "ImportPage.c"
+#line 8509 "ImportPage.c"
} else {
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 8183 "ImportPage.c"
+#line 8513 "ImportPage.c"
}
#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
@@ -8205,7 +8535,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
result = _tmp21_;
#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 8205 "ImportPage.c"
+#line 8535 "ImportPage.c"
}
@@ -8216,71 +8546,71 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
gint _tmp1_;
gint _tmp2_;
gchar* _tmp12_;
-#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1334 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (str != NULL, NULL);
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = str;
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = strlen (_tmp0_);
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp1_;
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
offset = (glong) _tmp2_;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 8228 "ImportPage.c"
+#line 8558 "ImportPage.c"
glong _tmp3_;
glong _tmp4_;
const gchar* _tmp5_;
glong _tmp6_;
gchar _tmp7_;
gchar _tmp8_;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = offset;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
offset = _tmp3_ - 1;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = offset;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!(_tmp4_ >= ((glong) 0))) {
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 8245 "ImportPage.c"
+#line 8575 "ImportPage.c"
}
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = str;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = offset;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = string_get (_tmp5_, _tmp6_);
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = ch;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp7_ != _tmp8_) {
-#line 8257 "ImportPage.c"
+#line 8587 "ImportPage.c"
const gchar* _tmp9_;
glong _tmp10_;
gchar* _tmp11_;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = str;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = offset;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = string_slice (_tmp9_, (glong) 0, _tmp10_);
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp11_;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8271 "ImportPage.c"
+#line 8601 "ImportPage.c"
}
}
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = g_strdup ("");
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp12_;
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8280 "ImportPage.c"
+#line 8610 "ImportPage.c"
}
@@ -8289,127 +8619,127 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
gboolean _tmp0_ = FALSE;
const gchar* _tmp1_;
gboolean _tmp2_;
-#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (basepath != NULL, NULL);
-#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (addition != NULL, NULL);
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = basepath;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = g_str_has_suffix (_tmp1_, "/");
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp2_) {
-#line 8299 "ImportPage.c"
+#line 8629 "ImportPage.c"
const gchar* _tmp3_;
gboolean _tmp4_;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = addition;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = g_str_has_prefix (_tmp3_, "/");
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = !_tmp4_;
-#line 8308 "ImportPage.c"
+#line 8638 "ImportPage.c"
} else {
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 8312 "ImportPage.c"
+#line 8642 "ImportPage.c"
}
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 8316 "ImportPage.c"
+#line 8646 "ImportPage.c"
const gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
const gchar* _tmp8_;
gchar* _tmp9_;
gchar* _tmp10_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = basepath;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = g_strconcat (_tmp5_, "/", NULL);
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _tmp6_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = addition;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL);
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _tmp9_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp7_);
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp10_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8341 "ImportPage.c"
+#line 8671 "ImportPage.c"
} else {
gboolean _tmp11_ = FALSE;
const gchar* _tmp12_;
gboolean _tmp13_;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = basepath;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp13_) {
-#line 8352 "ImportPage.c"
+#line 8682 "ImportPage.c"
const gchar* _tmp14_;
gboolean _tmp15_;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = addition;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = g_str_has_prefix (_tmp14_, "/");
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp15_;
-#line 8361 "ImportPage.c"
+#line 8691 "ImportPage.c"
} else {
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = FALSE;
-#line 8365 "ImportPage.c"
+#line 8695 "ImportPage.c"
}
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_) {
-#line 8369 "ImportPage.c"
+#line 8699 "ImportPage.c"
const gchar* _tmp16_;
gchar* _tmp17_;
gchar* _tmp18_;
const gchar* _tmp19_;
gchar* _tmp20_;
gchar* _tmp21_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = basepath;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = import_page_chomp_ch (_tmp16_, '/');
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = _tmp17_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = addition;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = _tmp20_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp18_);
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp21_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8394 "ImportPage.c"
+#line 8724 "ImportPage.c"
} else {
const gchar* _tmp22_;
const gchar* _tmp23_;
gchar* _tmp24_;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = basepath;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = addition;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp24_;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8409 "ImportPage.c"
+#line 8739 "ImportPage.c"
}
}
}
@@ -8435,80 +8765,80 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
CameraStorageInformation* _tmp11_;
CameraStorageInfoFields _tmp12_;
gchar* _tmp15_;
-#line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
sifs = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
count = 0;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = camera;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_page_null_context;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp1_->context;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp3_, _tmp2_);
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
count = _tmp3_;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
res = _tmp4_;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = res;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_ != GP_OK) {
-#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
-#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8461 "ImportPage.c"
+#line 8791 "ImportPage.c"
}
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = fsid;
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = count;
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp6_ >= _tmp7_) {
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8473 "ImportPage.c"
+#line 8803 "ImportPage.c"
}
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = sifs;
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = fsid;
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ifs = _tmp8_ + _tmp9_;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = ifs;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = (*_tmp11_).fields;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8487 "ImportPage.c"
+#line 8817 "ImportPage.c"
CameraStorageInformation* _tmp13_;
const gchar* _tmp14_;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = ifs;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = (*_tmp13_).basedir;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _tmp14_;
-#line 8496 "ImportPage.c"
+#line 8826 "ImportPage.c"
} else {
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = "/";
-#line 8500 "ImportPage.c"
+#line 8830 "ImportPage.c"
}
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = g_strdup (_tmp10_);
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp15_;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8508 "ImportPage.c"
+#line 8838 "ImportPage.c"
}
@@ -8525,74 +8855,74 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
const gchar* _tmp11_;
const gchar* _tmp12_;
gchar* _tmp13_;
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera_name != NULL, NULL);
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = folder;
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = strlen (_tmp0_);
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp1_;
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) {
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8543 "ImportPage.c"
+#line 8873 "ImportPage.c"
}
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = camera;
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = fsid;
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = import_page_get_fs_basedir (_tmp3_, _tmp4_);
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
basedir = _tmp5_;
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = basedir;
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp6_ == NULL) {
-#line 8557 "ImportPage.c"
+#line 8887 "ImportPage.c"
const gchar* _tmp7_;
gint _tmp8_;
const gchar* _tmp9_;
gchar* _tmp10_;
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = camera_name;
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = fsid;
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1349: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_);
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1376: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_);
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = folder;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = g_strdup (_tmp9_);
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp10_;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (basedir);
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8578 "ImportPage.c"
+#line 8908 "ImportPage.c"
}
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = basedir;
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = folder;
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = import_page_append_path (_tmp11_, _tmp12_);
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp13_;
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (basedir);
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8592 "ImportPage.c"
+#line 8922 "ImportPage.c"
}
@@ -8616,841 +8946,847 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
GPContext* _tmp17_;
int _tmp18_;
int _tmp19_;
+ CameraList* _tmp24_;
CameraList* folders = NULL;
- CameraList* _tmp110_ = NULL;
- int _tmp111_;
+ CameraList* _tmp111_ = NULL;
int _tmp112_;
- Camera* _tmp116_;
- const gchar* _tmp117_;
- CameraList* _tmp118_;
- GPSpinIdleWrapper* _tmp119_;
- GPContext* _tmp120_;
- int _tmp121_;
+ int _tmp113_;
+ Camera* _tmp117_;
+ const gchar* _tmp118_;
+ CameraList* _tmp119_;
+ GPSpinIdleWrapper* _tmp120_;
+ GPContext* _tmp121_;
int _tmp122_;
+ int _tmp123_;
GError * _inner_error_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (dir != NULL, FALSE);
-#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (GEE_IS_ARRAY_LIST (import_list), FALSE);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->camera;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->camera_name;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = fsid;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = dir;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
fulldir = _tmp4_;
-#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = fulldir;
-#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_ == NULL) {
-#line 8650 "ImportPage.c"
+#line 8981 "ImportPage.c"
const gchar* _tmp6_;
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = dir;
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1360: Skipping enumerating %s: invalid folder name", _tmp6_);
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1387: Skipping enumerating %s: invalid folder name", _tmp6_);
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8662 "ImportPage.c"
+#line 8993 "ImportPage.c"
}
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = gp_list_new (&_tmp7_);
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
files = _tmp7_;
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = _tmp8_;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = self->priv->refresh_result;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp9_ != GP_OK) {
-#line 8676 "ImportPage.c"
+#line 9007 "ImportPage.c"
int _tmp10_;
gchar* _tmp11_;
gchar* _tmp12_;
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = self->priv->refresh_result;
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = gp_result_to_full_string (_tmp10_);
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = _tmp11_;
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1368: Unable to create file list: %s", _tmp12_);
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1395: Unable to create file list: %s", _tmp12_);
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp12_);
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8698 "ImportPage.c"
+#line 9029 "ImportPage.c"
}
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = self->priv->camera;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = fulldir;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = files;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = import_page_spin_idle_context;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = gp_camera_folder_list_files (_tmp13_, _tmp14_, _tmp15_, _tmp17_);
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = _tmp18_;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = self->priv->refresh_result;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp19_ != GP_OK) {
-#line 8718 "ImportPage.c"
+#line 9049 "ImportPage.c"
const gchar* _tmp20_;
int _tmp21_;
gchar* _tmp22_;
gchar* _tmp23_;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = fulldir;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = self->priv->refresh_result;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = gp_result_to_full_string (_tmp21_);
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = _tmp22_;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1375: Unable to list files in %s: %s", _tmp20_, _tmp23_);
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1402: Unable to list files in %s: %s", _tmp20_, _tmp23_);
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp23_);
-#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = GP_OK;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8745 "ImportPage.c"
+#line 9076 "ImportPage.c"
}
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp24_ = files;
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gp_list_sort (_tmp24_);
+#line 9082 "ImportPage.c"
{
gint ctr = 0;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 8751 "ImportPage.c"
+#line 9087 "ImportPage.c"
{
- gboolean _tmp24_ = FALSE;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = TRUE;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gboolean _tmp25_ = FALSE;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp25_ = TRUE;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 8758 "ImportPage.c"
- gint _tmp26_;
- CameraList* _tmp27_;
- gint _tmp28_;
+#line 9094 "ImportPage.c"
+ gint _tmp27_;
+ CameraList* _tmp28_;
+ gint _tmp29_;
gchar* filename = NULL;
- CameraList* _tmp29_;
- gint _tmp30_;
- const gchar* _tmp31_ = NULL;
- int _tmp32_;
- gchar* _tmp33_;
- int _tmp34_;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp24_) {
-#line 8771 "ImportPage.c"
- gint _tmp25_;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = ctr;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ctr = _tmp25_ + 1;
-#line 8777 "ImportPage.c"
+ CameraList* _tmp30_;
+ gint _tmp31_;
+ const gchar* _tmp32_ = NULL;
+ int _tmp33_;
+ gchar* _tmp34_;
+ int _tmp35_;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!_tmp25_) {
+#line 9107 "ImportPage.c"
+ gint _tmp26_;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp26_ = ctr;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ ctr = _tmp26_ + 1;
+#line 9113 "ImportPage.c"
}
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = FALSE;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = ctr;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = files;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = gp_list_count (_tmp27_);
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp26_ < _tmp28_)) {
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp25_ = FALSE;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp27_ = ctr;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp28_ = files;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp29_ = gp_list_count (_tmp28_);
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!(_tmp27_ < _tmp29_)) {
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 8791 "ImportPage.c"
+#line 9127 "ImportPage.c"
}
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = files;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = ctr;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = gp_list_get_name (_tmp29_, _tmp30_, &_tmp31_);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp30_ = files;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp31_ = ctr;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp33_ = gp_list_get_name (_tmp30_, _tmp31_, &_tmp32_);
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = g_strdup (_tmp31_);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- filename = _tmp33_;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp32_;
-#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = self->priv->refresh_result;
-#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp34_ != GP_OK) {
-#line 8811 "ImportPage.c"
- gint _tmp35_;
- const gchar* _tmp36_;
- int _tmp37_;
- gchar* _tmp38_;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp34_ = g_strdup (_tmp32_);
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ filename = _tmp34_;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->refresh_result = _tmp33_;
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp35_ = self->priv->refresh_result;
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp35_ != GP_OK) {
+#line 9147 "ImportPage.c"
+ gint _tmp36_;
+ const gchar* _tmp37_;
+ int _tmp38_;
gchar* _tmp39_;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = ctr;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = fulldir;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = self->priv->refresh_result;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = gp_result_to_full_string (_tmp37_);
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = _tmp38_;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1387: Unable to get the name of file %d in %s: %s", _tmp35_, _tmp36_, _tmp39_);
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp39_);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp40_;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp36_ = ctr;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp37_ = fulldir;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp38_ = self->priv->refresh_result;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp39_ = gp_result_to_full_string (_tmp38_);
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp40_ = _tmp39_;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1415: Unable to get the name of file %d in %s: %s", _tmp36_, _tmp37_, _tmp40_);
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp40_);
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8841 "ImportPage.c"
+#line 9177 "ImportPage.c"
}
{
CameraFileInfo info = {0};
- gboolean _tmp40_ = FALSE;
- GPSpinIdleWrapper* _tmp41_;
- GPContext* _tmp42_;
- Camera* _tmp43_;
- const gchar* _tmp44_;
+ gboolean _tmp41_ = FALSE;
+ GPSpinIdleWrapper* _tmp42_;
+ GPContext* _tmp43_;
+ Camera* _tmp44_;
const gchar* _tmp45_;
- CameraFileInfo _tmp46_ = {0};
- gboolean _tmp47_;
- CameraFileInfo _tmp50_;
- CameraFileInfoFile _tmp51_;
- CameraFileInfoFields _tmp52_;
- const gchar* _tmp58_;
- gboolean _tmp59_;
- GtkProgressBar* _tmp102_;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = import_page_spin_idle_context;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = self->priv->camera;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = fulldir;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = filename;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = gp_get_info (_tmp42_, _tmp43_, _tmp44_, _tmp45_, &_tmp46_, &_inner_error_);
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp46_;
+ CameraFileInfo _tmp47_ = {0};
+ gboolean _tmp48_;
+ CameraFileInfo _tmp51_;
+ CameraFileInfoFile _tmp52_;
+ CameraFileInfoFields _tmp53_;
+ const gchar* _tmp59_;
+ gboolean _tmp60_;
+ GtkProgressBar* _tmp103_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp42_ = import_page_spin_idle_context;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp44_ = self->priv->camera;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp45_ = fulldir;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp46_ = filename;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp48_ = gp_get_info (_tmp43_, _tmp44_, _tmp45_, _tmp46_, &_tmp47_, &_inner_error_);
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- info = _tmp46_;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = _tmp47_;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ info = _tmp47_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp41_ = _tmp48_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 8881 "ImportPage.c"
- goto __catch68_g_error;
+#line 9217 "ImportPage.c"
+ goto __catch76_g_error;
}
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp40_) {
-#line 8886 "ImportPage.c"
- const gchar* _tmp48_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!_tmp41_) {
+#line 9222 "ImportPage.c"
const gchar* _tmp49_;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = fulldir;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = filename;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1396: Skipping import of %s/%s: name too long", _tmp48_, _tmp49_);
-#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp50_;
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp49_ = fulldir;
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp50_ = filename;
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1424: Skipping import of %s/%s: name too long", _tmp49_, _tmp50_);
+#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 8901 "ImportPage.c"
+#line 9237 "ImportPage.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = info;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = _tmp50_.file;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = _tmp51_.fields;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) {
-#line 8911 "ImportPage.c"
- const gchar* _tmp53_;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp51_ = info;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp52_ = _tmp51_.file;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp53_ = _tmp52_.fields;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if ((_tmp53_ & GP_FILE_INFO_TYPE) == 0) {
+#line 9247 "ImportPage.c"
const gchar* _tmp54_;
- CameraFileInfo _tmp55_;
- CameraFileInfoFile _tmp56_;
- CameraFileInfoFields _tmp57_;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = fulldir;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = filename;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = info;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = _tmp55_.file;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = _tmp56_.fields;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1402: Skipping %s/%s: No file (file=%02Xh)", _tmp53_, _tmp54_, (guint) _tmp57_);
-#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp55_;
+ CameraFileInfo _tmp56_;
+ CameraFileInfoFile _tmp57_;
+ CameraFileInfoFields _tmp58_;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp54_ = fulldir;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp55_ = filename;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp56_ = info;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp57_ = _tmp56_.file;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp58_ = _tmp57_.fields;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_message ("ImportPage.vala:1430: Skipping %s/%s: No file (file=%02Xh)", _tmp54_, _tmp55_, (guint) _tmp58_);
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 8935 "ImportPage.c"
+#line 9271 "ImportPage.c"
}
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = filename;
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = video_reader_is_supported_video_filename (_tmp58_);
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp59_) {
-#line 8943 "ImportPage.c"
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp59_ = filename;
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp60_ = video_reader_is_supported_video_filename (_tmp59_);
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp60_) {
+#line 9279 "ImportPage.c"
VideoImportSource* video_source = NULL;
- const gchar* _tmp60_;
- Camera* _tmp61_;
- gint _tmp62_;
- const gchar* _tmp63_;
+ const gchar* _tmp61_;
+ Camera* _tmp62_;
+ gint _tmp63_;
const gchar* _tmp64_;
- CameraFileInfo _tmp65_;
- CameraFileInfoFile _tmp66_;
- gulong _tmp67_;
- CameraFileInfo _tmp68_;
- CameraFileInfoFile _tmp69_;
- time_t _tmp70_;
- VideoImportSource* _tmp71_;
- GeeArrayList* _tmp72_;
- VideoImportSource* _tmp73_;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = self->priv->camera_name;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = self->priv->camera;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = fsid;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = dir;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = filename;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = info;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = _tmp65_.file;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = _tmp66_.size;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = info;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = _tmp68_.file;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = _tmp69_.mtime;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = video_import_source_new (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp67_, _tmp70_);
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- video_source = _tmp71_;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = import_list;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = video_source;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp65_;
+ CameraFileInfo _tmp66_;
+ CameraFileInfoFile _tmp67_;
+ gulong _tmp68_;
+ CameraFileInfo _tmp69_;
+ CameraFileInfoFile _tmp70_;
+ time_t _tmp71_;
+ VideoImportSource* _tmp72_;
+ GeeArrayList* _tmp73_;
+ VideoImportSource* _tmp74_;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp61_ = self->priv->camera_name;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp62_ = self->priv->camera;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp63_ = fsid;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp64_ = dir;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp65_ = filename;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp66_ = info;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp67_ = _tmp66_.file;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp68_ = _tmp67_.size;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp69_ = info;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp70_ = _tmp69_.file;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp71_ = _tmp70_.mtime;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp72_ = video_import_source_new (_tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp65_, _tmp68_, _tmp71_);
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ video_source = _tmp72_;
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp73_ = import_list;
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp74_ = video_source;
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (video_source);
-#line 8993 "ImportPage.c"
+#line 9329 "ImportPage.c"
} else {
PhotoFileFormat file_format = 0;
- CameraFileInfo _tmp74_;
- CameraFileInfoFile _tmp75_;
- const gchar* _tmp76_;
- PhotoFileFormat _tmp77_;
+ CameraFileInfo _tmp75_;
+ CameraFileInfoFile _tmp76_;
+ const gchar* _tmp77_;
PhotoFileFormat _tmp78_;
- GeeArrayList* _tmp87_;
- const gchar* _tmp88_;
- Camera* _tmp89_;
- gint _tmp90_;
- const gchar* _tmp91_;
+ PhotoFileFormat _tmp79_;
+ GeeArrayList* _tmp88_;
+ const gchar* _tmp89_;
+ Camera* _tmp90_;
+ gint _tmp91_;
const gchar* _tmp92_;
- CameraFileInfo _tmp93_;
- CameraFileInfoFile _tmp94_;
- gulong _tmp95_;
- CameraFileInfo _tmp96_;
- CameraFileInfoFile _tmp97_;
- time_t _tmp98_;
- PhotoFileFormat _tmp99_;
- PhotoImportSource* _tmp100_;
+ const gchar* _tmp93_;
+ CameraFileInfo _tmp94_;
+ CameraFileInfoFile _tmp95_;
+ gulong _tmp96_;
+ CameraFileInfo _tmp97_;
+ CameraFileInfoFile _tmp98_;
+ time_t _tmp99_;
+ PhotoFileFormat _tmp100_;
PhotoImportSource* _tmp101_;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = info;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = _tmp74_.file;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = _tmp75_.type;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = photo_file_format_from_gphoto_type (_tmp76_);
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- file_format = _tmp77_;
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = file_format;
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9030 "ImportPage.c"
- const gchar* _tmp79_;
- PhotoFileFormat _tmp80_;
+ PhotoImportSource* _tmp102_;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp75_ = info;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp76_ = _tmp75_.file;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp77_ = _tmp76_.type;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp78_ = photo_file_format_from_gphoto_type (_tmp77_);
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ file_format = _tmp78_;
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp79_ = file_format;
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp79_ == PHOTO_FILE_FORMAT_UNKNOWN) {
+#line 9366 "ImportPage.c"
+ const gchar* _tmp80_;
PhotoFileFormat _tmp81_;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = filename;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = photo_file_format_get_by_basename_extension (_tmp79_);
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- file_format = _tmp80_;
-#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = file_format;
-#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9044 "ImportPage.c"
- const gchar* _tmp82_;
+ PhotoFileFormat _tmp82_;
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp80_ = filename;
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp81_ = photo_file_format_get_by_basename_extension (_tmp80_);
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ file_format = _tmp81_;
+#line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp82_ = file_format;
+#line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp82_ == PHOTO_FILE_FORMAT_UNKNOWN) {
+#line 9380 "ImportPage.c"
const gchar* _tmp83_;
- CameraFileInfo _tmp84_;
- CameraFileInfoFile _tmp85_;
- const gchar* _tmp86_;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = fulldir;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = filename;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = info;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = _tmp84_.file;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = _tmp85_.type;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1418: Skipping %s/%s: Not a supported file extension (" \
-"%s)", _tmp82_, _tmp83_, _tmp86_);
-#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp84_;
+ CameraFileInfo _tmp85_;
+ CameraFileInfoFile _tmp86_;
+ const gchar* _tmp87_;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp83_ = fulldir;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp84_ = filename;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp85_ = info;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp86_ = _tmp85_.file;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp87_ = _tmp86_.type;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_message ("ImportPage.vala:1446: Skipping %s/%s: Not a supported file extension (" \
+"%s)", _tmp83_, _tmp84_, _tmp87_);
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 9068 "ImportPage.c"
+#line 9404 "ImportPage.c"
}
}
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = import_list;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = self->priv->camera_name;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = self->priv->camera;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = fsid;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = dir;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = filename;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = info;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = _tmp93_.file;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp95_ = _tmp94_.size;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp96_ = info;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp97_ = _tmp96_.file;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp98_ = _tmp97_.mtime;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp99_ = file_format;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp100_ = photo_import_source_new (_tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp95_, _tmp98_, _tmp99_);
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp101_ = _tmp100_;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp101_);
-#line 9105 "ImportPage.c"
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp88_ = import_list;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp89_ = self->priv->camera_name;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp90_ = self->priv->camera;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp91_ = fsid;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp92_ = dir;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp93_ = filename;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp94_ = info;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp95_ = _tmp94_.file;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp96_ = _tmp95_.size;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp97_ = info;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp98_ = _tmp97_.file;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp99_ = _tmp98_.mtime;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp100_ = file_format;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp101_ = photo_import_source_new (_tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp93_, _tmp96_, _tmp99_, _tmp100_);
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp102_ = _tmp101_;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (_tmp102_);
+#line 9441 "ImportPage.c"
}
-#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp102_ = self->priv->progress_bar;
-#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_pulse (_tmp102_);
-#line 1431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp103_ = self->priv->progress_bar;
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_pulse (_tmp103_);
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
spin_event_loop ();
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 9115 "ImportPage.c"
+#line 9451 "ImportPage.c"
}
- goto __finally68;
- __catch68_g_error:
+ goto __finally76;
+ __catch76_g_error:
{
GError* err = NULL;
- const gchar* _tmp103_;
- GError* _tmp104_;
- const gchar* _tmp105_;
- GError* _tmp106_;
- const gchar* _tmp107_;
- gchar* _tmp108_;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp104_;
+ GError* _tmp105_;
+ const gchar* _tmp106_;
+ GError* _tmp107_;
+ const gchar* _tmp108_;
+ gchar* _tmp109_;
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
-#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp103_ = fulldir;
-#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp104_ = err;
-#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp105_ = _tmp104_->message;
-#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1433: Error while enumerating files in %s: %s", _tmp103_, _tmp105_);
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp106_ = err;
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp107_ = _tmp106_->message;
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp108_ = g_strdup (_tmp107_);
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp104_ = fulldir;
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp105_ = err;
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp106_ = _tmp105_->message;
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1461: Error while enumerating files in %s: %s", _tmp104_, _tmp106_);
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp107_ = err;
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp108_ = _tmp107_->message;
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp109_ = g_strdup (_tmp108_);
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->refresh_error);
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_error = _tmp108_;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->refresh_error = _tmp109_;
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9161 "ImportPage.c"
+#line 9497 "ImportPage.c"
}
- __finally68:
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ __finally76:
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9166 "ImportPage.c"
- gboolean _tmp109_ = FALSE;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 9502 "ImportPage.c"
+ gboolean _tmp110_ = FALSE;
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return _tmp109_;
-#line 9180 "ImportPage.c"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ return _tmp110_;
+#line 9516 "ImportPage.c"
}
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 9184 "ImportPage.c"
+#line 9520 "ImportPage.c"
}
}
}
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp111_ = gp_list_new (&_tmp110_);
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp112_ = gp_list_new (&_tmp111_);
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- folders = _tmp110_;
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp111_;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp112_ = self->priv->refresh_result;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp112_ != GP_OK) {
-#line 9200 "ImportPage.c"
- int _tmp113_;
- gchar* _tmp114_;
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ folders = _tmp111_;
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->refresh_result = _tmp112_;
+#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp113_ = self->priv->refresh_result;
+#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp113_ != GP_OK) {
+#line 9536 "ImportPage.c"
+ int _tmp114_;
gchar* _tmp115_;
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp113_ = self->priv->refresh_result;
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp114_ = gp_result_to_full_string (_tmp113_);
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp115_ = _tmp114_;
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp115_);
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp115_);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp116_;
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp114_ = self->priv->refresh_result;
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp115_ = gp_result_to_full_string (_tmp114_);
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp116_ = _tmp115_;
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1472: Unable to create folder list: %s", _tmp116_);
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp116_);
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9224 "ImportPage.c"
+#line 9560 "ImportPage.c"
}
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp116_ = self->priv->camera;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp117_ = fulldir;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp118_ = folders;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp119_ = import_page_spin_idle_context;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp120_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp121_ = gp_camera_folder_list_folders (_tmp116_, _tmp117_, _tmp118_, _tmp120_);
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp121_;
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp122_ = self->priv->refresh_result;
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp122_ != GP_OK) {
-#line 9244 "ImportPage.c"
- const gchar* _tmp123_;
- int _tmp124_;
- gchar* _tmp125_;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp117_ = self->priv->camera;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp118_ = fulldir;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp119_ = folders;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp120_ = import_page_spin_idle_context;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp121_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp122_ = gp_camera_folder_list_folders (_tmp117_, _tmp118_, _tmp119_, _tmp121_);
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->refresh_result = _tmp122_;
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp123_ = self->priv->refresh_result;
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp123_ != GP_OK) {
+#line 9580 "ImportPage.c"
+ const gchar* _tmp124_;
+ int _tmp125_;
gchar* _tmp126_;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp123_ = fulldir;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp124_ = self->priv->refresh_result;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp125_ = gp_result_to_full_string (_tmp124_);
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp126_ = _tmp125_;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1451: Unable to list folders in %s: %s", _tmp123_, _tmp126_);
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp126_);
-#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp127_;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp124_ = fulldir;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp125_ = self->priv->refresh_result;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp126_ = gp_result_to_full_string (_tmp125_);
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp127_ = _tmp126_;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1479: Unable to list folders in %s: %s", _tmp124_, _tmp127_);
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp127_);
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = GP_OK;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9273 "ImportPage.c"
+#line 9609 "ImportPage.c"
}
{
gint ctr = 0;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 9279 "ImportPage.c"
+#line 9615 "ImportPage.c"
{
- gboolean _tmp127_ = FALSE;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp127_ = TRUE;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gboolean _tmp128_ = FALSE;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp128_ = TRUE;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9286 "ImportPage.c"
- gint _tmp129_;
- CameraList* _tmp130_;
- gint _tmp131_;
+#line 9622 "ImportPage.c"
+ gint _tmp130_;
+ CameraList* _tmp131_;
+ gint _tmp132_;
gchar* subdir = NULL;
- CameraList* _tmp132_;
- gint _tmp133_;
- const gchar* _tmp134_ = NULL;
- int _tmp135_;
- gchar* _tmp136_;
- int _tmp137_;
- gint _tmp142_;
- const gchar* _tmp143_;
+ CameraList* _tmp133_;
+ gint _tmp134_;
+ const gchar* _tmp135_ = NULL;
+ int _tmp136_;
+ gchar* _tmp137_;
+ int _tmp138_;
+ gint _tmp143_;
const gchar* _tmp144_;
- gchar* _tmp145_;
+ const gchar* _tmp145_;
gchar* _tmp146_;
- GeeArrayList* _tmp147_;
- gboolean _tmp148_;
+ gchar* _tmp147_;
+ GeeArrayList* _tmp148_;
gboolean _tmp149_;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp127_) {
-#line 9307 "ImportPage.c"
- gint _tmp128_;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp128_ = ctr;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ctr = _tmp128_ + 1;
-#line 9313 "ImportPage.c"
+ gboolean _tmp150_;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!_tmp128_) {
+#line 9643 "ImportPage.c"
+ gint _tmp129_;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp129_ = ctr;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ ctr = _tmp129_ + 1;
+#line 9649 "ImportPage.c"
}
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp127_ = FALSE;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp129_ = ctr;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp130_ = folders;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp131_ = gp_list_count (_tmp130_);
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp129_ < _tmp131_)) {
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp128_ = FALSE;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp130_ = ctr;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp131_ = folders;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp132_ = gp_list_count (_tmp131_);
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!(_tmp130_ < _tmp132_)) {
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9327 "ImportPage.c"
+#line 9663 "ImportPage.c"
}
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp132_ = folders;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp133_ = ctr;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp135_ = gp_list_get_name (_tmp132_, _tmp133_, &_tmp134_);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp133_ = folders;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp134_ = ctr;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp136_ = gp_list_get_name (_tmp133_, _tmp134_, &_tmp135_);
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp136_ = g_strdup (_tmp134_);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- subdir = _tmp136_;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp135_;
-#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp137_ = self->priv->refresh_result;
-#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp137_ != GP_OK) {
-#line 9347 "ImportPage.c"
- gint _tmp138_;
- int _tmp139_;
- gchar* _tmp140_;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp137_ = g_strdup (_tmp135_);
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ subdir = _tmp137_;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->refresh_result = _tmp136_;
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp138_ = self->priv->refresh_result;
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp138_ != GP_OK) {
+#line 9683 "ImportPage.c"
+ gint _tmp139_;
+ int _tmp140_;
gchar* _tmp141_;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp138_ = ctr;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp139_ = self->priv->refresh_result;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp140_ = gp_result_to_full_string (_tmp139_);
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp141_ = _tmp140_;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1463: Unable to get name of folder %d: %s", _tmp138_, _tmp141_);
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp141_);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp142_;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp139_ = ctr;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp140_ = self->priv->refresh_result;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp141_ = gp_result_to_full_string (_tmp140_);
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp142_ = _tmp141_;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1491: Unable to get name of folder %d: %s", _tmp139_, _tmp142_);
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp142_);
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9376 "ImportPage.c"
+#line 9712 "ImportPage.c"
}
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp142_ = fsid;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp143_ = dir;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp144_ = subdir;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp145_ = import_page_append_path (_tmp143_, _tmp144_);
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp146_ = _tmp145_;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp147_ = import_list;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp148_ = import_page_enumerate_files (self, _tmp142_, _tmp146_, _tmp147_);
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp149_ = !_tmp148_;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp146_);
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp149_) {
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp143_ = fsid;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp144_ = dir;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp145_ = subdir;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp146_ = import_page_append_path (_tmp144_, _tmp145_);
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp147_ = _tmp146_;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp148_ = import_list;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp149_ = import_page_enumerate_files (self, _tmp143_, _tmp147_, _tmp148_);
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp150_ = !_tmp149_;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp147_);
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp150_) {
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9410 "ImportPage.c"
+#line 9746 "ImportPage.c"
}
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
-#line 9414 "ImportPage.c"
+#line 9750 "ImportPage.c"
}
}
}
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9428 "ImportPage.c"
+#line 9764 "ImportPage.c"
}
static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list) {
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9437 "ImportPage.c"
+#line 9773 "ImportPage.c"
{
gint i = 0;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
i = 0;
-#line 9442 "ImportPage.c"
+#line 9778 "ImportPage.c"
{
gboolean _tmp0_ = FALSE;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9449 "ImportPage.c"
+#line 9785 "ImportPage.c"
gint _tmp2_;
GeeArrayList* _tmp3_;
gint _tmp4_;
@@ -9474,162 +9810,162 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
PhotoImportSource* _tmp29_;
gboolean _tmp30_ = FALSE;
PhotoImportSource* _tmp31_;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp0_) {
-#line 9475 "ImportPage.c"
+#line 9811 "ImportPage.c"
gint _tmp1_;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = i;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
i = _tmp1_ + 1;
-#line 9481 "ImportPage.c"
+#line 9817 "ImportPage.c"
}
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = i;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_list;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _tmp4_;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!(_tmp2_ < _tmp5_)) {
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9497 "ImportPage.c"
+#line 9833 "ImportPage.c"
}
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = import_list;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = i;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_);
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = (ImportSource*) _tmp8_;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp10_ == NULL) {
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
-#line 9513 "ImportPage.c"
+#line 9849 "ImportPage.c"
}
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
current = _tmp10_;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = i;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = import_list;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = _tmp14_;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((_tmp12_ + 1) < _tmp15_) {
-#line 9527 "ImportPage.c"
+#line 9863 "ImportPage.c"
GeeArrayList* _tmp16_;
gint _tmp17_;
gpointer _tmp18_;
ImportSource* _tmp19_;
PhotoImportSource* _tmp20_;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = import_list;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = i;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_ + 1);
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = (ImportSource*) _tmp18_;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp19_) : NULL;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp20_ == NULL) {
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp19_);
-#line 9547 "ImportPage.c"
+#line 9883 "ImportPage.c"
}
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp11_);
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp20_;
-#line 9553 "ImportPage.c"
+#line 9889 "ImportPage.c"
} else {
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp11_);
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = NULL;
-#line 9559 "ImportPage.c"
+#line 9895 "ImportPage.c"
}
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = _g_object_ref0 (_tmp11_);
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
next = _tmp21_;
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = i;
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp23_ > 0) {
-#line 9569 "ImportPage.c"
+#line 9905 "ImportPage.c"
GeeArrayList* _tmp24_;
gint _tmp25_;
gpointer _tmp26_;
ImportSource* _tmp27_;
PhotoImportSource* _tmp28_;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = import_list;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = i;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_ - 1);
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = (ImportSource*) _tmp26_;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp27_) : NULL;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp28_ == NULL) {
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp27_);
-#line 9589 "ImportPage.c"
+#line 9925 "ImportPage.c"
}
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp22_);
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = _tmp28_;
-#line 9595 "ImportPage.c"
+#line 9931 "ImportPage.c"
} else {
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp22_);
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = NULL;
-#line 9601 "ImportPage.c"
+#line 9937 "ImportPage.c"
}
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = _g_object_ref0 (_tmp22_);
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
prev = _tmp29_;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = current;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp31_ != NULL) {
-#line 9611 "ImportPage.c"
+#line 9947 "ImportPage.c"
PhotoImportSource* _tmp32_;
PhotoFileFormat _tmp33_;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = current;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = photo_import_source_get_file_format (_tmp32_);
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9620 "ImportPage.c"
+#line 9956 "ImportPage.c"
} else {
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = FALSE;
-#line 9624 "ImportPage.c"
+#line 9960 "ImportPage.c"
}
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp30_) {
-#line 9628 "ImportPage.c"
+#line 9964 "ImportPage.c"
gchar* current_name = NULL;
gchar* ext = NULL;
PhotoImportSource* _tmp34_;
@@ -9643,48 +9979,48 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
gboolean _tmp52_ = FALSE;
PhotoImportSource* _tmp53_;
PhotoImportSource* _tmp65_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = current;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = _tmp35_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (current_name);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
current_name = _tmp37_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (ext);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ext = _tmp38_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp36_);
-#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = NULL;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = next;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp40_ != NULL) {
-#line 9666 "ImportPage.c"
+#line 10002 "ImportPage.c"
PhotoImportSource* _tmp41_;
PhotoFileFormat _tmp42_;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = next;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = photo_import_source_get_file_format (_tmp41_);
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9675 "ImportPage.c"
+#line 10011 "ImportPage.c"
} else {
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = FALSE;
-#line 9679 "ImportPage.c"
+#line 10015 "ImportPage.c"
}
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp39_) {
-#line 9683 "ImportPage.c"
+#line 10019 "ImportPage.c"
gchar* next_name = NULL;
PhotoImportSource* _tmp43_;
gchar* _tmp44_;
@@ -9693,69 +10029,69 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
gchar* _tmp47_ = NULL;
const gchar* _tmp48_;
const gchar* _tmp49_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = next;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = _tmp44_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
disassemble_filename (_tmp45_, &_tmp46_, &_tmp47_);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (next_name);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
next_name = _tmp46_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (ext);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ext = _tmp47_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp45_);
-#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = next_name;
-#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = current_name;
-#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 9716 "ImportPage.c"
+#line 10052 "ImportPage.c"
PhotoImportSource* _tmp50_;
PhotoImportSource* _tmp51_;
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = next;
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp51_ = _g_object_ref0 (_tmp50_);
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = _tmp51_;
-#line 9727 "ImportPage.c"
+#line 10063 "ImportPage.c"
}
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (next_name);
-#line 9731 "ImportPage.c"
+#line 10067 "ImportPage.c"
}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = prev;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp53_ != NULL) {
-#line 9737 "ImportPage.c"
+#line 10073 "ImportPage.c"
PhotoImportSource* _tmp54_;
PhotoFileFormat _tmp55_;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp54_ = prev;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = photo_import_source_get_file_format (_tmp54_);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9746 "ImportPage.c"
+#line 10082 "ImportPage.c"
} else {
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = FALSE;
-#line 9750 "ImportPage.c"
+#line 10086 "ImportPage.c"
}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp52_) {
-#line 9754 "ImportPage.c"
+#line 10090 "ImportPage.c"
gchar* prev_name = NULL;
PhotoImportSource* _tmp56_;
gchar* _tmp57_;
@@ -9764,52 +10100,52 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
gchar* _tmp60_ = NULL;
const gchar* _tmp61_;
const gchar* _tmp62_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp56_ = prev;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp57_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp58_ = _tmp57_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
disassemble_filename (_tmp58_, &_tmp59_, &_tmp60_);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (prev_name);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
prev_name = _tmp59_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (ext);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ext = _tmp60_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp58_);
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp61_ = prev_name;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp62_ = current_name;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 9787 "ImportPage.c"
+#line 10123 "ImportPage.c"
PhotoImportSource* _tmp63_;
PhotoImportSource* _tmp64_;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp63_ = prev;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp64_ = _g_object_ref0 (_tmp63_);
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = _tmp64_;
-#line 9798 "ImportPage.c"
+#line 10134 "ImportPage.c"
}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (prev_name);
-#line 9802 "ImportPage.c"
+#line 10138 "ImportPage.c"
}
-#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp65_ = associated;
-#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp65_ != NULL) {
-#line 9808 "ImportPage.c"
+#line 10144 "ImportPage.c"
PhotoImportSource* _tmp66_;
gchar* _tmp67_;
gchar* _tmp68_;
@@ -9821,68 +10157,68 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
GeeArrayList* _tmp74_;
PhotoImportSource* _tmp75_;
gboolean _tmp76_;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp66_ = current;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp67_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp68_ = _tmp67_;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp69_ = associated;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp70_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp71_ = _tmp70_;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1505: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_);
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1533: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_);
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp71_);
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp68_);
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp72_ = current;
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp73_ = associated;
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source_set_associated (_tmp72_, _tmp73_);
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp74_ = import_list;
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp75_ = associated;
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp76_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp76_) {
-#line 9852 "ImportPage.c"
+#line 10188 "ImportPage.c"
PhotoImportSource* _tmp77_;
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1508: Unable to associate files");
-#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1536: Unable to associate files");
+#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp77_ = current;
-#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source_set_associated (_tmp77_, NULL);
-#line 9860 "ImportPage.c"
+#line 10196 "ImportPage.c"
}
}
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (ext);
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (current_name);
-#line 9869 "ImportPage.c"
+#line 10205 "ImportPage.c"
}
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (prev);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp22_);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (next);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp11_);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (current);
-#line 9881 "ImportPage.c"
+#line 10217 "ImportPage.c"
}
}
}
@@ -9892,13 +10228,13 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list) {
gint loaded_photos = 0;
GError * _inner_error_ = NULL;
-#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (GEE_IS_LIST (import_list));
-#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
loaded_photos = 0;
-#line 9897 "ImportPage.c"
+#line 10233 "ImportPage.c"
{
GeeList* _import_source_list = NULL;
GeeList* _tmp0_;
@@ -9908,25 +10244,25 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
gint _tmp3_;
gint _tmp4_;
gint _import_source_index = 0;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = import_list;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_source_list = _tmp1_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _import_source_list;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = _tmp3_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_source_size = _tmp4_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_source_index = -1;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9925 "ImportPage.c"
+#line 10261 "ImportPage.c"
gint _tmp5_;
gint _tmp6_;
gint _tmp7_;
@@ -9956,161 +10292,154 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
gboolean _tmp34_;
gchar* exif_only_md5 = NULL;
PhotoMetadata* _tmp47_;
- guint8* preview_raw = NULL;
- gint preview_raw_length1;
- gint _preview_raw_size_;
- gsize preview_raw_length = 0UL;
GdkPixbuf* preview = NULL;
gchar* preview_md5 = NULL;
- gboolean _tmp83_ = FALSE;
- gboolean _tmp84_ = FALSE;
- GdkPixbuf* _tmp85_;
- ImportSource* _tmp91_;
- ImportSource* _tmp94_;
- PhotoImportSource* _tmp100_;
- SourceCollection* _tmp124_;
- ImportSource* _tmp125_;
- GtkProgressBar* _tmp126_;
- gint _tmp127_;
- gint _tmp128_;
- GeeList* _tmp129_;
- gint _tmp130_;
- gint _tmp131_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ ImportSource* _tmp74_;
+ ImportSource* _tmp77_;
+ PhotoImportSource* _tmp83_;
+ SourceCollection* _tmp107_;
+ ImportSource* _tmp108_;
+ GtkProgressBar* _tmp109_;
+ gint _tmp110_;
+ gint _tmp111_;
+ GeeList* _tmp112_;
+ gint _tmp113_;
+ gint _tmp114_;
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _import_source_index;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_source_index = _tmp5_ + 1;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _import_source_index;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _import_source_size;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!(_tmp6_ < _tmp7_)) {
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9987 "ImportPage.c"
+#line 10316 "ImportPage.c"
}
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = _import_source_list;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _import_source_index;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_source = (ImportSource*) _tmp10_;
-#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = import_source;
-#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = import_source_get_filename (_tmp11_);
-#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
filename = _tmp12_;
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = import_source;
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = import_source_get_fulldir (_tmp13_);
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
fulldir = _tmp14_;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = fulldir;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp15_ == NULL) {
-#line 10013 "ImportPage.c"
+#line 10342 "ImportPage.c"
ImportSource* _tmp16_;
gchar* _tmp17_;
gchar* _tmp18_;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = import_source;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = _tmp17_;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1522: Skipping loading preview of %s: invalid folder n" \
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1550: Skipping loading preview of %s: invalid folder n" \
"ame", _tmp18_);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp18_);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_source);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 10035 "ImportPage.c"
+#line 10364 "ImportPage.c"
}
-#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = NULL;
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = import_source;
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10043 "ImportPage.c"
+#line 10372 "ImportPage.c"
ImportSource* _tmp21_;
PhotoImportSource* _tmp22_;
PhotoImportSource* _tmp23_;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = import_source;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = _tmp22_;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _tmp23_ != NULL;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp23_);
-#line 10057 "ImportPage.c"
+#line 10386 "ImportPage.c"
} else {
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = FALSE;
-#line 10061 "ImportPage.c"
+#line 10390 "ImportPage.c"
}
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp19_) {
-#line 10065 "ImportPage.c"
+#line 10394 "ImportPage.c"
ImportSource* _tmp24_;
PhotoImportSource* _tmp25_;
-#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = import_source;
-#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = _tmp25_;
-#line 10076 "ImportPage.c"
+#line 10405 "ImportPage.c"
}
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->progress_bar;
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_ellipsize (_tmp26_, PANGO_ELLIPSIZE_MIDDLE);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = self->priv->progress_bar;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = import_source;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = _tmp29_;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp30_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = _tmp31_;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_text (_tmp27_, _tmp32_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp32_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp30_);
-#line 1542 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
metadata = NULL;
-#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = filename;
-#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = video_reader_is_supported_video_filename (_tmp33_);
-#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp34_) {
-#line 10108 "ImportPage.c"
+#line 10437 "ImportPage.c"
{
PhotoMetadata* _tmp35_ = NULL;
GPSpinIdleWrapper* _tmp36_;
@@ -10120,631 +10449,501 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
const gchar* _tmp40_;
PhotoMetadata* _tmp41_;
PhotoMetadata* _tmp42_;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = import_page_spin_idle_context;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp38_ = self->priv->camera;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = fulldir;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = filename;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = gp_load_metadata (_tmp37_, _tmp38_, _tmp39_, _tmp40_, &_inner_error_);
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = _tmp41_;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10134 "ImportPage.c"
- goto __catch69_g_error;
+#line 10463 "ImportPage.c"
+ goto __catch77_g_error;
}
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = _tmp35_;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (metadata);
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
metadata = _tmp42_;
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (_tmp35_);
-#line 10147 "ImportPage.c"
+#line 10476 "ImportPage.c"
}
- goto __finally69;
- __catch69_g_error:
+ goto __finally77;
+ __catch77_g_error:
{
GError* err = NULL;
const gchar* _tmp43_;
const gchar* _tmp44_;
GError* _tmp45_;
const gchar* _tmp46_;
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = fulldir;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp44_ = filename;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = err;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp46_ = _tmp45_->message;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1576: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_);
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10173 "ImportPage.c"
+#line 10502 "ImportPage.c"
}
- __finally69:
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ __finally77:
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (metadata);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_source);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_import_source_list);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10196 "ImportPage.c"
+#line 10525 "ImportPage.c"
}
}
-#line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
exif_only_md5 = NULL;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp47_ = metadata;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp47_ != NULL) {
-#line 10205 "ImportPage.c"
- guint8* flattened_sans_thumbnail = NULL;
+#line 10534 "ImportPage.c"
PhotoMetadata* _tmp48_;
- gint _tmp49_;
- guint8* _tmp50_;
- gint flattened_sans_thumbnail_length1;
- gint _flattened_sans_thumbnail_size_;
- gboolean _tmp51_ = FALSE;
- guint8* _tmp52_;
- gint _tmp52__length1;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gchar* _tmp49_;
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = metadata;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = photo_metadata_flatten_exif (_tmp48_, FALSE, &_tmp49_);
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- flattened_sans_thumbnail = _tmp50_;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- flattened_sans_thumbnail_length1 = _tmp49_;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = flattened_sans_thumbnail;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52__length1 = flattened_sans_thumbnail_length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp52_ != NULL) {
-#line 10231 "ImportPage.c"
- guint8* _tmp53_;
- gint _tmp53__length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = flattened_sans_thumbnail;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53__length1 = flattened_sans_thumbnail_length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = _tmp53__length1 > 0;
-#line 10240 "ImportPage.c"
- } else {
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = FALSE;
-#line 10244 "ImportPage.c"
- }
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp51_) {
-#line 10248 "ImportPage.c"
- guint8* _tmp54_;
- gint _tmp54__length1;
- guint8* _tmp55_;
- gint _tmp55__length1;
- gchar* _tmp56_;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = flattened_sans_thumbnail;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54__length1 = flattened_sans_thumbnail_length1;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = flattened_sans_thumbnail;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55__length1 = flattened_sans_thumbnail_length1;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = md5_binary (_tmp54_, (gsize) _tmp55__length1);
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (exif_only_md5);
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- exif_only_md5 = _tmp56_;
-#line 10268 "ImportPage.c"
- }
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10272 "ImportPage.c"
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp49_ = photo_metadata_exif_hash (_tmp48_);
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (exif_only_md5);
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ exif_only_md5 = _tmp49_;
+#line 10545 "ImportPage.c"
}
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw_length1 = 0;
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _preview_raw_size_ = preview_raw_length1;
-#line 1568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw_length = (gsize) 0;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview = NULL;
-#line 10284 "ImportPage.c"
+#line 1594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ preview_md5 = NULL;
+#line 10551 "ImportPage.c"
{
gchar* preview_fulldir = NULL;
- const gchar* _tmp57_;
- gchar* _tmp58_;
+ const gchar* _tmp50_;
+ gchar* _tmp51_;
gchar* preview_filename = NULL;
- const gchar* _tmp59_;
- gchar* _tmp60_;
- PhotoImportSource* _tmp61_;
- GdkPixbuf* _tmp66_ = NULL;
- GPSpinIdleWrapper* _tmp67_;
- GPContext* _tmp68_;
- Camera* _tmp69_;
- const gchar* _tmp70_;
- const gchar* _tmp71_;
- guint8* _tmp72_ = NULL;
- gint _tmp73_;
- gsize _tmp74_ = 0UL;
- GdkPixbuf* _tmp75_;
- GdkPixbuf* _tmp76_;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = fulldir;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = g_strdup (_tmp57_);
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_fulldir = _tmp58_;
-#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = filename;
-#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = g_strdup (_tmp59_);
-#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_filename = _tmp60_;
-#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = associated;
-#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp61_ != NULL) {
-#line 10320 "ImportPage.c"
- PhotoImportSource* _tmp62_;
- gchar* _tmp63_;
- PhotoImportSource* _tmp64_;
- gchar* _tmp65_;
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = associated;
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp52_;
+ gchar* _tmp53_;
+ PhotoImportSource* _tmp54_;
+ GdkPixbuf* _tmp59_ = NULL;
+ GPSpinIdleWrapper* _tmp60_;
+ GPContext* _tmp61_;
+ Camera* _tmp62_;
+ const gchar* _tmp63_;
+ const gchar* _tmp64_;
+ gchar* _tmp65_ = NULL;
+ GdkPixbuf* _tmp66_;
+ GdkPixbuf* _tmp67_;
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp50_ = fulldir;
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp51_ = g_strdup (_tmp50_);
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ preview_fulldir = _tmp51_;
+#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp52_ = filename;
+#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp53_ = g_strdup (_tmp52_);
+#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ preview_filename = _tmp53_;
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp54_ = associated;
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp54_ != NULL) {
+#line 10585 "ImportPage.c"
+ PhotoImportSource* _tmp55_;
+ gchar* _tmp56_;
+ PhotoImportSource* _tmp57_;
+ gchar* _tmp58_;
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp55_ = associated;
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp56_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_fulldir = _tmp63_;
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = associated;
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ preview_fulldir = _tmp56_;
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp57_ = associated;
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp58_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_filename = _tmp65_;
-#line 10341 "ImportPage.c"
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ preview_filename = _tmp58_;
+#line 10606 "ImportPage.c"
}
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = import_page_spin_idle_context;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = self->priv->camera;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = preview_fulldir;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = preview_filename;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = gp_load_preview (_tmp68_, _tmp69_, _tmp70_, _tmp71_, &_tmp72_, &_tmp73_, &_tmp74_, &_inner_error_);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw = (g_free (preview_raw), NULL);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw = _tmp72_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw_length1 = _tmp73_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _preview_raw_size_ = preview_raw_length1;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw_length = _tmp74_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = _tmp75_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp60_ = import_page_spin_idle_context;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp61_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp62_ = self->priv->camera;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp63_ = preview_fulldir;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp64_ = preview_filename;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp66_ = gp_load_preview (_tmp61_, _tmp62_, _tmp63_, _tmp64_, &_tmp65_, &_inner_error_);
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (preview_md5);
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ preview_md5 = _tmp65_;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp59_ = _tmp66_;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10373 "ImportPage.c"
- goto __catch70_g_error;
+#line 10632 "ImportPage.c"
+ goto __catch78_g_error;
}
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = _tmp66_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = NULL;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp67_ = _tmp59_;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp59_ = NULL;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview = _tmp76_;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp66_);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ preview = _tmp67_;
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (_tmp59_);
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10390 "ImportPage.c"
+#line 10649 "ImportPage.c"
}
- goto __finally70;
- __catch70_g_error:
+ goto __finally78;
+ __catch78_g_error:
{
GError* err = NULL;
- const gchar* _tmp77_;
- gboolean _tmp78_;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ const gchar* _tmp68_;
+ gboolean _tmp69_;
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = filename;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = video_reader_is_supported_video_filename (_tmp77_);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp78_) {
-#line 10408 "ImportPage.c"
- const gchar* _tmp79_;
- const gchar* _tmp80_;
- GError* _tmp81_;
- const gchar* _tmp82_;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = fulldir;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = filename;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = err;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = _tmp81_->message;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp79_, _tmp80_, _tmp82_);
-#line 10423 "ImportPage.c"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp68_ = filename;
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp69_ = video_reader_is_supported_video_filename (_tmp68_);
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (!_tmp69_) {
+#line 10667 "ImportPage.c"
+ const gchar* _tmp70_;
+ const gchar* _tmp71_;
+ GError* _tmp72_;
+ const gchar* _tmp73_;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp70_ = fulldir;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp71_ = filename;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp72_ = err;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp73_ = _tmp72_->message;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1611: Unable to fetch preview for %s/%s: %s", _tmp70_, _tmp71_, _tmp73_);
+#line 10682 "ImportPage.c"
}
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10427 "ImportPage.c"
+#line 10686 "ImportPage.c"
}
- __finally70:
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ __finally78:
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (preview_md5);
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw = (g_free (preview_raw), NULL);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (exif_only_md5);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (metadata);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_source);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_import_source_list);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10456 "ImportPage.c"
+#line 10715 "ImportPage.c"
}
-#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_md5 = NULL;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = preview;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp85_ != NULL) {
-#line 10464 "ImportPage.c"
- guint8* _tmp86_;
- gint _tmp86__length1;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = preview_raw;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86__length1 = preview_raw_length1;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = _tmp86_ != NULL;
-#line 10473 "ImportPage.c"
- } else {
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = FALSE;
-#line 10477 "ImportPage.c"
- }
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp84_) {
-#line 10481 "ImportPage.c"
- gsize _tmp87_;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = preview_raw_length;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = _tmp87_ > ((gsize) 0);
-#line 10487 "ImportPage.c"
- } else {
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = FALSE;
-#line 10491 "ImportPage.c"
- }
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp83_) {
-#line 10495 "ImportPage.c"
- guint8* _tmp88_;
- gint _tmp88__length1;
- gsize _tmp89_;
- gchar* _tmp90_;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = preview_raw;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88__length1 = preview_raw_length1;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = preview_raw_length;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = md5_binary (_tmp88_, _tmp89_);
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (preview_md5);
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_md5 = _tmp90_;
-#line 10512 "ImportPage.c"
- }
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = import_source;
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10518 "ImportPage.c"
- ImportSource* _tmp92_;
- GdkPixbuf* _tmp93_;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = import_source;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = preview;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp92_) : NULL, _tmp93_);
-#line 10527 "ImportPage.c"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp74_ = import_source;
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 10721 "ImportPage.c"
+ ImportSource* _tmp75_;
+ GdkPixbuf* _tmp76_;
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp75_ = import_source;
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp76_ = preview;
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp75_) : NULL, _tmp76_);
+#line 10730 "ImportPage.c"
}
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = import_source;
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp94_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10533 "ImportPage.c"
- ImportSource* _tmp95_;
- GdkPixbuf* _tmp96_;
- const gchar* _tmp97_;
- PhotoMetadata* _tmp98_;
- const gchar* _tmp99_;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp95_ = import_source;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp96_ = preview;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp97_ = preview_md5;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp98_ = metadata;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp99_ = exif_only_md5;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp95_) : NULL, _tmp96_, _tmp97_, _tmp98_, _tmp99_);
-#line 10551 "ImportPage.c"
+#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp77_ = import_source;
+#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp77_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 10736 "ImportPage.c"
+ ImportSource* _tmp78_;
+ GdkPixbuf* _tmp79_;
+ const gchar* _tmp80_;
+ PhotoMetadata* _tmp81_;
+ const gchar* _tmp82_;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp78_ = import_source;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp79_ = preview;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp80_ = preview_md5;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp81_ = metadata;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp82_ = exif_only_md5;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp78_) : NULL, _tmp79_, _tmp80_, _tmp81_, _tmp82_);
+#line 10754 "ImportPage.c"
}
-#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp100_ = associated;
-#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp100_ != NULL) {
-#line 10557 "ImportPage.c"
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp83_ = associated;
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp83_ != NULL) {
+#line 10760 "ImportPage.c"
{
PhotoMetadata* associated_metadata = NULL;
- GPSpinIdleWrapper* _tmp101_;
- GPContext* _tmp102_;
- Camera* _tmp103_;
- PhotoImportSource* _tmp104_;
- gchar* _tmp105_;
- gchar* _tmp106_;
- PhotoImportSource* _tmp107_;
- gchar* _tmp108_;
- gchar* _tmp109_;
- PhotoMetadata* _tmp110_;
- PhotoMetadata* _tmp111_;
- PhotoImportSource* _tmp112_;
- GdkPixbuf* _tmp113_;
- const gchar* _tmp114_;
- PhotoMetadata* _tmp115_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp101_ = import_page_spin_idle_context;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp102_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp103_ = self->priv->camera;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp104_ = associated;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp105_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp106_ = _tmp105_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp107_ = associated;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp108_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp109_ = _tmp108_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp110_ = gp_load_metadata (_tmp102_, _tmp103_, _tmp106_, _tmp109_, &_inner_error_);
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp111_ = _tmp110_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp109_);
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp106_);
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- associated_metadata = _tmp111_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ GPSpinIdleWrapper* _tmp84_;
+ GPContext* _tmp85_;
+ Camera* _tmp86_;
+ PhotoImportSource* _tmp87_;
+ gchar* _tmp88_;
+ gchar* _tmp89_;
+ PhotoImportSource* _tmp90_;
+ gchar* _tmp91_;
+ gchar* _tmp92_;
+ PhotoMetadata* _tmp93_;
+ PhotoMetadata* _tmp94_;
+ PhotoImportSource* _tmp95_;
+ GdkPixbuf* _tmp96_;
+ const gchar* _tmp97_;
+ PhotoMetadata* _tmp98_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp84_ = import_page_spin_idle_context;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp86_ = self->priv->camera;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp87_ = associated;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp88_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp89_ = _tmp88_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp90_ = associated;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp91_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp92_ = _tmp91_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp93_ = gp_load_metadata (_tmp85_, _tmp86_, _tmp89_, _tmp92_, &_inner_error_);
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp94_ = _tmp93_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp92_);
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp89_);
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ associated_metadata = _tmp94_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10605 "ImportPage.c"
- goto __catch71_g_error;
+#line 10808 "ImportPage.c"
+ goto __catch79_g_error;
}
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp112_ = associated;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp113_ = preview;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp114_ = preview_md5;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp115_ = associated_metadata;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source_update (_tmp112_, _tmp113_, _tmp114_, _tmp115_, NULL);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp95_ = associated;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp96_ = preview;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp97_ = preview_md5;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp98_ = associated_metadata;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ photo_import_source_update (_tmp95_, _tmp96_, _tmp97_, _tmp98_, NULL);
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (associated_metadata);
-#line 10620 "ImportPage.c"
+#line 10823 "ImportPage.c"
}
- goto __finally71;
- __catch71_g_error:
+ goto __finally79;
+ __catch79_g_error:
{
GError* err = NULL;
- PhotoImportSource* _tmp116_;
- gchar* _tmp117_;
- gchar* _tmp118_;
- PhotoImportSource* _tmp119_;
- gchar* _tmp120_;
- gchar* _tmp121_;
- GError* _tmp122_;
- const gchar* _tmp123_;
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ PhotoImportSource* _tmp99_;
+ gchar* _tmp100_;
+ gchar* _tmp101_;
+ PhotoImportSource* _tmp102_;
+ gchar* _tmp103_;
+ gchar* _tmp104_;
+ GError* _tmp105_;
+ const gchar* _tmp106_;
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp116_ = associated;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp117_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp118_ = _tmp117_;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp119_ = associated;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp120_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp121_ = _tmp120_;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp122_ = err;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp123_ = _tmp122_->message;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp118_, _tmp121_, _tmp123_);
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp121_);
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp118_);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp99_ = associated;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp100_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp101_ = _tmp100_;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp102_ = associated;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp103_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp104_ = _tmp103_;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp105_ = err;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp106_ = _tmp105_->message;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_warning ("ImportPage.vala:1632: Unable to fetch metadata for %s/%s: %s", _tmp101_, _tmp104_, _tmp106_);
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp104_);
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp101_);
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10662 "ImportPage.c"
+#line 10865 "ImportPage.c"
}
- __finally71:
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ __finally79:
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_md5);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw = (g_free (preview_raw), NULL);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (exif_only_md5);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (metadata);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_source);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_import_source_list);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10693 "ImportPage.c"
+#line 10894 "ImportPage.c"
}
}
-#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp124_ = self->priv->import_sources;
-#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp125_ = import_source;
-#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_OBJECT, DataObject));
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp126_ = self->priv->progress_bar;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp127_ = loaded_photos;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- loaded_photos = _tmp127_ + 1;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp128_ = loaded_photos;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp129_ = import_list;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp130_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp131_ = _tmp130_;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp126_, ((gdouble) _tmp128_) / ((gdouble) _tmp131_));
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp107_ = self->priv->import_sources;
+#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp108_ = import_source;
+#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_DATA_OBJECT, DataObject));
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp109_ = self->priv->progress_bar;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp110_ = loaded_photos;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ loaded_photos = _tmp110_ + 1;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp111_ = loaded_photos;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp112_ = import_list;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp113_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp114_ = _tmp113_;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ gtk_progress_bar_set_fraction (_tmp109_, ((gdouble) _tmp111_) / ((gdouble) _tmp114_));
+#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
spin_event_loop ();
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_md5);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw = (g_free (preview_raw), NULL);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (exif_only_md5);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (metadata);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_source);
-#line 10738 "ImportPage.c"
+#line 10937 "ImportPage.c"
}
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_import_source_list);
-#line 10742 "ImportPage.c"
+#line 10941 "ImportPage.c"
}
}
@@ -10756,58 +10955,58 @@ static void import_page_on_hide_imported (ImportPage* self) {
ConfigFacade* _tmp9_;
GtkCheckButton* _tmp10_;
gboolean _tmp11_;
-#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->hide_imported;
-#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 10762 "ImportPage.c"
+#line 10961 "ImportPage.c"
ViewCollection* _tmp2_;
ViewCollection* _tmp3_;
ImportPageHideImportedViewFilter* _tmp4_;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->hide_imported_filter;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
view_collection_install_view_filter (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp3_);
-#line 10776 "ImportPage.c"
+#line 10975 "ImportPage.c"
} else {
ViewCollection* _tmp5_;
ViewCollection* _tmp6_;
ImportPageHideImportedViewFilter* _tmp7_;
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp5_;
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = self->priv->hide_imported_filter;
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
view_collection_remove_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp6_);
-#line 10791 "ImportPage.c"
+#line 10990 "ImportPage.c"
}
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = config_facade_get_instance ();
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp8_;
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = self->priv->hide_imported;
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_);
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
-#line 10805 "ImportPage.c"
+#line 11004 "ImportPage.c"
}
@@ -10816,23 +11015,23 @@ static void import_page_on_import_selected (ImportPage* self) {
ViewCollection* _tmp1_;
GeeList* _tmp2_;
GeeList* _tmp3_;
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp0_;
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_;
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 10830 "ImportPage.c"
+#line 11029 "ImportPage.c"
}
@@ -10841,53 +11040,53 @@ static void import_page_on_import_all (ImportPage* self) {
ViewCollection* _tmp1_;
GeeCollection* _tmp2_;
GeeCollection* _tmp3_;
-#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp0_;
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_;
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 10855 "ImportPage.c"
+#line 11054 "ImportPage.c"
}
static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, gpointer self) {
gint64 result;
result = import_page_import_job_comparator ((ImportPage*) self, a, b);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 10864 "ImportPage.c"
+#line 11063 "ImportPage.c"
}
static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import_reporter ((ImportPage*) self, manifest);
-#line 10871 "ImportPage.c"
+#line 11070 "ImportPage.c"
}
static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) {
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 10878 "ImportPage.c"
+#line 11077 "ImportPage.c"
}
static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_close_import ((ImportPage*) self);
-#line 10885 "ImportPage.c"
+#line 11084 "ImportPage.c"
}
@@ -10911,82 +11110,82 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
SortedList* _tmp58_;
gint _tmp59_;
gint _tmp60_;
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (GEE_IS_ITERABLE (items));
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->camera;
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_page_spin_idle_context;
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = gp_camera_init (_tmp0_, _tmp2_);
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
res = _tmp3_;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = res;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ != GP_OK) {
-#line 10927 "ImportPage.c"
+#line 11126 "ImportPage.c"
int _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
gchar* _tmp9_;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = res;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = gp_result_to_full_string (_tmp5_);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _tmp6_;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp7_);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp8_;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
app_window_error_message (_tmp9_, NULL);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp9_);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp7_);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10951 "ImportPage.c"
+#line 11150 "ImportPage.c"
}
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = self->priv->refreshed;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, TRUE, _tmp10_);
-#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = self->priv->progress_bar;
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
jobs = _tmp12_;
-#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
-#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
already_imported = _tmp13_;
-#line 10971 "ImportPage.c"
+#line 11170 "ImportPage.c"
{
GeeIterator* _object_it = NULL;
GeeIterable* _tmp14_;
GeeIterator* _tmp15_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = items;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_object_it = _tmp15_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 10984 "ImportPage.c"
+#line 11183 "ImportPage.c"
GeeIterator* _tmp16_;
gboolean _tmp17_;
DataObject* object = NULL;
@@ -11008,41 +11207,41 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
ImportSource* _tmp41_;
SortedList* _tmp52_;
ImportPageCameraImportJob* _tmp53_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = _object_it;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp17_) {
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11014 "ImportPage.c"
+#line 11213 "ImportPage.c"
}
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = _object_it;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
object = (DataObject*) _tmp19_;
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = object;
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview = _tmp21_;
-#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = preview;
-#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_VIEW, DataView));
-#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = preview;
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = import_preview_is_already_imported (_tmp24_);
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp25_) {
-#line 11040 "ImportPage.c"
+#line 11239 "ImportPage.c"
ImportSource* _tmp26_;
gchar* _tmp27_;
gchar* _tmp28_;
@@ -11054,84 +11253,84 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
DuplicatedFile* _tmp34_;
ImportPageCameraImportJob* _tmp35_;
ImportPageCameraImportJob* _tmp36_;
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = import_file;
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = import_source_get_filename (_tmp26_);
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = _tmp27_;
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1669: Skipping import of %s: checksum detected in libr" \
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_message ("ImportPage.vala:1689: Skipping import of %s: checksum detected in libr" \
"ary", _tmp28_);
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp28_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = already_imported;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = import_page_null_context;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = import_file;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = preview;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = import_preview_get_duplicated_file (_tmp32_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = _tmp33_;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = import_page_camera_import_job_new (_tmp30_, _tmp31_, _tmp34_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = _tmp35_;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (_tmp36_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp34_);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_file);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (object);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 11092 "ImportPage.c"
+#line 11291 "ImportPage.c"
}
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp37_ = import_page_null_context;
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp38_ = import_file;
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = import_page_camera_import_job_new (_tmp37_, _tmp38_, NULL);
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_job = _tmp39_;
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = import_file;
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11106 "ImportPage.c"
+#line 11305 "ImportPage.c"
ImportSource* _tmp42_;
PhotoImportSource* _tmp43_;
PhotoImportSource* _tmp44_;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = import_file;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp44_ = _tmp43_;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = _tmp44_ != NULL;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp44_);
-#line 11120 "ImportPage.c"
+#line 11319 "ImportPage.c"
} else {
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = FALSE;
-#line 11124 "ImportPage.c"
+#line 11323 "ImportPage.c"
}
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp40_) {
-#line 11128 "ImportPage.c"
+#line 11327 "ImportPage.c"
ImportPageCameraImportJob* _tmp45_;
GPContextWrapper* _tmp46_;
ImportSource* _tmp47_;
@@ -11139,67 +11338,67 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
PhotoImportSource* _tmp49_;
ImportPageCameraImportJob* _tmp50_;
ImportPageCameraImportJob* _tmp51_;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = import_job;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp46_ = import_page_null_context;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp47_ = import_file;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = _tmp48_;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = import_page_camera_import_job_new (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp51_ = _tmp50_;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (_tmp51_);
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp49_);
-#line 11156 "ImportPage.c"
+#line 11355 "ImportPage.c"
}
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = jobs;
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = import_job;
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (import_job);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_file);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (object);
-#line 11172 "ImportPage.c"
+#line 11371 "ImportPage.c"
}
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_object_it);
-#line 11176 "ImportPage.c"
+#line 11375 "ImportPage.c"
}
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp54_ = jobs;
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp56_ = _tmp55_;
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp57_ = self->priv->camera_name;
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp56_, _tmp57_);
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_debug ("ImportPage.vala:1710: Importing %d files from %s", _tmp56_, _tmp57_);
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp58_ = jobs;
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp60_ = _tmp59_;
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp60_ > 0) {
-#line 11196 "ImportPage.c"
+#line 11395 "ImportPage.c"
ImportPage* _tmp61_;
ImportPage* _tmp62_;
BatchImport* batch_import = NULL;
@@ -11214,92 +11413,92 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
BatchImport* _tmp71_;
LibraryWindow* _tmp72_;
LibraryWindow* _tmp73_;
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp61_ = self->priv->local_ref;
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_vala_assert (_tmp61_ == NULL, "local_ref == null");
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp62_ = _g_object_ref0 (self);
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->local_ref);
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->local_ref = _tmp62_;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp63_ = jobs;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp64_ = self->priv->camera_name;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp65_ = already_imported;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp66_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ITERABLE, GeeIterable), _tmp64_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp65_, NULL, NULL, NULL);
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
batch_import = _tmp66_;
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp67_ = batch_import;
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (_tmp67_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp68_ = batch_import;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_connect_object (_tmp68_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp69_ = library_window_get_app ();
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp70_ = _tmp69_;
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp71_ = batch_import;
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_window_enqueue_batch_import (_tmp70_, _tmp71_, TRUE);
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp70_);
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp72_ = library_window_get_app ();
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp73_ = _tmp72_;
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_window_switch_to_import_queue_page (_tmp73_);
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp73_);
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (batch_import);
-#line 11259 "ImportPage.c"
+#line 11458 "ImportPage.c"
} else {
GeeArrayList* _tmp74_;
gint _tmp75_;
gint _tmp76_;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp74_ = already_imported;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp76_ = _tmp75_;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp76_ > 0) {
-#line 11272 "ImportPage.c"
+#line 11471 "ImportPage.c"
GeeArrayList* _tmp77_;
ImportManifest* _tmp78_;
ImportManifest* _tmp79_;
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp77_ = already_imported;
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp78_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_LIST, GeeList));
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp79_ = _tmp78_;
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import_reporter (self, _tmp79_);
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_manifest_unref0 (_tmp79_);
-#line 11286 "ImportPage.c"
+#line 11485 "ImportPage.c"
}
-#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_close_import (self);
-#line 11290 "ImportPage.c"
+#line 11489 "ImportPage.c"
}
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (already_imported);
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (jobs);
-#line 11296 "ImportPage.c"
+#line 11495 "ImportPage.c"
}
@@ -11308,53 +11507,53 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
BatchImportResult* _tmp1_;
GFile* _tmp2_;
GError * _inner_error_ = NULL;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_BATCH_IMPORT_RESULT (_result_));
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _result_;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp1_->file;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_ == NULL) {
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
-#line 11317 "ImportPage.c"
+#line 11516 "ImportPage.c"
} else {
BatchImportResult* _tmp3_;
ImportResult _tmp4_;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _result_;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = _tmp3_->result;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11327 "ImportPage.c"
+#line 11526 "ImportPage.c"
}
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 1716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11333 "ImportPage.c"
+#line 11532 "ImportPage.c"
}
{
BatchImportResult* _tmp5_;
GFile* _tmp6_;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _result_;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp5_->file;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_file_delete (_tmp6_, NULL, &_inner_error_);
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11346 "ImportPage.c"
- goto __catch72_g_error;
+#line 11545 "ImportPage.c"
+ goto __catch80_g_error;
}
}
- goto __finally72;
- __catch72_g_error:
+ goto __finally80;
+ __catch80_g_error:
{
GError* err = NULL;
BatchImportResult* _tmp7_;
@@ -11363,57 +11562,57 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
gchar* _tmp10_;
GError* _tmp11_;
const gchar* _tmp12_;
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _result_;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = _tmp7_->file;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = g_file_get_path (_tmp8_);
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _tmp9_;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = err;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = _tmp11_->message;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1722: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_);
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_message ("ImportPage.vala:1742: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_);
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp10_);
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 11382 "ImportPage.c"
+#line 11581 "ImportPage.c"
}
- __finally72:
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ __finally80:
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11393 "ImportPage.c"
+#line 11592 "ImportPage.c"
}
}
static gpointer _batch_import_job_ref0 (gpointer self) {
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? batch_import_job_ref (self) : NULL;
-#line 11401 "ImportPage.c"
+#line 11600 "ImportPage.c"
}
static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
gboolean result;
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 11410 "ImportPage.c"
+#line 11609 "ImportPage.c"
}
@@ -11442,31 +11641,31 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
gint _tmp85_;
gint _tmp86_;
ProgressDialog* _tmp91_;
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->local_ref;
-#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
local_ref = _tmp1_;
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->local_ref);
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->local_ref = NULL;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = manifest;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_->success;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _tmp4_;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_ > 0) {
-#line 11463 "ImportPage.c"
+#line 11662 "ImportPage.c"
gchar* photos_string = NULL;
ImportManifest* _tmp6_;
GeeList* _tmp7_;
@@ -11521,166 +11720,166 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
ImportManifest* _tmp51_;
ImportUIQuestionParams* _tmp52_;
gboolean _tmp53_;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = manifest;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _tmp6_->success;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp8_;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = manifest;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp10_->success;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = _tmp12_;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_), _tmp13_);
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photos_string = _tmp14_;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = manifest;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = _tmp15_->success;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = _tmp17_;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = manifest;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = _tmp19_->success;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = _tmp21_;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp18_), _tmp22_);
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
videos_string = _tmp23_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = manifest;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = _tmp24_->success;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = _tmp26_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = manifest;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = _tmp28_->success;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = _tmp30_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp27_), _tmp31_);
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
both_string = _tmp32_;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = manifest;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = _tmp33_->success;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = _tmp35_;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp37_ = manifest;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp38_ = _tmp37_->success;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp40_ = _tmp39_;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp36_), _tmp40_);
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
neither_string = _tmp41_;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = manifest;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = _tmp42_->success;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp44_ = photos_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = videos_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp46_ = both_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp47_ = neither_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_, _tmp45_, _tmp46_, _tmp47_);
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
question_string = _tmp48_;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = question_string;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = import_ui_question_params_new (_tmp49_, RESOURCES_DELETE_LABEL, _ ("_Keep"));
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
question = _tmp50_;
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp51_ = manifest;
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = question;
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = import_ui_report_manifest (_tmp51_, FALSE, _tmp52_);
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp53_) {
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_ui_question_params_unref0 (question);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (question_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (neither_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (both_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (videos_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (photos_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11644 "ImportPage.c"
+#line 11843 "ImportPage.c"
}
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_ui_question_params_unref0 (question);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (question_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (neither_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (both_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (videos_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (photos_string);
-#line 11658 "ImportPage.c"
+#line 11857 "ImportPage.c"
} else {
ImportManifest* _tmp54_;
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp54_ = manifest;
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_ui_report_manifest (_tmp54_, FALSE, NULL);
-#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
-#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11669 "ImportPage.c"
+#line 11868 "ImportPage.c"
}
-#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = self->priv->import_sources;
-#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp56_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
marker = _tmp56_;
-#line 11677 "ImportPage.c"
+#line 11876 "ImportPage.c"
{
GeeList* _batch_result_list = NULL;
ImportManifest* _tmp57_;
@@ -11691,27 +11890,27 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
gint _tmp61_;
gint _tmp62_;
gint _batch_result_index = 0;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp57_ = manifest;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp58_ = _tmp57_->success;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = _g_object_ref0 (_tmp58_);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_result_list = _tmp59_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp60_ = _batch_result_list;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp61_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp62_ = _tmp61_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_result_size = _tmp62_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_result_index = -1;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 11708 "ImportPage.c"
+#line 11907 "ImportPage.c"
gint _tmp63_;
gint _tmp64_;
gint _tmp65_;
@@ -11727,129 +11926,129 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
ImportPageCameraImportJob* _tmp73_;
ImportSource* _tmp74_;
ImportSource* _tmp75_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp63_ = _batch_result_index;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_result_index = _tmp63_ + 1;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp64_ = _batch_result_index;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp65_ = _batch_result_size;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!(_tmp64_ < _tmp65_)) {
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11736 "ImportPage.c"
+#line 11935 "ImportPage.c"
}
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp66_ = _batch_result_list;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp67_ = _batch_result_index;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp68_ = gee_list_get (_tmp66_, _tmp67_);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
batch_result = (BatchImportResult*) _tmp68_;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp69_ = batch_result;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp70_ = _tmp69_->job;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp71_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp70_) : NULL);
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
job = _tmp71_;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp72_ = marker;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp73_ = job;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp74_ = import_page_camera_import_job_get_source (_tmp73_);
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp75_ = _tmp74_;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
marker_mark (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_OBJECT, DataObject));
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp75_);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (job);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_result_unref0 (batch_result);
-#line 11770 "ImportPage.c"
+#line 11969 "ImportPage.c"
}
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_batch_result_list);
-#line 11774 "ImportPage.c"
+#line 11973 "ImportPage.c"
}
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp76_ = app_window_get_instance ();
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp77_ = _tmp76_;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp78_ = g_cancellable_new ();
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp79_ = _tmp78_;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp80_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp79_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp80_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp81_ = _tmp80_;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp79_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp77_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
progress = _tmp81_;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp82_ = self->priv->import_sources;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp83_ = marker;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp84_ = progress;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp85_ = source_collection_destroy_marked (_tmp82_, _tmp83_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp84_, NULL);
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
error_count = _tmp85_;
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp86_ = error_count;
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp86_ > 0) {
-#line 11810 "ImportPage.c"
+#line 12009 "ImportPage.c"
gchar* error_string = NULL;
gint _tmp87_;
gint _tmp88_;
gchar* _tmp89_;
const gchar* _tmp90_;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp87_ = error_count;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp88_ = error_count;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp89_ = g_strdup_printf (ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp87_), _tmp88_);
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
error_string = _tmp89_;
-#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp90_ = error_string;
-#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
app_window_error_message (_tmp90_, NULL);
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (error_string);
-#line 11830 "ImportPage.c"
+#line 12029 "ImportPage.c"
}
-#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp91_ = progress;
-#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
progress_dialog_close (_tmp91_);
-#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
-#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
local_ref = NULL;
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (progress);
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (marker);
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
-#line 11846 "ImportPage.c"
+#line 12045 "ImportPage.c"
}
@@ -11861,45 +12060,45 @@ static void import_page_close_import (ImportPage* self) {
int _tmp3_;
int _tmp4_;
gboolean _tmp8_;
-#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->camera;
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_page_spin_idle_context;
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = gp_camera_exit (_tmp0_, _tmp2_);
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
res = _tmp3_;
-#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = res;
-#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ != GP_OK) {
-#line 11874 "ImportPage.c"
+#line 12073 "ImportPage.c"
int _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = res;
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = gp_result_to_full_string (_tmp5_);
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _tmp6_;
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1792: Unable to unlock camera: %s", _tmp7_);
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_message ("ImportPage.vala:1812: Unable to unlock camera: %s", _tmp7_);
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp7_);
-#line 11888 "ImportPage.c"
+#line 12087 "ImportPage.c"
}
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->refreshed;
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, _tmp8_);
-#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 11896 "ImportPage.c"
+#line 12095 "ImportPage.c"
}
@@ -11907,24 +12106,24 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea
ImportPage * self;
gboolean _tmp0_;
gboolean _tmp1_;
-#line 1800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = display;
-#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
CHECKERBOARD_PAGE_CLASS (import_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_);
-#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = display;
-#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 11914 "ImportPage.c"
+#line 12113 "ImportPage.c"
}
static gpointer _view_filter_ref0 (gpointer self) {
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? view_filter_ref (self) : NULL;
-#line 11921 "ImportPage.c"
+#line 12120 "ImportPage.c"
}
@@ -11933,17 +12132,17 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
SearchViewFilter* result = NULL;
ImportPageImportPageSearchViewFilter* _tmp0_;
SearchViewFilter* _tmp1_;
-#line 1807 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->search_filter;
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 11940 "ImportPage.c"
+#line 12139 "ImportPage.c"
}
@@ -11965,14 +12164,14 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G
self->priv->owner = _tmp1_;
#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 11962 "ImportPage.c"
+#line 12161 "ImportPage.c"
}
static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) {
#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner);
-#line 11969 "ImportPage.c"
+#line 12168 "ImportPage.c"
}
@@ -11993,7 +12192,7 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager*
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 11990 "ImportPage.c"
+#line 12189 "ImportPage.c"
}
@@ -12006,14 +12205,14 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana
g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) import_page_import_view_manager_real_create_view;
-#line 12003 "ImportPage.c"
+#line 12202 "ImportPage.c"
}
static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) {
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 12010 "ImportPage.c"
+#line 12209 "ImportPage.c"
}
@@ -12025,7 +12224,7 @@ static void import_page_import_view_manager_finalize (ViewManager * obj) {
_g_object_unref0 (self->priv->owner);
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj);
-#line 12022 "ImportPage.c"
+#line 12221 "ImportPage.c"
}
@@ -12044,7 +12243,7 @@ static GType import_page_import_view_manager_get_type (void) {
static gpointer _gp_context_wrapper_ref0 (gpointer self) {
#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? gp_context_wrapper_ref (self) : NULL;
-#line 12041 "ImportPage.c"
+#line 12240 "ImportPage.c"
}
@@ -12140,7 +12339,7 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
_tmp16_ = import_file;
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 12137 "ImportPage.c"
+#line 12336 "ImportPage.c"
ImportSource* _tmp17_;
PhotoMetadata* _tmp18_;
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12151,13 +12350,13 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
_media_metadata_unref0 (_tmp15_);
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = _tmp18_;
-#line 12148 "ImportPage.c"
+#line 12347 "ImportPage.c"
} else {
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (_tmp15_);
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = NULL;
-#line 12154 "ImportPage.c"
+#line 12353 "ImportPage.c"
}
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12175,14 +12374,14 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
_media_metadata_unref0 (_tmp15_);
#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 12172 "ImportPage.c"
+#line 12371 "ImportPage.c"
}
static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_camera_import_job_construct (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, context, import_file, duplicated_file);
-#line 12179 "ImportPage.c"
+#line 12378 "ImportPage.c"
}
@@ -12197,7 +12396,7 @@ static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraI
result = _tmp0_;
#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12194 "ImportPage.c"
+#line 12393 "ImportPage.c"
}
@@ -12216,7 +12415,7 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B
result = _tmp1_;
#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12213 "ImportPage.c"
+#line 12412 "ImportPage.c"
}
@@ -12231,23 +12430,23 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
_tmp1_ = self->priv->import_file;
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 12228 "ImportPage.c"
+#line 12427 "ImportPage.c"
time_t _tmp2_;
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = import_page_camera_import_job_get_exposure_time (self);
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp2_;
-#line 12234 "ImportPage.c"
+#line 12433 "ImportPage.c"
} else {
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = (time_t) 0;
-#line 12238 "ImportPage.c"
+#line 12437 "ImportPage.c"
}
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12244 "ImportPage.c"
+#line 12443 "ImportPage.c"
}
@@ -12266,7 +12465,7 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor
result = _tmp1_;
#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12263 "ImportPage.c"
+#line 12462 "ImportPage.c"
}
@@ -12285,7 +12484,7 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp
result = _tmp1_;
#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12282 "ImportPage.c"
+#line 12481 "ImportPage.c"
}
@@ -12304,7 +12503,7 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
result = _tmp1_;
#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12301 "ImportPage.c"
+#line 12500 "ImportPage.c"
}
@@ -12323,7 +12522,7 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base)
result = _tmp1_;
#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12320 "ImportPage.c"
+#line 12519 "ImportPage.c"
}
@@ -12343,7 +12542,7 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b
_batch_import_job_unref0 (self->priv->associated);
#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->associated = _tmp1_;
-#line 12340 "ImportPage.c"
+#line 12539 "ImportPage.c"
}
@@ -12361,7 +12560,7 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI
result = _tmp1_;
#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12358 "ImportPage.c"
+#line 12557 "ImportPage.c"
}
@@ -12374,7 +12573,7 @@ static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob*
result = FALSE;
#line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12371 "ImportPage.c"
+#line 12570 "ImportPage.c"
}
@@ -12400,21 +12599,21 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp
if (filesize) {
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*filesize = _vala_filesize;
-#line 12397 "ImportPage.c"
+#line 12596 "ImportPage.c"
}
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (file) {
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*file = _vala_file;
-#line 12403 "ImportPage.c"
+#line 12602 "ImportPage.c"
} else {
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file);
-#line 12407 "ImportPage.c"
+#line 12606 "ImportPage.c"
}
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12411 "ImportPage.c"
+#line 12610 "ImportPage.c"
}
@@ -12440,7 +12639,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_vala_copy_to_library = FALSE;
#line 562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
dest_file = NULL;
-#line 12437 "ImportPage.c"
+#line 12636 "ImportPage.c"
{
gboolean collision = FALSE;
GFile* _tmp0_ = NULL;
@@ -12464,8 +12663,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp0_ = _tmp5_;
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12461 "ImportPage.c"
- goto __catch73_g_error;
+#line 12660 "ImportPage.c"
+ goto __catch81_g_error;
}
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp0_;
@@ -12477,10 +12676,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
dest_file = _tmp6_;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
-#line 12474 "ImportPage.c"
+#line 12673 "ImportPage.c"
}
- goto __finally73;
- __catch73_g_error:
+ goto __finally81;
+ __catch81_g_error:
{
GError* err = NULL;
ImportSource* _tmp7_;
@@ -12508,12 +12707,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_free0 (_tmp9_);
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 12505 "ImportPage.c"
+#line 12704 "ImportPage.c"
}
- __finally73:
+ __finally81:
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12510 "ImportPage.c"
+#line 12709 "ImportPage.c"
gboolean _tmp12_ = FALSE;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12521,13 +12720,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp12_;
-#line 12518 "ImportPage.c"
+#line 12717 "ImportPage.c"
}
#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = dest_file;
#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp13_ == NULL) {
-#line 12524 "ImportPage.c"
+#line 12723 "ImportPage.c"
ImportSource* _tmp14_;
gchar* _tmp15_;
gchar* _tmp16_;
@@ -12549,27 +12748,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
if (file_to_import) {
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*file_to_import = _vala_file_to_import;
-#line 12546 "ImportPage.c"
+#line 12745 "ImportPage.c"
} else {
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12550 "ImportPage.c"
+#line 12749 "ImportPage.c"
}
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (copy_to_library) {
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*copy_to_library = _vala_copy_to_library;
-#line 12556 "ImportPage.c"
+#line 12755 "ImportPage.c"
}
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12560 "ImportPage.c"
+#line 12759 "ImportPage.c"
}
#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = dest_file;
#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_blacklist_file (_tmp17_, "CameraImportJob.prepare");
-#line 12566 "ImportPage.c"
+#line 12765 "ImportPage.c"
{
GPContextWrapper* _tmp18_;
GPContext* _tmp19_;
@@ -12593,22 +12792,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
gp_save_image (_tmp19_, _tmp20_, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12590 "ImportPage.c"
- goto __finally74;
+#line 12789 "ImportPage.c"
+ goto __finally82;
}
}
- __finally74:
+ __finally82:
{
GFile* _tmp24_;
#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = dest_file;
#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_unblacklist_file (_tmp24_);
-#line 12601 "ImportPage.c"
+#line 12800 "ImportPage.c"
}
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12605 "ImportPage.c"
+#line 12804 "ImportPage.c"
gboolean _tmp25_ = FALSE;
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12616,13 +12815,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp25_;
-#line 12613 "ImportPage.c"
+#line 12812 "ImportPage.c"
}
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->associated;
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp26_ != NULL) {
-#line 12619 "ImportPage.c"
+#line 12818 "ImportPage.c"
BackingPhotoRow* _tmp42_;
GFile* assoc_dest = NULL;
BackingPhotoRow* _tmp45_;
@@ -12664,8 +12863,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp27_ = _tmp35_;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12661 "ImportPage.c"
- goto __catch75_g_error;
+#line 12860 "ImportPage.c"
+ goto __catch83_g_error;
}
#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = _tmp27_;
@@ -12677,10 +12876,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
self->priv->associated_file = _tmp36_;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_backing_photo_row_unref0 (_tmp27_);
-#line 12674 "ImportPage.c"
+#line 12873 "ImportPage.c"
}
- goto __finally75;
- __catch75_g_error:
+ goto __finally83;
+ __catch83_g_error:
{
GError* err = NULL;
ImportPageCameraImportJob* _tmp37_;
@@ -12704,12 +12903,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
": %s", _tmp38_, _tmp40_);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 12700 "ImportPage.c"
+#line 12899 "ImportPage.c"
}
- __finally75:
+ __finally83:
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12705 "ImportPage.c"
+#line 12904 "ImportPage.c"
gboolean _tmp41_ = FALSE;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12717,13 +12916,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp41_;
-#line 12713 "ImportPage.c"
+#line 12912 "ImportPage.c"
}
#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = self->priv->associated_file;
#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp42_ == NULL) {
-#line 12719 "ImportPage.c"
+#line 12918 "ImportPage.c"
ImportPageCameraImportJob* _tmp43_;
const gchar* _tmp44_;
#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12740,21 +12939,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
if (file_to_import) {
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*file_to_import = _vala_file_to_import;
-#line 12736 "ImportPage.c"
+#line 12935 "ImportPage.c"
} else {
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12740 "ImportPage.c"
+#line 12939 "ImportPage.c"
}
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (copy_to_library) {
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*copy_to_library = _vala_copy_to_library;
-#line 12746 "ImportPage.c"
+#line 12945 "ImportPage.c"
}
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12750 "ImportPage.c"
+#line 12949 "ImportPage.c"
}
#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = self->priv->associated_file;
@@ -12768,7 +12967,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp48_ = assoc_dest;
#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare");
-#line 12764 "ImportPage.c"
+#line 12963 "ImportPage.c"
{
GPContextWrapper* _tmp49_;
GPContext* _tmp50_;
@@ -12798,22 +12997,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
gp_save_image (_tmp50_, _tmp51_, _tmp53_, _tmp55_, _tmp56_, &_inner_error_);
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12794 "ImportPage.c"
- goto __finally76;
+#line 12993 "ImportPage.c"
+ goto __finally84;
}
}
- __finally76:
+ __finally84:
{
GFile* _tmp57_;
#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp57_ = assoc_dest;
#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_unblacklist_file (_tmp57_);
-#line 12805 "ImportPage.c"
+#line 13004 "ImportPage.c"
}
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12809 "ImportPage.c"
+#line 13008 "ImportPage.c"
gboolean _tmp58_ = FALSE;
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12823,11 +13022,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp58_;
-#line 12819 "ImportPage.c"
+#line 13018 "ImportPage.c"
}
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (assoc_dest);
-#line 12823 "ImportPage.c"
+#line 13022 "ImportPage.c"
}
#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = dest_file;
@@ -12847,107 +13046,54 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
if (file_to_import) {
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*file_to_import = _vala_file_to_import;
-#line 12843 "ImportPage.c"
+#line 13042 "ImportPage.c"
} else {
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12847 "ImportPage.c"
+#line 13046 "ImportPage.c"
}
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (copy_to_library) {
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*copy_to_library = _vala_copy_to_library;
-#line 12853 "ImportPage.c"
+#line 13052 "ImportPage.c"
}
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12857 "ImportPage.c"
+#line 13056 "ImportPage.c"
}
-static gboolean import_page_camera_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
+static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base) {
ImportPageCameraImportJob * self;
- gboolean result = FALSE;
- gboolean ret = FALSE;
- MediaSource* _tmp0_;
- GError * _inner_error_ = NULL;
+ GFile* result = NULL;
+ BackingPhotoRow* _tmp0_;
+ BackingPhotoRow* _tmp1_;
+ const gchar* _tmp2_;
+ GFile* _tmp3_;
#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
-#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
-#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE);
#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ret = FALSE;
-#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = source;
+ _tmp0_ = self->priv->associated_file;
+#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ if (_tmp0_ == NULL) {
#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 12879 "ImportPage.c"
- Photo* photo = NULL;
- MediaSource* _tmp1_;
- Photo* _tmp2_;
- BackingPhotoRow* _tmp3_;
-#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = source;
-#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO) ? ((Photo*) _tmp1_) : NULL);
-#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo = _tmp2_;
-#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = self->priv->associated_file;
-#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp3_ != NULL) {
-#line 12894 "ImportPage.c"
- Photo* _tmp4_;
- BackingPhotoRow* _tmp5_;
- Photo* _tmp7_;
- ConfigFacade* _tmp8_;
- ConfigFacade* _tmp9_;
- RawDeveloper _tmp10_;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = photo;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = self->priv->associated_file;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_add_backing_photo_for_development (_tmp4_, RAW_DEVELOPER_CAMERA, _tmp5_, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12909 "ImportPage.c"
- gboolean _tmp6_ = FALSE;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_propagate_error (error, _inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (photo);
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return _tmp6_;
-#line 12917 "ImportPage.c"
- }
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ret = TRUE;
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = photo;
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = config_facade_get_instance ();
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp8_;
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_set_raw_developer (_tmp7_, _tmp10_);
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp9_);
-#line 12933 "ImportPage.c"
- }
+ result = NULL;
#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (photo);
-#line 12937 "ImportPage.c"
- }
-#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = ret;
-#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ return result;
+#line 13077 "ImportPage.c"
+ }
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp1_ = self->priv->associated_file;
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp2_ = _tmp1_->filepath;
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp3_ = g_file_new_for_path (_tmp2_);
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ result = _tmp3_;
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12943 "ImportPage.c"
+#line 13089 "ImportPage.c"
}
@@ -12979,8 +13125,8 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) import_page_camera_import_job_real_prepare;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
-#line 12976 "ImportPage.c"
+ ((BatchImportJobClass *) klass)->get_associated_file = (GFile* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_associated_file;
+#line 13122 "ImportPage.c"
}
@@ -12991,7 +13137,7 @@ static void import_page_camera_import_job_instance_init (ImportPageCameraImportJ
self->priv->associated = NULL;
#line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->associated_file = NULL;
-#line 12987 "ImportPage.c"
+#line 13133 "ImportPage.c"
}
@@ -13019,7 +13165,7 @@ static void import_page_camera_import_job_finalize (BatchImportJob * obj) {
_g_object_unref0 (self->priv->duplicated_file);
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj);
-#line 13015 "ImportPage.c"
+#line 13161 "ImportPage.c"
}
@@ -13038,13 +13184,13 @@ static GType import_page_camera_import_job_get_type (void) {
static guint import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base) {
ImportPageImportPageSearchViewFilter * self;
guint result = 0U;
-#line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter);
-#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA);
-#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13040 "ImportPage.c"
+#line 13186 "ImportPage.c"
}
@@ -13064,7 +13210,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
result = _tmp1_ != NULL;
#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 13060 "ImportPage.c"
+#line 13206 "ImportPage.c"
}
@@ -13077,186 +13223,186 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
gboolean _tmp2_ = FALSE;
guint _tmp3_;
guint _tmp26_;
-#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter);
-#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = view;
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
source = _tmp1_;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 13087 "ImportPage.c"
+#line 13233 "ImportPage.c"
gboolean _tmp4_;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp4_;
-#line 13093 "ImportPage.c"
+#line 13239 "ImportPage.c"
} else {
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = FALSE;
-#line 13097 "ImportPage.c"
+#line 13243 "ImportPage.c"
}
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 13101 "ImportPage.c"
+#line 13247 "ImportPage.c"
ImportSource* _tmp5_;
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = source;
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13107 "ImportPage.c"
+#line 13253 "ImportPage.c"
gboolean _tmp6_;
gboolean _tmp7_;
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = _tmp6_;
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp7_) {
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13122 "ImportPage.c"
+#line 13268 "ImportPage.c"
}
} else {
ImportSource* _tmp8_;
-#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = source;
-#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13130 "ImportPage.c"
+#line 13276 "ImportPage.c"
PhotoImportSource* photo = NULL;
ImportSource* _tmp9_;
PhotoImportSource* _tmp10_;
PhotoImportSource* _tmp11_;
PhotoFileFormat _tmp12_;
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = source;
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL);
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo = _tmp10_;
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = photo;
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = photo_import_source_get_file_format (_tmp11_);
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13148 "ImportPage.c"
+#line 13294 "ImportPage.c"
PhotoImportSource* _tmp13_;
PhotoImportSource* _tmp14_;
PhotoImportSource* _tmp15_;
gboolean _tmp16_;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = photo;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = photo_import_source_get_associated (_tmp13_);
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = _tmp14_;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = _tmp15_ != NULL;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp15_);
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp16_) {
-#line 13165 "ImportPage.c"
+#line 13311 "ImportPage.c"
gboolean _tmp17_ = FALSE;
gboolean _tmp18_;
gboolean _tmp19_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _tmp18_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp19_) {
-#line 13175 "ImportPage.c"
+#line 13321 "ImportPage.c"
gboolean _tmp20_;
gboolean _tmp21_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = _tmp20_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = !_tmp21_;
-#line 13184 "ImportPage.c"
+#line 13330 "ImportPage.c"
} else {
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = FALSE;
-#line 13188 "ImportPage.c"
+#line 13334 "ImportPage.c"
}
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp17_) {
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13200 "ImportPage.c"
+#line 13346 "ImportPage.c"
}
} else {
gboolean _tmp22_;
gboolean _tmp23_;
-#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = _tmp22_;
-#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp23_) {
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13219 "ImportPage.c"
+#line 13365 "ImportPage.c"
}
}
} else {
gboolean _tmp24_;
gboolean _tmp25_;
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = _tmp24_;
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp25_) {
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13239 "ImportPage.c"
+#line 13385 "ImportPage.c"
}
}
-#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 13244 "ImportPage.c"
+#line 13390 "ImportPage.c"
}
}
}
-#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13252 "ImportPage.c"
+#line 13398 "ImportPage.c"
const gchar* keywords = NULL;
ImportSource* _tmp27_;
const gchar* _tmp28_;
@@ -13264,104 +13410,104 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
gboolean _tmp30_;
gint _tmp31_;
gchar** _tmp32_;
-#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = source;
-#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_INDEXABLE, Indexable));
-#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
keywords = _tmp28_;
-#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = keywords;
-#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = is_string_empty (_tmp29_);
-#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp30_) {
-#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
-#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13278 "ImportPage.c"
+#line 13424 "ImportPage.c"
}
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp31_);
-#line 13282 "ImportPage.c"
+#line 13428 "ImportPage.c"
{
gchar** word_collection = NULL;
gint word_collection_length1 = 0;
gint _word_collection_size_ = 0;
gint word_it = 0;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
word_collection = _tmp32_;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
word_collection_length1 = _tmp31_;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13294 "ImportPage.c"
+#line 13440 "ImportPage.c"
const gchar* word = NULL;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
word = word_collection[word_it];
-#line 13298 "ImportPage.c"
+#line 13444 "ImportPage.c"
{
const gchar* _tmp33_;
const gchar* _tmp34_;
gboolean _tmp35_;
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = keywords;
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = word;
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = string_contains (_tmp33_, _tmp34_);
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp35_) {
-#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
-#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
-#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13317 "ImportPage.c"
+#line 13463 "ImportPage.c"
}
}
}
}
}
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13329 "ImportPage.c"
+#line 13475 "ImportPage.c"
}
static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type) {
ImportPageImportPageSearchViewFilter* self = NULL;
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 13339 "ImportPage.c"
+#line 13485 "ImportPage.c"
}
static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_import_page_search_view_filter_construct (IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER);
-#line 13346 "ImportPage.c"
+#line 13492 "ImportPage.c"
}
static void import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass) {
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import_page_search_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) import_page_import_page_search_view_filter_real_get_criteria;
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_import_page_search_view_filter_real_predicate;
-#line 13357 "ImportPage.c"
+#line 13503 "ImportPage.c"
}
@@ -13386,45 +13532,45 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
gboolean result = FALSE;
DataView* _tmp0_;
gboolean _tmp1_;
-#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter);
-#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = view;
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_preview_is_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = !_tmp1_;
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13394 "ImportPage.c"
+#line 13540 "ImportPage.c"
}
static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type) {
ImportPageHideImportedViewFilter* self = NULL;
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 13404 "ImportPage.c"
+#line 13550 "ImportPage.c"
}
static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13411 "ImportPage.c"
+#line 13557 "ImportPage.c"
}
static void import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass) {
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_hide_imported_view_filter_real_predicate;
-#line 13420 "ImportPage.c"
+#line 13566 "ImportPage.c"
}
@@ -13475,7 +13621,7 @@ static void import_page_class_init (ImportPageClass * klass) {
((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) import_page_real_get_search_view_filter;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = import_page_finalize;
-#line 13471 "ImportPage.c"
+#line 13617 "ImportPage.c"
}
@@ -13486,41 +13632,43 @@ static void import_page_instance_init (ImportPage * self) {
ImportPageHideImportedViewFilter* _tmp3_;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = IMPORT_PAGE_GET_PRIVATE (self);
-#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->import_sources = NULL;
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = (GtkLabel*) gtk_label_new (NULL);
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp0_);
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->camera_label = _tmp0_;
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_ref_sink (_tmp1_);
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->progress_bar = _tmp1_;
-#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->busy = FALSE;
-#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refreshed = FALSE;
-#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = GP_OK;
-#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_error = NULL;
-#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->volume_monitor = NULL;
-#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->local_ref = NULL;
-#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = import_page_import_page_search_view_filter_new ();
-#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->search_filter = _tmp2_;
-#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_page_hide_imported_view_filter_new ();
-#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->hide_imported_filter = _tmp3_;
-#line 13516 "ImportPage.c"
+#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ self->priv->claim_timeout = 500;
+#line 13664 "ImportPage.c"
}
@@ -13532,49 +13680,49 @@ static void import_page_finalize (GObject * obj) {
guint _tmp3_;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PAGE, ImportPage);
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = library_photo_global;
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self);
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = video_global;
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self);
-#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (self->priv->import_sources);
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->camera_label);
-#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->hide_imported);
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->progress_bar);
-#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_camera_unref0 (self->priv->camera);
-#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->uri);
-#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->refresh_error);
-#line 698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
-#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->volume_monitor);
-#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->local_ref);
-#line 701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->icon);
-#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_view_filter_unref0 (self->priv->search_filter);
-#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_view_filter_unref0 (self->priv->hide_imported_filter);
-#line 704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_core_tracker_unref0 (self->priv->tracker);
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (import_page_parent_class)->finalize (obj);
-#line 13570 "ImportPage.c"
+#line 13718 "ImportPage.c"
}
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 4e055ec..f7698a6 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -615,20 +615,13 @@ public class ImportPage : CheckerboardPage {
return true;
}
-
- public override bool complete(MediaSource source, BatchImportRoll import_roll) throws Error {
- bool ret = false;
- if (source is Photo) {
- Photo photo = source as Photo;
-
- // Associate paired JPEG with RAW photo.
- if (associated_file != null) {
- photo.add_backing_photo_for_development(RawDeveloper.CAMERA, associated_file);
- ret = true;
- photo.set_raw_developer(Config.Facade.get_instance().get_default_raw_developer());
- }
+
+ public override File? get_associated_file() {
+ if (associated_file == null) {
+ return null;
}
- return ret;
+
+ return File.new_for_path(associated_file.filepath);
}
}
@@ -917,8 +910,8 @@ public class ImportPage : CheckerboardPage {
protected override void init_actions(int selected_count, int count) {
on_view_changed();
- set_action_important("ImportSelected", true);
- set_action_important("ImportAll", true);
+ set_action_sensitive("ImportSelected", true);
+ set_action_sensitive("ImportAll", true);
base.init_actions(selected_count, count);
}
@@ -1015,6 +1008,17 @@ public class ImportPage : CheckerboardPage {
} catch (Error err) {
// error means not mounted
}
+
+ // Could not find mount for gphoto2://, re-try with mtp://
+ // It seems some devices are mounted using MTP and not gphoto2 daemon
+ if (mount == null && this.uri.has_prefix("gphoto2")) {
+ uri = File.new_for_uri("mtp" + this.uri.substring(7));
+ try {
+ mount = uri.find_enclosing_mount(null);
+ } catch (Error err) {
+ // error means not mounted
+ }
+ }
if (mount != null) {
// it's mounted, offer to unmount for the user
@@ -1153,22 +1157,45 @@ public class ImportPage : CheckerboardPage {
return false;
}
+ private int claim_timeout = 500;
+
private RefreshResult refresh_camera() {
if (busy)
return RefreshResult.BUSY;
- this.set_page_message (_("Starting import, please wait…"));
-
+ this.set_page_message (_("Connecting to camera, please wait…"));
update_status(busy, false);
refresh_error = null;
refresh_result = camera.init(spin_idle_context.context);
+
+ // If we fail to claim the device, we might have run into a conflict
+ // with gvfs-gphoto2-volume-monitor. Back off, try again after
+ // claim_timeout ms.
+ // We will wait 3.5s in total (500 + 1000 + 2000) before giving
+ // up with the infamous -53 error dialog.
+ if (refresh_result == GPhoto.Result.IO_USB_CLAIM) {
+ if (claim_timeout < 4000) {
+ Timeout.add (claim_timeout, () => {
+ refresh_camera();
+ return false;
+ });
+ claim_timeout *= 2;
+
+ return RefreshResult.LOCKED;
+ }
+ }
+
+ // reset claim_timeout to initial value
+ claim_timeout = 500;
+
if (refresh_result != GPhoto.Result.OK) {
warning("Unable to initialize camera: %s", refresh_result.to_full_string());
return (refresh_result == GPhoto.Result.IO_LOCK) ? RefreshResult.LOCKED : RefreshResult.LIBRARY_ERROR;
}
+ this.set_page_message (_("Starting import, please wait…"));
update_status(true, refreshed);
on_view_changed();
@@ -1379,6 +1406,7 @@ public class ImportPage : CheckerboardPage {
return true;
}
+ files.sort();
for (int ctr = 0; ctr < files.count(); ctr++) {
string filename;
@@ -1553,9 +1581,7 @@ public class ImportPage : CheckerboardPage {
// calculate EXIF's fingerprint
string? exif_only_md5 = null;
if (metadata != null) {
- uint8[]? flattened_sans_thumbnail = metadata.flatten_exif(false);
- if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0)
- exif_only_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length);
+ exif_only_md5 = metadata.exif_hash();
}
// XXX: Cannot use the metadata for the thumbnail preview because libgphoto2
@@ -1564,9 +1590,8 @@ public class ImportPage : CheckerboardPage {
// this means the preview orientation will be wrong and the MD5 is not generated
// if the EXIF did not parse properly (see above)
- uint8[] preview_raw = null;
- size_t preview_raw_length = 0;
Gdk.Pixbuf preview = null;
+ string? preview_md5 = null;
try {
string preview_fulldir = fulldir;
string preview_filename = filename;
@@ -1575,7 +1600,7 @@ public class ImportPage : CheckerboardPage {
preview_filename = associated.get_filename();
}
preview = GPhoto.load_preview(spin_idle_context.context, camera, preview_fulldir,
- preview_filename, out preview_raw, out preview_raw_length);
+ preview_filename, out preview_md5);
} catch (Error err) {
// only issue the warning message if we're not reading a video. GPhoto is capable
// of reading video previews about 50% of the time, so we don't want to put a guard
@@ -1587,11 +1612,6 @@ public class ImportPage : CheckerboardPage {
}
}
- // calculate thumbnail fingerprint
- string? preview_md5 = null;
- if (preview != null && preview_raw != null && preview_raw_length > 0)
- preview_md5 = md5_binary(preview_raw, preview_raw_length);
-
#if TRACE_MD5
debug("camera MD5 %s: exif=%s preview=%s", filename, exif_only_md5, preview_md5);
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 08:05:16 +0000