summaryrefslogtreecommitdiff
path: root/src/camera
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:51:46 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:51:46 +0200
commit9e7cd144725a270e0460b21747619f447ca87684 (patch)
tree77916a766425839c1a2466afd2eb1244371b6b9b /src/camera
parent3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff)
New upstream version 0.26.1upstream/0.26.1
Diffstat (limited to 'src/camera')
-rw-r--r--src/camera/Branch.c10
-rw-r--r--src/camera/Camera.c2
-rw-r--r--src/camera/CameraTable.c532
-rw-r--r--src/camera/GPhoto.c233
-rw-r--r--src/camera/ImportPage.c2040
5 files changed, 1423 insertions, 1394 deletions
diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index 74b5c60..e41b06f 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -912,7 +912,7 @@ static void camera_branch_instance_init (CameraBranch * self) {
#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
self->priv = CAMERA_BRANCH_GET_PRIVATE (self);
#line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- _tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _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"
self->priv->camera_map = _tmp0_;
#line 919 "Branch.c"
@@ -1175,11 +1175,11 @@ static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_type_class_add_private (klass, sizeof (CameraSidebarEntryPrivate));
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = camera_sidebar_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_name;
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = camera_sidebar_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_icon;
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = camera_sidebar_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_create_page;
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize;
#line 1186 "Branch.c"
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index f39dba0..a67eb27 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.34.4, the Vala compiler
+/* Camera.c generated by valac 0.34.7, the Vala compiler
* generated from Camera.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 33dc872..bbf944b 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.34.4, the Vala compiler
+/* CameraTable.c generated by valac 0.34.7, the Vala compiler
* generated from CameraTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -650,8 +650,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
gboolean result = FALSE;
AppWindow* _tmp0_ = NULL;
LibraryWindow* _tmp1_ = NULL;
- AppWindow* _tmp6_ = NULL;
- LibraryWindow* _tmp7_ = NULL;
+ AppWindow* _tmp10_ = NULL;
+ LibraryWindow* _tmp11_ = NULL;
GError * _inner_error_ = NULL;
#line 57 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
@@ -669,9 +669,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
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 673 "CameraTable.c"
+ gboolean _tmp2_ = FALSE;
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 675 "CameraTable.c"
+#line 677 "CameraTable.c"
goto __catch57_gphoto_error;
}
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -679,53 +681,57 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 684 "CameraTable.c"
+ return _tmp2_;
+#line 686 "CameraTable.c"
}
}
goto __finally57;
__catch57_gphoto_error:
{
GError* err = NULL;
- GError* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GError* _tmp3_ = NULL;
+ const gchar* _tmp4_ = NULL;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_inner_error_ = NULL;
#line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = err;
+ _tmp3_ = err;
#line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = _tmp2_->message;
+ _tmp4_ = _tmp3_->message;
#line 65 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_warning ("CameraTable.vala:65: Unable to initialize camera table: %s", _tmp3_);
+ g_warning ("CameraTable.vala:65: Unable to initialize camera table: %s", _tmp4_);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = FALSE;
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 709 "CameraTable.c"
+#line 711 "CameraTable.c"
}
__finally57:
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 716 "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);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 720 "CameraTable.c"
+ return _tmp5_;
+#line 724 "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 731 "CameraTable.c"
+ gboolean _tmp6_ = FALSE;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 729 "CameraTable.c"
+#line 735 "CameraTable.c"
goto __catch58_gphoto_error;
}
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -733,61 +739,63 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 738 "CameraTable.c"
+ return _tmp6_;
+#line 744 "CameraTable.c"
}
}
goto __finally58;
__catch58_gphoto_error:
{
GError* err = NULL;
- GError* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ GError* _tmp7_ = NULL;
+ const gchar* _tmp8_ = NULL;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_inner_error_ = NULL;
#line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = err;
+ _tmp7_ = err;
#line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = _tmp4_->message;
+ _tmp8_ = _tmp7_->message;
#line 73 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp5_);
+ 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 759 "CameraTable.c"
+#line 765 "CameraTable.c"
}
__finally58:
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 770 "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);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_clear_error (&_inner_error_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- return FALSE;
-#line 770 "CameraTable.c"
+ return _tmp9_;
+#line 778 "CameraTable.c"
}
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = app_window_get_instance ();
+ _tmp10_ = app_window_get_instance ();
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_WINDOW, LibraryWindow);
+ _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- library_window_set_page_switching_enabled (_tmp7_, TRUE);
+ library_window_set_page_switching_enabled (_tmp11_, TRUE);
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp11_);
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = FALSE;
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 784 "CameraTable.c"
+#line 792 "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 791 "CameraTable.c"
+#line 799 "CameraTable.c"
}
@@ -800,7 +808,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 804 "CameraTable.c"
+#line 812 "CameraTable.c"
CameraTable* _tmp1_ = NULL;
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = camera_table_new ();
@@ -808,7 +816,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 812 "CameraTable.c"
+#line 820 "CameraTable.c"
}
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = camera_table_instance;
@@ -818,7 +826,7 @@ CameraTable* camera_table_get_instance (void) {
result = _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 822 "CameraTable.c"
+#line 830 "CameraTable.c"
}
@@ -832,14 +840,14 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_map;
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+ _tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _tmp1_;
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 843 "CameraTable.c"
+#line 851 "CameraTable.c"
}
@@ -853,14 +861,14 @@ gint camera_table_get_count (CameraTable* self) {
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_map;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+ _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _tmp1_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 864 "CameraTable.c"
+#line 872 "CameraTable.c"
}
@@ -883,7 +891,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 887 "CameraTable.c"
+#line 895 "CameraTable.c"
}
@@ -898,7 +906,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 902 "CameraTable.c"
+#line 910 "CameraTable.c"
int _tmp1_ = 0;
const gchar* _tmp2_ = NULL;
int _tmp3_ = 0;
@@ -922,7 +930,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 926 "CameraTable.c"
+#line 934 "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);
@@ -930,7 +938,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 934 "CameraTable.c"
+#line 942 "CameraTable.c"
}
}
}
@@ -961,7 +969,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 965 "CameraTable.c"
+#line 973 "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);
@@ -969,7 +977,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 973 "CameraTable.c"
+#line 981 "CameraTable.c"
}
}
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -988,7 +996,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 992 "CameraTable.c"
+#line 1000 "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);
@@ -996,7 +1004,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 1000 "CameraTable.c"
+#line 1008 "CameraTable.c"
}
}
}
@@ -1005,7 +1013,7 @@ 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 1009 "CameraTable.c"
+#line 1017 "CameraTable.c"
}
@@ -1016,20 +1024,20 @@ static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1020 "CameraTable.c"
+#line 1028 "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 1026 "CameraTable.c"
+#line 1034 "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 1033 "CameraTable.c"
+#line 1041 "CameraTable.c"
}
@@ -1038,7 +1046,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 1042 "CameraTable.c"
+#line 1050 "CameraTable.c"
}
@@ -1072,7 +1080,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 1076 "CameraTable.c"
+#line 1084 "CameraTable.c"
{
GList* device_collection = NULL;
GList* device_it = NULL;
@@ -1080,14 +1088,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 1084 "CameraTable.c"
+#line 1092 "CameraTable.c"
GUdevDevice* _tmp4_ = NULL;
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 1091 "CameraTable.c"
+#line 1099 "CameraTable.c"
{
gchar* device_file = NULL;
GUdevDevice* _tmp5_ = NULL;
@@ -1108,7 +1116,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 1112 "CameraTable.c"
+#line 1120 "CameraTable.c"
GUdevDevice* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1117,15 +1125,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 1121 "CameraTable.c"
+#line 1129 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = FALSE;
-#line 1125 "CameraTable.c"
+#line 1133 "CameraTable.c"
}
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp9_) {
-#line 1129 "CameraTable.c"
+#line 1137 "CameraTable.c"
GUdevDevice* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1134,15 +1142,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 1138 "CameraTable.c"
+#line 1146 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = FALSE;
-#line 1142 "CameraTable.c"
+#line 1150 "CameraTable.c"
}
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp8_) {
-#line 1146 "CameraTable.c"
+#line 1154 "CameraTable.c"
gint camera_bus = 0;
gint camera_device = 0;
const gchar* _tmp15_ = NULL;
@@ -1162,7 +1170,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 1166 "CameraTable.c"
+#line 1174 "CameraTable.c"
const gchar* _tmp17_ = NULL;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = device_file;
@@ -1175,7 +1183,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 1178 "CameraTable.c"
+#line 1186 "CameraTable.c"
}
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp18_ = camera_bus;
@@ -1201,13 +1209,13 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
_vala_array_add66 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (camera);
-#line 1204 "CameraTable.c"
+#line 1212 "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 1210 "CameraTable.c"
+#line 1218 "CameraTable.c"
}
}
}
@@ -1219,7 +1227,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 1222 "CameraTable.c"
+#line 1230 "CameraTable.c"
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp25_;
@@ -1227,7 +1235,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 1230 "CameraTable.c"
+#line 1238 "CameraTable.c"
}
@@ -1269,7 +1277,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 1272 "CameraTable.c"
+#line 1280 "CameraTable.c"
gchar** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1278,15 +1286,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 1281 "CameraTable.c"
+#line 1289 "CameraTable.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = FALSE;
-#line 1285 "CameraTable.c"
+#line 1293 "CameraTable.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp3_) {
-#line 1289 "CameraTable.c"
+#line 1297 "CameraTable.c"
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
const gchar* _tmp7_ = NULL;
@@ -1317,21 +1325,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 1320 "CameraTable.c"
+#line 1328 "CameraTable.c"
} else {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1324 "CameraTable.c"
+#line 1332 "CameraTable.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1328 "CameraTable.c"
+#line 1336 "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 1334 "CameraTable.c"
+#line 1342 "CameraTable.c"
const gchar* _tmp12_ = NULL;
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp12_ = port;
@@ -1343,15 +1351,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 1346 "CameraTable.c"
+#line 1354 "CameraTable.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1350 "CameraTable.c"
+#line 1358 "CameraTable.c"
}
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1354 "CameraTable.c"
+#line 1362 "CameraTable.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp13_ = port;
@@ -1359,7 +1367,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 1362 "CameraTable.c"
+#line 1370 "CameraTable.c"
const gchar* _tmp15_ = NULL;
#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = port;
@@ -1371,21 +1379,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 1374 "CameraTable.c"
+#line 1382 "CameraTable.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1378 "CameraTable.c"
+#line 1386 "CameraTable.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1382 "CameraTable.c"
+#line 1390 "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 1388 "CameraTable.c"
+#line 1396 "CameraTable.c"
{
gchar** usb_camera_collection = NULL;
gint usb_camera_collection_length1 = 0;
@@ -1397,14 +1405,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 1400 "CameraTable.c"
+#line 1408 "CameraTable.c"
gchar* _tmp17_ = NULL;
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 1407 "CameraTable.c"
+#line 1415 "CameraTable.c"
{
gint camera_bus = 0;
gint camera_device = 0;
@@ -1419,7 +1427,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 1422 "CameraTable.c"
+#line 1430 "CameraTable.c"
const gchar* _tmp20_ = NULL;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp20_ = usb_camera;
@@ -1429,7 +1437,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 1432 "CameraTable.c"
+#line 1440 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp22_ = bus;
@@ -1437,7 +1445,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 1440 "CameraTable.c"
+#line 1448 "CameraTable.c"
gint _tmp24_ = 0;
gint _tmp25_ = 0;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1446,15 +1454,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 1449 "CameraTable.c"
+#line 1457 "CameraTable.c"
} else {
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = FALSE;
-#line 1453 "CameraTable.c"
+#line 1461 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp21_) {
-#line 1457 "CameraTable.c"
+#line 1465 "CameraTable.c"
const gchar* _tmp26_ = NULL;
gchar* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
@@ -1481,19 +1489,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 1484 "CameraTable.c"
+#line 1492 "CameraTable.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1488 "CameraTable.c"
+#line 1496 "CameraTable.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1492 "CameraTable.c"
+#line 1500 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
-#line 1496 "CameraTable.c"
+#line 1504 "CameraTable.c"
}
}
}
@@ -1508,15 +1516,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 1510 "CameraTable.c"
+#line 1518 "CameraTable.c"
} else {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1514 "CameraTable.c"
+#line 1522 "CameraTable.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1518 "CameraTable.c"
+#line 1526 "CameraTable.c"
}
@@ -1534,7 +1542,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 1536 "CameraTable.c"
+#line 1544 "CameraTable.c"
}
@@ -1557,7 +1565,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
_tmp3_ = end;
#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 1559 "CameraTable.c"
+#line 1567 "CameraTable.c"
glong _tmp4_ = 0L;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -1565,7 +1573,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = _tmp4_;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1567 "CameraTable.c"
+#line 1575 "CameraTable.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -1577,7 +1585,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = (glong) (_tmp5_ - _tmp6_);
#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1579 "CameraTable.c"
+#line 1587 "CameraTable.c"
}
}
@@ -1601,21 +1609,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp1_ = offset;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 1603 "CameraTable.c"
+#line 1611 "CameraTable.c"
glong _tmp2_ = 0L;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1609 "CameraTable.c"
+#line 1617 "CameraTable.c"
} else {
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1613 "CameraTable.c"
+#line 1621 "CameraTable.c"
}
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1617 "CameraTable.c"
+#line 1625 "CameraTable.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
@@ -1627,7 +1635,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 1629 "CameraTable.c"
+#line 1637 "CameraTable.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -1637,13 +1645,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp7_ = _tmp6_;
#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 1639 "CameraTable.c"
+#line 1647 "CameraTable.c"
}
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 1645 "CameraTable.c"
+#line 1653 "CameraTable.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
@@ -1657,7 +1665,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp11_ = offset;
#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1659 "CameraTable.c"
+#line 1667 "CameraTable.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
@@ -1667,13 +1675,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp13_ = string_length;
#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1669 "CameraTable.c"
+#line 1677 "CameraTable.c"
}
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 1675 "CameraTable.c"
+#line 1683 "CameraTable.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1682,7 +1690,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp16_ = offset;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 1684 "CameraTable.c"
+#line 1692 "CameraTable.c"
}
#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -1702,7 +1710,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
result = _tmp22_;
#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1704 "CameraTable.c"
+#line 1712 "CameraTable.c"
}
@@ -1715,7 +1723,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_return_val_if_fail (old != NULL, NULL);
#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1717 "CameraTable.c"
+#line 1725 "CameraTable.c"
{
GRegex* regex = NULL;
const gchar* _tmp0_ = NULL;
@@ -1746,7 +1754,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1748 "CameraTable.c"
+#line 1756 "CameraTable.c"
goto __catch59_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1755,7 +1763,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 1757 "CameraTable.c"
+#line 1765 "CameraTable.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
@@ -1771,7 +1779,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1773 "CameraTable.c"
+#line 1781 "CameraTable.c"
goto __catch59_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1782,7 +1790,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 1784 "CameraTable.c"
+#line 1792 "CameraTable.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
@@ -1796,7 +1804,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1798 "CameraTable.c"
+#line 1806 "CameraTable.c"
}
goto __finally59;
__catch59_g_regex_error:
@@ -1810,7 +1818,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_assert_not_reached ();
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 1812 "CameraTable.c"
+#line 1820 "CameraTable.c"
}
__finally59:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1821,7 +1829,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 1823 "CameraTable.c"
+#line 1831 "CameraTable.c"
}
}
@@ -1839,7 +1847,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 1841 "CameraTable.c"
+#line 1849 "CameraTable.c"
const gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -1866,19 +1874,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 1868 "CameraTable.c"
+#line 1876 "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 1874 "CameraTable.c"
+#line 1882 "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 1880 "CameraTable.c"
+#line 1888 "CameraTable.c"
}
@@ -1894,7 +1902,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 1896 "CameraTable.c"
+#line 1904 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1902,14 +1910,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 1904 "CameraTable.c"
+#line 1912 "CameraTable.c"
GVolume* _tmp2_ = NULL;
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 1911 "CameraTable.c"
+#line 1919 "CameraTable.c"
{
GVolume* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -1930,7 +1938,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 1932 "CameraTable.c"
+#line 1940 "CameraTable.c"
GVolume* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1945,22 +1953,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 1947 "CameraTable.c"
+#line 1955 "CameraTable.c"
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 1951 "CameraTable.c"
+#line 1959 "CameraTable.c"
}
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 1956 "CameraTable.c"
+#line 1964 "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 1962 "CameraTable.c"
+#line 1970 "CameraTable.c"
}
@@ -1976,7 +1984,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 1978 "CameraTable.c"
+#line 1986 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1984,14 +1992,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 1986 "CameraTable.c"
+#line 1994 "CameraTable.c"
GVolume* _tmp2_ = NULL;
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 1993 "CameraTable.c"
+#line 2001 "CameraTable.c"
{
GVolume* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -2012,7 +2020,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 2014 "CameraTable.c"
+#line 2022 "CameraTable.c"
GVolume* _tmp8_ = NULL;
GIcon* _tmp9_ = NULL;
GIcon* _tmp10_ = NULL;
@@ -2038,29 +2046,29 @@ 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 2040 "CameraTable.c"
+#line 2048 "CameraTable.c"
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2044 "CameraTable.c"
+#line 2052 "CameraTable.c"
}
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2049 "CameraTable.c"
+#line 2057 "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 2055 "CameraTable.c"
+#line 2063 "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 2062 "CameraTable.c"
+#line 2070 "CameraTable.c"
}
@@ -2071,13 +2079,13 @@ static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size
*size = (*size) ? (2 * (*size)) : 4;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2073 "CameraTable.c"
+#line 2081 "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 2079 "CameraTable.c"
+#line 2087 "CameraTable.c"
}
@@ -2129,7 +2137,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 2131 "CameraTable.c"
+#line 2139 "CameraTable.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2139,7 +2147,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 2141 "CameraTable.c"
+#line 2149 "CameraTable.c"
}
}
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2158,7 +2166,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 2160 "CameraTable.c"
+#line 2168 "CameraTable.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2168,7 +2176,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 2170 "CameraTable.c"
+#line 2178 "CameraTable.c"
}
}
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2191,7 +2199,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 2193 "CameraTable.c"
+#line 2201 "CameraTable.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2203,7 +2211,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 2205 "CameraTable.c"
+#line 2213 "CameraTable.c"
}
}
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2230,7 +2238,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 2232 "CameraTable.c"
+#line 2240 "CameraTable.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2242,11 +2250,11 @@ 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 2244 "CameraTable.c"
+#line 2252 "CameraTable.c"
}
}
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
detected_map = _tmp11_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2257,19 +2265,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 2259 "CameraTable.c"
+#line 2267 "CameraTable.c"
{
gint ctr = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = 0;
-#line 2264 "CameraTable.c"
+#line 2272 "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 2271 "CameraTable.c"
+#line 2279 "CameraTable.c"
gint _tmp16_ = 0;
CameraList* _tmp17_ = NULL;
gint _tmp18_ = 0;
@@ -2297,13 +2305,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
const gchar* _tmp46_ = NULL;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!_tmp14_) {
-#line 2299 "CameraTable.c"
+#line 2307 "CameraTable.c"
gint _tmp15_ = 0;
#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 2305 "CameraTable.c"
+#line 2313 "CameraTable.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = FALSE;
@@ -2317,7 +2325,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 2319 "CameraTable.c"
+#line 2327 "CameraTable.c"
}
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp19_ = camera_list;
@@ -2351,7 +2359,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 2353 "CameraTable.c"
+#line 2361 "CameraTable.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
@@ -2369,7 +2377,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 2371 "CameraTable.c"
+#line 2379 "CameraTable.c"
}
}
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2406,7 +2414,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 2408 "CameraTable.c"
+#line 2416 "CameraTable.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
@@ -2426,7 +2434,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 2428 "CameraTable.c"
+#line 2436 "CameraTable.c"
}
}
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2447,7 +2455,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 2449 "CameraTable.c"
+#line 2457 "CameraTable.c"
gchar* full_port = NULL;
CameraList* _tmp36_ = NULL;
gint _tmp37_ = 0;
@@ -2484,7 +2492,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 2486 "CameraTable.c"
+#line 2494 "CameraTable.c"
}
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp42_ = full_port;
@@ -2496,7 +2504,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 2498 "CameraTable.c"
+#line 2506 "CameraTable.c"
}
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp44_ = detected_map;
@@ -2510,7 +2518,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 2512 "CameraTable.c"
+#line 2520 "CameraTable.c"
}
}
}
@@ -2522,7 +2530,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 2524 "CameraTable.c"
+#line 2532 "CameraTable.c"
{
GeeIterator* _camera_it = NULL;
GeeHashMap* _tmp48_ = NULL;
@@ -2534,7 +2542,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp48_ = self->priv->camera_map;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_MAP, GeeMap));
+ _tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp50_ = _tmp49_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2549,7 +2557,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 2551 "CameraTable.c"
+#line 2559 "CameraTable.c"
GeeIterator* _tmp54_ = NULL;
gboolean _tmp55_ = FALSE;
DiscoveredCamera* camera = NULL;
@@ -2586,7 +2594,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 2588 "CameraTable.c"
+#line 2596 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp56_ = _camera_it;
@@ -2632,7 +2640,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 2634 "CameraTable.c"
+#line 2642 "CameraTable.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2658,7 +2666,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 2660 "CameraTable.c"
+#line 2668 "CameraTable.c"
}
}
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2709,7 +2717,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 2711 "CameraTable.c"
+#line 2719 "CameraTable.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2737,7 +2745,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 2739 "CameraTable.c"
+#line 2747 "CameraTable.c"
}
}
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2748,7 +2756,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 2750 "CameraTable.c"
+#line 2758 "CameraTable.c"
CameraAbilities _tmp71_ = {0};
const gchar* _tmp72_ = NULL;
const gchar* _tmp73_ = NULL;
@@ -2770,7 +2778,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 2772 "CameraTable.c"
+#line 2780 "CameraTable.c"
}
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp74_ = abilities;
@@ -2798,17 +2806,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 2800 "CameraTable.c"
+#line 2808 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_camera_it);
-#line 2804 "CameraTable.c"
+#line 2812 "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 2810 "CameraTable.c"
+#line 2818 "CameraTable.c"
{
DiscoveredCamera** camera_collection = NULL;
gint camera_collection_length1 = 0;
@@ -2820,14 +2828,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 2822 "CameraTable.c"
+#line 2830 "CameraTable.c"
DiscoveredCamera* _tmp81_ = NULL;
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 2829 "CameraTable.c"
+#line 2837 "CameraTable.c"
{
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
@@ -2886,7 +2894,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 2888 "CameraTable.c"
+#line 2896 "CameraTable.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2910,7 +2918,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 2912 "CameraTable.c"
+#line 2920 "CameraTable.c"
}
}
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2959,7 +2967,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 2961 "CameraTable.c"
+#line 2969 "CameraTable.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2985,7 +2993,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 2987 "CameraTable.c"
+#line 2995 "CameraTable.c"
}
}
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3020,7 +3028,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 3022 "CameraTable.c"
+#line 3030 "CameraTable.c"
}
}
}
@@ -3035,7 +3043,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp100_ = detected_map;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_MAP, GeeMap));
+ _tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp102_ = _tmp101_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3050,7 +3058,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 3052 "CameraTable.c"
+#line 3060 "CameraTable.c"
GeeIterator* _tmp106_ = NULL;
gboolean _tmp107_ = FALSE;
gchar* port = NULL;
@@ -3142,7 +3150,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 3144 "CameraTable.c"
+#line 3152 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp108_ = _port_it;
@@ -3176,7 +3184,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 3178 "CameraTable.c"
+#line 3186 "CameraTable.c"
const gchar* _tmp118_ = NULL;
const gchar* _tmp119_ = NULL;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3197,7 +3205,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 3199 "CameraTable.c"
+#line 3207 "CameraTable.c"
}
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp120_ = port;
@@ -3209,7 +3217,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 3211 "CameraTable.c"
+#line 3219 "CameraTable.c"
GUdevDevice* device = NULL;
GUdevClient* _tmp123_ = NULL;
const gchar* _tmp124_ = NULL;
@@ -3241,7 +3249,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 3243 "CameraTable.c"
+#line 3251 "CameraTable.c"
const gchar* _tmp130_ = NULL;
gchar* _tmp131_ = NULL;
const gchar* _tmp132_ = NULL;
@@ -3262,13 +3270,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 3264 "CameraTable.c"
+#line 3272 "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 3270 "CameraTable.c"
+#line 3278 "CameraTable.c"
GUdevDevice* _tmp135_ = NULL;
const gchar* _tmp136_ = NULL;
gchar* _tmp137_ = NULL;
@@ -3282,13 +3290,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 3284 "CameraTable.c"
+#line 3292 "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 3290 "CameraTable.c"
+#line 3298 "CameraTable.c"
GUdevDevice* _tmp139_ = NULL;
const gchar* _tmp140_ = NULL;
gchar* _tmp141_ = NULL;
@@ -3302,19 +3310,19 @@ 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 3304 "CameraTable.c"
+#line 3312 "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 3310 "CameraTable.c"
+#line 3318 "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 3316 "CameraTable.c"
+#line 3324 "CameraTable.c"
const gchar* _tmp143_ = NULL;
gchar* _tmp144_ = NULL;
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3325,7 +3333,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_g_free0 (display_name);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = _tmp144_;
-#line 3327 "CameraTable.c"
+#line 3335 "CameraTable.c"
}
#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp145_ = port_info_list;
@@ -3339,7 +3347,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp148_ = index;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp148_ < 0) {
-#line 3341 "CameraTable.c"
+#line 3349 "CameraTable.c"
gint _tmp149_ = 0;
const gchar* _tmp150_ = NULL;
gchar* _tmp151_ = NULL;
@@ -3388,7 +3396,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3390 "CameraTable.c"
+#line 3398 "CameraTable.c"
} else {
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
@@ -3420,7 +3428,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3422 "CameraTable.c"
+#line 3430 "CameraTable.c"
}
}
}
@@ -3480,7 +3488,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3482 "CameraTable.c"
+#line 3490 "CameraTable.c"
} else {
#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3516,7 +3524,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3518 "CameraTable.c"
+#line 3526 "CameraTable.c"
}
}
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3545,7 +3553,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_tmp167_ = index;
#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp167_ < 0) {
-#line 3547 "CameraTable.c"
+#line 3555 "CameraTable.c"
gint _tmp168_ = 0;
const gchar* _tmp169_ = NULL;
gchar* _tmp170_ = NULL;
@@ -3598,7 +3606,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3600 "CameraTable.c"
+#line 3608 "CameraTable.c"
} else {
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3634,7 +3642,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3636 "CameraTable.c"
+#line 3644 "CameraTable.c"
}
}
}
@@ -3696,7 +3704,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3698 "CameraTable.c"
+#line 3706 "CameraTable.c"
} else {
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
@@ -3734,7 +3742,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3736 "CameraTable.c"
+#line 3744 "CameraTable.c"
}
}
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3793,7 +3801,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3795 "CameraTable.c"
+#line 3803 "CameraTable.c"
} else {
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -3833,7 +3841,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3835 "CameraTable.c"
+#line 3843 "CameraTable.c"
}
}
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3892,7 +3900,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3894 "CameraTable.c"
+#line 3902 "CameraTable.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -3932,7 +3940,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3934 "CameraTable.c"
+#line 3942 "CameraTable.c"
}
}
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3993,7 +4001,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3995 "CameraTable.c"
+#line 4003 "CameraTable.c"
} else {
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4033,7 +4041,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4035 "CameraTable.c"
+#line 4043 "CameraTable.c"
}
}
#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4088,11 +4096,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 4090 "CameraTable.c"
+#line 4098 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 4094 "CameraTable.c"
+#line 4102 "CameraTable.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4104,7 +4112,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 4106 "CameraTable.c"
+#line 4114 "CameraTable.c"
}
@@ -4131,7 +4139,7 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
_tmp3_ = self->priv->camera_update_scheduler;
#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4133 "CameraTable.c"
+#line 4141 "CameraTable.c"
}
@@ -4145,7 +4153,7 @@ void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
_tmp0_ = self->priv->camera_update_scheduler;
#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4147 "CameraTable.c"
+#line 4155 "CameraTable.c"
}
@@ -4153,7 +4161,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
GError * _inner_error_ = NULL;
#line 397 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4155 "CameraTable.c"
+#line 4163 "CameraTable.c"
{
CameraTable* _tmp0_ = NULL;
CameraTable* _tmp1_ = NULL;
@@ -4169,7 +4177,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4171 "CameraTable.c"
+#line 4179 "CameraTable.c"
goto __catch60_gphoto_error;
}
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4178,7 +4186,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4180 "CameraTable.c"
+#line 4188 "CameraTable.c"
}
}
goto __finally60;
@@ -4199,7 +4207,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_warning ("CameraTable.vala:401: Error updating camera table: %s", _tmp3_);
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 4201 "CameraTable.c"
+#line 4209 "CameraTable.c"
}
__finally60:
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4210,7 +4218,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4212 "CameraTable.c"
+#line 4220 "CameraTable.c"
}
}
@@ -4230,26 +4238,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 4232 "CameraTable.c"
+#line 4240 "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 4238 "CameraTable.c"
+#line 4246 "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 4244 "CameraTable.c"
+#line 4252 "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 4251 "CameraTable.c"
+#line 4259 "CameraTable.c"
}
@@ -4258,7 +4266,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 4260 "CameraTable.c"
+#line 4268 "CameraTable.c"
}
}
@@ -4268,11 +4276,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 4270 "CameraTable.c"
+#line 4278 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4274 "CameraTable.c"
+#line 4282 "CameraTable.c"
}
}
@@ -4280,37 +4288,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 4282 "CameraTable.c"
+#line 4290 "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 4289 "CameraTable.c"
+#line 4297 "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 4296 "CameraTable.c"
+#line 4304 "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 4300 "CameraTable.c"
+#line 4308 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = camera_table_ref (object);
-#line 4304 "CameraTable.c"
+#line 4312 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4308 "CameraTable.c"
+#line 4316 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4312 "CameraTable.c"
+#line 4320 "CameraTable.c"
}
@@ -4321,25 +4329,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 4323 "CameraTable.c"
+#line 4331 "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 4329 "CameraTable.c"
+#line 4337 "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 4333 "CameraTable.c"
+#line 4341 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4337 "CameraTable.c"
+#line 4345 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4341 "CameraTable.c"
+#line 4349 "CameraTable.c"
}
@@ -4353,7 +4361,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 4355 "CameraTable.c"
+#line 4363 "CameraTable.c"
}
@@ -4362,7 +4370,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 4364 "CameraTable.c"
+#line 4372 "CameraTable.c"
}
@@ -4382,17 +4390,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 4384 "CameraTable.c"
+#line 4392 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4388 "CameraTable.c"
+#line 4396 "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 4394 "CameraTable.c"
+#line 4402 "CameraTable.c"
}
}
@@ -4411,17 +4419,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 4413 "CameraTable.c"
+#line 4421 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4417 "CameraTable.c"
+#line 4425 "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 4423 "CameraTable.c"
+#line 4431 "CameraTable.c"
}
}
@@ -4437,7 +4445,7 @@ static void camera_table_class_init (CameraTableClass * klass) {
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"
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 4439 "CameraTable.c"
+#line 4447 "CameraTable.c"
}
@@ -4458,12 +4466,12 @@ static void camera_table_instance_init (CameraTable * self) {
#line 31 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->priv->null_context = _tmp1_;
#line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, discovered_camera_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->priv->camera_map = _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 4465 "CameraTable.c"
+#line 4473 "CameraTable.c"
}
@@ -4485,7 +4493,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 4487 "CameraTable.c"
+#line 4495 "CameraTable.c"
}
@@ -4510,7 +4518,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 4512 "CameraTable.c"
+#line 4520 "CameraTable.c"
}
@@ -4523,7 +4531,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 4525 "CameraTable.c"
+#line 4533 "CameraTable.c"
}
}
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index 41e795c..89722c6 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.34.4, the Vala compiler
+/* GPhoto.c generated by valac 0.34.7, the Vala compiler
* generated from GPhoto.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -727,19 +727,19 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
((GPContextWrapperClass *) klass)->finalize = gp_context_wrapper_finalize;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ((GPContextWrapperClass *) klass)->idle = gp_context_wrapper_real_idle;
+ ((GPContextWrapperClass *) klass)->idle = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_idle;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ((GPContextWrapperClass *) klass)->error = gp_context_wrapper_real_error;
+ ((GPContextWrapperClass *) klass)->error = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_error;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ((GPContextWrapperClass *) klass)->status = gp_context_wrapper_real_status;
+ ((GPContextWrapperClass *) klass)->status = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_status;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ((GPContextWrapperClass *) klass)->message = gp_context_wrapper_real_message;
+ ((GPContextWrapperClass *) klass)->message = (void (*)(GPContextWrapper*, const gchar*, void*)) gp_context_wrapper_real_message;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ((GPContextWrapperClass *) klass)->progress_start = gp_context_wrapper_real_progress_start;
+ ((GPContextWrapperClass *) klass)->progress_start = (void (*)(GPContextWrapper*, gfloat, const gchar*, void*)) gp_context_wrapper_real_progress_start;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ((GPContextWrapperClass *) klass)->progress_update = gp_context_wrapper_real_progress_update;
+ ((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 = gp_context_wrapper_real_progress_stop;
+ ((GPContextWrapperClass *) klass)->progress_stop = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_progress_stop;
#line 744 "GPhoto.c"
}
@@ -858,9 +858,9 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
#line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_spin_idle_wrapper_parent_class = g_type_class_peek_parent (klass);
#line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ((GPContextWrapperClass *) klass)->idle = gp_spin_idle_wrapper_real_idle;
+ ((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 = gp_spin_idle_wrapper_real_progress_update;
+ ((GPContextWrapperClass *) klass)->progress_update = (void (*)(GPContextWrapper*, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
#line 865 "GPhoto.c"
}
@@ -981,6 +981,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
int _tmp18_ = 0;
const gchar* _tmp19_ = NULL;
GError* _tmp20_ = NULL;
+ gboolean _tmp21_ = FALSE;
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = res;
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -998,8 +999,8 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return FALSE;
-#line 1003 "GPhoto.c"
+ return _tmp21_;
+#line 1004 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = TRUE;
@@ -1007,15 +1008,15 @@ 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 1011 "GPhoto.c"
+#line 1012 "GPhoto.c"
} else {
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
-#line 1015 "GPhoto.c"
+#line 1016 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1019 "GPhoto.c"
+#line 1020 "GPhoto.c"
}
@@ -1048,7 +1049,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp2_ = start;
#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
-#line 1052 "GPhoto.c"
+#line 1053 "GPhoto.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1057,13 +1058,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp4_ = start;
#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
-#line 1061 "GPhoto.c"
+#line 1062 "GPhoto.c"
}
#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
-#line 1067 "GPhoto.c"
+#line 1068 "GPhoto.c"
glong _tmp6_ = 0L;
glong _tmp7_ = 0L;
#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1072,13 +1073,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp7_ = end;
#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
-#line 1076 "GPhoto.c"
+#line 1077 "GPhoto.c"
}
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = start;
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
-#line 1082 "GPhoto.c"
+#line 1083 "GPhoto.c"
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1087,11 +1088,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp11_ = string_length;
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1091 "GPhoto.c"
+#line 1092 "GPhoto.c"
} else {
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
-#line 1095 "GPhoto.c"
+#line 1096 "GPhoto.c"
}
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
@@ -1099,7 +1100,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp13_ = end;
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
-#line 1103 "GPhoto.c"
+#line 1104 "GPhoto.c"
glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1108,11 +1109,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp15_ = string_length;
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1112 "GPhoto.c"
+#line 1113 "GPhoto.c"
} else {
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 1116 "GPhoto.c"
+#line 1117 "GPhoto.c"
}
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
@@ -1134,7 +1135,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
result = _tmp21_;
#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 1138 "GPhoto.c"
+#line 1139 "GPhoto.c"
}
@@ -1204,7 +1205,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
_tmp9_ = g_str_has_prefix (_tmp8_, prefix);
#line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp9_) {
-#line 1208 "GPhoto.c"
+#line 1209 "GPhoto.c"
const gchar* _tmp10_ = NULL;
gint _tmp11_ = 0;
gint _tmp12_ = 0;
@@ -1230,7 +1231,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
_g_free0 (path);
#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
path = _tmp16_;
-#line 1234 "GPhoto.c"
+#line 1235 "GPhoto.c"
} else {
#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
@@ -1242,13 +1243,13 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
(port_info);
#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1246 "GPhoto.c"
+#line 1247 "GPhoto.c"
}
#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = photo_metadata_new ();
#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
metadata = _tmp17_;
-#line 1252 "GPhoto.c"
+#line 1253 "GPhoto.c"
{
PhotoMetadata* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
@@ -1298,7 +1299,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
_g_free0 (_tmp22_);
#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1302 "GPhoto.c"
+#line 1303 "GPhoto.c"
goto __catch61_g_error;
}
}
@@ -1313,7 +1314,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
_media_metadata_unref0 (metadata);
#line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
metadata = NULL;
-#line 1317 "GPhoto.c"
+#line 1318 "GPhoto.c"
}
__finally61:
#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1332,7 +1333,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
g_clear_error (&_inner_error_);
#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1336 "GPhoto.c"
+#line 1337 "GPhoto.c"
}
#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
@@ -1344,14 +1345,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
(port_info);
#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1348 "GPhoto.c"
+#line 1349 "GPhoto.c"
}
static guint8* _vala_array_dup23 (guint8* self, int length) {
#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 1355 "GPhoto.c"
+#line 1356 "GPhoto.c"
}
@@ -1392,7 +1393,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_vala_raw_length1 = 0;
#line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw_length = (gsize) 0;
-#line 1396 "GPhoto.c"
+#line 1397 "GPhoto.c"
{
guint8* _tmp0_ = NULL;
GPContext* _tmp1_ = NULL;
@@ -1423,7 +1424,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
__tmp0__size_ = _tmp0__length1;
#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1427 "GPhoto.c"
+#line 1428 "GPhoto.c"
goto __catch62_g_error;
}
#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1442,7 +1443,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_vala_raw_length1 = _tmp7__length1;
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = (g_free (_tmp0_), NULL);
-#line 1446 "GPhoto.c"
+#line 1447 "GPhoto.c"
}
goto __finally62;
__catch62_g_error:
@@ -1497,27 +1498,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (raw) {
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw = _vala_raw;
-#line 1501 "GPhoto.c"
+#line 1502 "GPhoto.c"
} else {
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1505 "GPhoto.c"
+#line 1506 "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 1511 "GPhoto.c"
+#line 1512 "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 1517 "GPhoto.c"
+#line 1518 "GPhoto.c"
}
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1521 "GPhoto.c"
+#line 1522 "GPhoto.c"
}
#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = metadata;
@@ -1533,27 +1534,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (raw) {
#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw = _vala_raw;
-#line 1537 "GPhoto.c"
+#line 1538 "GPhoto.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1541 "GPhoto.c"
+#line 1542 "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 1547 "GPhoto.c"
+#line 1548 "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 1553 "GPhoto.c"
+#line 1554 "GPhoto.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1557 "GPhoto.c"
+#line 1558 "GPhoto.c"
}
#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = metadata;
@@ -1581,7 +1582,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_photo_preview_unref0 (preview);
#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 1585 "GPhoto.c"
+#line 1586 "GPhoto.c"
goto __finally62;
}
#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1604,7 +1605,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_photo_preview_unref0 (preview);
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 1608 "GPhoto.c"
+#line 1609 "GPhoto.c"
}
__finally62:
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1613,7 +1614,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
g_propagate_error (error, _inner_error_);
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1617 "GPhoto.c"
+#line 1618 "GPhoto.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp25_ = _vala_raw;
@@ -1629,27 +1630,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (raw) {
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw = _vala_raw;
-#line 1633 "GPhoto.c"
+#line 1634 "GPhoto.c"
} else {
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1637 "GPhoto.c"
+#line 1638 "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 1643 "GPhoto.c"
+#line 1644 "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 1649 "GPhoto.c"
+#line 1650 "GPhoto.c"
}
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1653 "GPhoto.c"
+#line 1654 "GPhoto.c"
}
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26_ = _vala_raw;
@@ -1661,7 +1662,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_tmp27_ = _vala_raw_length;
#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp27_ > ((gsize) 32)) {
-#line 1665 "GPhoto.c"
+#line 1666 "GPhoto.c"
{
gsize i = 0UL;
gsize _tmp28_ = 0UL;
@@ -1669,14 +1670,14 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_tmp28_ = _vala_raw_length;
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
i = _tmp28_ - 2;
-#line 1673 "GPhoto.c"
+#line 1674 "GPhoto.c"
{
gboolean _tmp29_ = FALSE;
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29_ = TRUE;
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
while (TRUE) {
-#line 1680 "GPhoto.c"
+#line 1681 "GPhoto.c"
gsize _tmp31_ = 0UL;
gsize _tmp32_ = 0UL;
gboolean _tmp33_ = FALSE;
@@ -1686,13 +1687,13 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
guint8 _tmp36_ = 0U;
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (!_tmp29_) {
-#line 1690 "GPhoto.c"
+#line 1691 "GPhoto.c"
gsize _tmp30_ = 0UL;
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp30_ = i;
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
i = _tmp30_ - 1;
-#line 1696 "GPhoto.c"
+#line 1697 "GPhoto.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29_ = FALSE;
@@ -1704,7 +1705,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (!(_tmp31_ > (_tmp32_ - 32))) {
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
break;
-#line 1708 "GPhoto.c"
+#line 1709 "GPhoto.c"
}
#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp34_ = _vala_raw;
@@ -1716,7 +1717,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_tmp36_ = _tmp34_[_tmp35_];
#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp36_ == JPEG_MARKER_PREFIX) {
-#line 1720 "GPhoto.c"
+#line 1721 "GPhoto.c"
guint8* _tmp37_ = NULL;
gint _tmp37__length1 = 0;
gsize _tmp38_ = 0UL;
@@ -1731,15 +1732,15 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_tmp39_ = _tmp37_[_tmp38_ + 1];
#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp33_ = _tmp39_ == JPEG_MARKER_EOI;
-#line 1735 "GPhoto.c"
+#line 1736 "GPhoto.c"
} else {
#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp33_ = FALSE;
-#line 1739 "GPhoto.c"
+#line 1740 "GPhoto.c"
}
#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp33_) {
-#line 1743 "GPhoto.c"
+#line 1744 "GPhoto.c"
const gchar* _tmp40_ = NULL;
gsize _tmp41_ = 0UL;
#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1752,7 +1753,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_vala_raw_length = _tmp41_ + 2;
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
break;
-#line 1756 "GPhoto.c"
+#line 1757 "GPhoto.c"
}
}
}
@@ -1784,7 +1785,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_g_object_unref0 (mins);
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1788 "GPhoto.c"
+#line 1789 "GPhoto.c"
}
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp48_ = _tmp45_;
@@ -1800,27 +1801,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (raw) {
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw = _vala_raw;
-#line 1804 "GPhoto.c"
+#line 1805 "GPhoto.c"
} else {
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1808 "GPhoto.c"
+#line 1809 "GPhoto.c"
}
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length1) {
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length1 = _vala_raw_length1;
-#line 1814 "GPhoto.c"
+#line 1815 "GPhoto.c"
}
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length) {
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length = _vala_raw_length;
-#line 1820 "GPhoto.c"
+#line 1821 "GPhoto.c"
}
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1824 "GPhoto.c"
+#line 1825 "GPhoto.c"
}
@@ -1864,7 +1865,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
g_propagate_error (error, _inner_error_);
#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1868 "GPhoto.c"
+#line 1869 "GPhoto.c"
}
#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = ins;
@@ -1876,7 +1877,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
_g_object_unref0 (ins);
#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1880 "GPhoto.c"
+#line 1881 "GPhoto.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = ins;
@@ -1892,7 +1893,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
_g_object_unref0 (ins);
#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1896 "GPhoto.c"
+#line 1897 "GPhoto.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = _tmp6_;
@@ -1906,7 +1907,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
_g_object_unref0 (ins);
#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1910 "GPhoto.c"
+#line 1911 "GPhoto.c"
}
@@ -1961,7 +1962,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
_tmp5_ = fd;
#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp5_ < 0) {
-#line 1965 "GPhoto.c"
+#line 1966 "GPhoto.c"
gint _tmp6_ = 0;
GFile* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
@@ -1988,7 +1989,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
g_propagate_error (error, _inner_error_);
#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1992 "GPhoto.c"
+#line 1993 "GPhoto.c"
}
#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = fd;
@@ -2004,7 +2005,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
_tmp15_ = res;
#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp15_ != GP_OK) {
-#line 2008 "GPhoto.c"
+#line 2009 "GPhoto.c"
gint _tmp16_ = 0;
int _tmp17_ = 0;
int _tmp18_ = 0;
@@ -2030,7 +2031,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
_gp_file_unref0 (camera_file);
#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 2034 "GPhoto.c"
+#line 2035 "GPhoto.c"
}
#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp21_ = camera;
@@ -2050,7 +2051,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
_tmp27_ = res;
#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp27_ != GP_OK) {
-#line 2054 "GPhoto.c"
+#line 2055 "GPhoto.c"
gint _tmp28_ = 0;
int _tmp29_ = 0;
const gchar* _tmp30_ = NULL;
@@ -2082,7 +2083,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
_gp_file_unref0 (camera_file);
#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 2086 "GPhoto.c"
+#line 2087 "GPhoto.c"
}
#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp35_ = fd;
@@ -2090,7 +2091,7 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
close (_tmp35_);
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 2094 "GPhoto.c"
+#line 2095 "GPhoto.c"
}
@@ -2122,7 +2123,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
camera_raw_length1 = 0;
#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_camera_raw_size_ = camera_raw_length1;
-#line 2126 "GPhoto.c"
+#line 2127 "GPhoto.c"
{
guint8* _tmp0_ = NULL;
GPContext* _tmp1_ = NULL;
@@ -2153,7 +2154,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
__tmp0__size_ = _tmp0__length1;
#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2157 "GPhoto.c"
+#line 2158 "GPhoto.c"
goto __catch63_g_error;
}
#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2174,7 +2175,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
_camera_raw_size_ = camera_raw_length1;
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2178 "GPhoto.c"
+#line 2179 "GPhoto.c"
}
goto __finally63;
__catch63_g_error:
@@ -2204,7 +2205,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
camera_raw = (g_free (camera_raw), NULL);
#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2208 "GPhoto.c"
+#line 2209 "GPhoto.c"
}
__finally63:
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2215,7 +2216,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
camera_raw = (g_free (camera_raw), NULL);
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2219 "GPhoto.c"
+#line 2220 "GPhoto.c"
}
#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = camera_raw;
@@ -2225,7 +2226,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
if (_tmp14_ == NULL) {
#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = TRUE;
-#line 2229 "GPhoto.c"
+#line 2230 "GPhoto.c"
} else {
guint8* _tmp15_ = NULL;
gint _tmp15__length1 = 0;
@@ -2235,7 +2236,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
_tmp15__length1 = camera_raw_length1;
#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = _tmp15__length1 == 0;
-#line 2239 "GPhoto.c"
+#line 2240 "GPhoto.c"
}
#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp13_) {
@@ -2245,7 +2246,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
camera_raw = (g_free (camera_raw), NULL);
#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2249 "GPhoto.c"
+#line 2250 "GPhoto.c"
}
#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = photo_metadata_new ();
@@ -2269,7 +2270,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
camera_raw = (g_free (camera_raw), NULL);
#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2273 "GPhoto.c"
+#line 2274 "GPhoto.c"
}
#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
@@ -2277,21 +2278,21 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
camera_raw = (g_free (camera_raw), NULL);
#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2281 "GPhoto.c"
+#line 2282 "GPhoto.c"
}
static guint8* _vala_array_dup24 (guint8* self, int length) {
#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 2288 "GPhoto.c"
+#line 2289 "GPhoto.c"
}
static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_on_mins_destroyed (data);
-#line 2295 "GPhoto.c"
+#line 2296 "GPhoto.c"
}
@@ -2350,7 +2351,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_tmp2_ = res;
#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2354 "GPhoto.c"
+#line 2355 "GPhoto.c"
int _tmp3_ = 0;
int _tmp4_ = 0;
const gchar* _tmp5_ = NULL;
@@ -2371,7 +2372,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2375 "GPhoto.c"
+#line 2376 "GPhoto.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = camera;
@@ -2391,7 +2392,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_tmp13_ = res;
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp13_ != GP_OK) {
-#line 2395 "GPhoto.c"
+#line 2396 "GPhoto.c"
int _tmp14_ = 0;
const gchar* _tmp15_ = NULL;
const gchar* _tmp16_ = NULL;
@@ -2418,7 +2419,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2422 "GPhoto.c"
+#line 2423 "GPhoto.c"
}
#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
@@ -2432,7 +2433,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_tmp23_ = res;
#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp23_ == GP_OK) {
-#line 2436 "GPhoto.c"
+#line 2437 "GPhoto.c"
guint8* buffer = NULL;
gulong _tmp24_ = 0UL;
guint8* _tmp25_ = NULL;
@@ -2488,7 +2489,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2492 "GPhoto.c"
+#line 2493 "GPhoto.c"
}
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp32_ = app_dirs_get_temp_dir ();
@@ -2518,7 +2519,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_tmp40_ = res;
#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp40_ != GP_OK) {
-#line 2522 "GPhoto.c"
+#line 2523 "GPhoto.c"
int _tmp41_ = 0;
const gchar* _tmp42_ = NULL;
const gchar* _tmp43_ = NULL;
@@ -2561,7 +2562,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2565 "GPhoto.c"
+#line 2566 "GPhoto.c"
}
#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp52_ = temp;
@@ -2579,7 +2580,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2583 "GPhoto.c"
+#line 2584 "GPhoto.c"
}
#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp54_ = _tmp51_;
@@ -2595,7 +2596,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2599 "GPhoto.c"
+#line 2600 "GPhoto.c"
}
@@ -2605,7 +2606,7 @@ void gp_on_mins_destroyed (void* data) {
_tmp0_ = data;
#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_free (_tmp0_);
-#line 2609 "GPhoto.c"
+#line 2610 "GPhoto.c"
}
@@ -2664,7 +2665,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_tmp2_ = res;
#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2668 "GPhoto.c"
+#line 2669 "GPhoto.c"
int _tmp3_ = 0;
int _tmp4_ = 0;
const gchar* _tmp5_ = NULL;
@@ -2685,7 +2686,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_gp_file_unref0 (camera_file);
#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2689 "GPhoto.c"
+#line 2690 "GPhoto.c"
}
#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = camera;
@@ -2707,7 +2708,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_tmp14_ = res;
#line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp14_ != GP_OK) {
-#line 2711 "GPhoto.c"
+#line 2712 "GPhoto.c"
int _tmp15_ = 0;
const gchar* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
@@ -2734,7 +2735,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_gp_file_unref0 (camera_file);
#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2738 "GPhoto.c"
+#line 2739 "GPhoto.c"
}
#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp21_ = camera_file;
@@ -2750,7 +2751,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_tmp25_ = res;
#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp25_ != GP_OK) {
-#line 2754 "GPhoto.c"
+#line 2755 "GPhoto.c"
guint8* _tmp26_ = NULL;
gint _tmp26__length1 = 0;
#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2761,7 +2762,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
if (result_length1) {
#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*result_length1 = _tmp26__length1;
-#line 2765 "GPhoto.c"
+#line 2766 "GPhoto.c"
}
#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = _tmp26_;
@@ -2769,7 +2770,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_gp_file_unref0 (camera_file);
#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2773 "GPhoto.c"
+#line 2774 "GPhoto.c"
}
#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp27_ = data_len;
@@ -2801,7 +2802,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
if (result_length1) {
#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*result_length1 = _tmp32__length1;
-#line 2805 "GPhoto.c"
+#line 2806 "GPhoto.c"
}
#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = _tmp32_;
@@ -2809,7 +2810,7 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_gp_file_unref0 (camera_file);
#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2813 "GPhoto.c"
+#line 2814 "GPhoto.c"
}
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index f967876..e049511 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.34.4, the Vala compiler
+/* ImportPage.c generated by valac 0.34.7, the Vala compiler
* generated from ImportPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2137,7 +2137,7 @@ static void import_source_collection_class_init (ImportSourceCollectionClass * k
#line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
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 = import_source_collection_real_holds_type_of_source;
+ ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) import_source_collection_real_holds_type_of_source;
#line 2141 "ImportPage.c"
}
@@ -2552,19 +2552,19 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
gchar* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
int _result_ = 0;
- Camera* _tmp10_ = NULL;
Camera* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ Camera* _tmp12_ = NULL;
+ const gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
- GPSpinIdleWrapper* _tmp15_ = NULL;
- GPContext* _tmp16_ = NULL;
- int _tmp17_ = 0;
+ gchar* _tmp15_ = NULL;
+ GPSpinIdleWrapper* _tmp16_ = NULL;
+ GPContext* _tmp17_ = NULL;
int _tmp18_ = 0;
int _tmp19_ = 0;
- gboolean _tmp26_ = FALSE;
+ int _tmp20_ = 0;
gboolean _tmp27_ = FALSE;
gboolean _tmp28_ = FALSE;
+ gboolean _tmp29_ = FALSE;
GError * _inner_error_ = NULL;
#line 88 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource);
@@ -2608,13 +2608,15 @@ 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"
+ gboolean _tmp10_ = FALSE;
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return FALSE;
-#line 2617 "ImportPage.c"
+ return _tmp10_;
+#line 2619 "ImportPage.c"
}
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp8_;
@@ -2622,98 +2624,100 @@ 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 2625 "ImportPage.c"
+#line 2627 "ImportPage.c"
}
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = import_source_get_camera (self);
+ _tmp11_ = import_source_get_camera (self);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp12_ = _tmp11_;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = fulldir;
+ _tmp13_ = fulldir;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = import_source_get_filename (self);
+ _tmp14_ = import_source_get_filename (self);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = _tmp13_;
+ _tmp15_ = _tmp14_;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = import_page_spin_idle_context;
+ _tmp16_ = import_page_spin_idle_context;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = gp_camera_file_delete (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
+ _tmp18_ = gp_camera_file_delete (_tmp12_, _tmp13_, _tmp15_, _tmp17_);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = _tmp17_;
+ _tmp19_ = _tmp18_;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp14_);
+ _g_free0 (_tmp15_);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _gp_camera_unref0 (_tmp11_);
+ _gp_camera_unref0 (_tmp12_);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _result_ = _tmp18_;
+ _result_ = _tmp19_;
#line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _result_;
+ _tmp20_ = _result_;
#line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp19_ != GP_OK) {
-#line 2655 "ImportPage.c"
- gchar* _tmp20_ = NULL;
+ if (_tmp20_ != GP_OK) {
+#line 2657 "ImportPage.c"
gchar* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- int _tmp23_ = 0;
- gchar* _tmp24_ = NULL;
+ gchar* _tmp22_ = NULL;
+ const gchar* _tmp23_ = NULL;
+ int _tmp24_ = 0;
gchar* _tmp25_ = NULL;
+ gchar* _tmp26_ = NULL;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
+ _tmp21_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = _tmp20_;
+ _tmp22_ = _tmp21_;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = self->priv->camera_name;
+ _tmp23_ = self->priv->camera_name;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = _result_;
+ _tmp24_ = _result_;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = gp_result_to_full_string (_tmp23_);
+ _tmp25_ = gp_result_to_full_string (_tmp24_);
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = _tmp24_;
+ _tmp26_ = _tmp25_;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp21_, _tmp22_, _tmp25_);
+ g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp22_, _tmp23_, _tmp26_);
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp25_);
+ _g_free0 (_tmp26_);
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp21_);
-#line 2680 "ImportPage.c"
+ _g_free0 (_tmp22_);
+#line 2682 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = 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_);
+ _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_);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = _tmp28_;
+ _tmp28_ = _tmp29_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2690 "ImportPage.c"
+ gboolean _tmp30_ = FALSE;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return FALSE;
-#line 2694 "ImportPage.c"
+ return _tmp30_;
+#line 2698 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp27_) {
-#line 2698 "ImportPage.c"
- int _tmp29_ = 0;
+ if (_tmp28_) {
+#line 2702 "ImportPage.c"
+ int _tmp31_ = 0;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = _result_;
+ _tmp31_ = _result_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = _tmp29_ == GP_OK;
-#line 2704 "ImportPage.c"
+ _tmp27_ = _tmp31_ == GP_OK;
+#line 2708 "ImportPage.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = FALSE;
-#line 2708 "ImportPage.c"
+ _tmp27_ = FALSE;
+#line 2712 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp26_;
+ result = _tmp27_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2716 "ImportPage.c"
+#line 2720 "ImportPage.c"
}
@@ -2729,7 +2733,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 2732 "ImportPage.c"
+#line 2736 "ImportPage.c"
}
@@ -2739,16 +2743,16 @@ static void import_source_class_init (ImportSourceClass * klass) {
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_type_class_add_private (klass, sizeof (ImportSourcePrivate));
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ImportSourceClass *) klass)->get_preview = import_source_real_get_preview;
+ ((ImportSourceClass *) klass)->get_preview = (GdkPixbuf* (*)(ImportSource*)) import_source_real_get_preview;
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ImportSourceClass *) klass)->get_exposure_time = import_source_real_get_exposure_time;
+ ((ImportSourceClass *) klass)->get_exposure_time = (time_t (*)(ImportSource*)) import_source_real_get_exposure_time;
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataObjectClass *) klass)->to_string = import_source_real_to_string;
+ ((DataObjectClass *) klass)->to_string = (gchar* (*)(DataObject*)) import_source_real_to_string;
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataSourceClass *) klass)->internal_delete_backing = import_source_real_internal_delete_backing;
+ ((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 2751 "ImportPage.c"
+#line 2755 "ImportPage.c"
}
@@ -2757,7 +2761,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 2760 "ImportPage.c"
+#line 2764 "ImportPage.c"
}
@@ -2768,7 +2772,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 2771 "ImportPage.c"
+#line 2775 "ImportPage.c"
}
@@ -2790,7 +2794,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 2793 "ImportPage.c"
+#line 2797 "ImportPage.c"
}
@@ -2843,14 +2847,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 2846 "ImportPage.c"
+#line 2850 "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 2853 "ImportPage.c"
+#line 2857 "ImportPage.c"
}
@@ -2876,7 +2880,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 2879 "ImportPage.c"
+#line 2883 "ImportPage.c"
}
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp0_;
@@ -2888,7 +2892,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 2891 "ImportPage.c"
+#line 2895 "ImportPage.c"
}
@@ -2916,13 +2920,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 2919 "ImportPage.c"
+#line 2923 "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 2925 "ImportPage.c"
+#line 2929 "ImportPage.c"
GdkPixbuf* _tmp5_ = NULL;
GdkPixbuf* _tmp6_ = NULL;
gint _tmp7_ = 0;
@@ -2941,7 +2945,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 2944 "ImportPage.c"
+#line 2948 "ImportPage.c"
} else {
GdkPixbuf* _tmp9_ = NULL;
#line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2950,13 +2954,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 2953 "ImportPage.c"
+#line 2957 "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 2959 "ImportPage.c"
+#line 2963 "ImportPage.c"
}
@@ -2972,7 +2976,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 2975 "ImportPage.c"
+#line 2979 "ImportPage.c"
}
@@ -2988,7 +2992,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 2991 "ImportPage.c"
+#line 2995 "ImportPage.c"
}
@@ -3004,7 +3008,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 3007 "ImportPage.c"
+#line 3011 "ImportPage.c"
}
@@ -3020,7 +3024,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 3023 "ImportPage.c"
+#line 3027 "ImportPage.c"
}
@@ -3035,7 +3039,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 3038 "ImportPage.c"
+#line 3042 "ImportPage.c"
GdkPixbuf* _tmp2_ = NULL;
GdkPixbuf* _tmp3_ = NULL;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3046,7 +3050,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 3049 "ImportPage.c"
+#line 3053 "ImportPage.c"
} else {
GdkPixbuf* _tmp4_ = NULL;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3055,13 +3059,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 3058 "ImportPage.c"
+#line 3062 "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 3064 "ImportPage.c"
+#line 3068 "ImportPage.c"
}
@@ -3069,18 +3073,18 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) {
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
video_import_source_parent_class = g_type_class_peek_parent (klass);
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ThumbnailSourceClass *) klass)->get_thumbnail = video_import_source_real_get_thumbnail;
+ ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) video_import_source_real_get_thumbnail;
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ThumbnailSourceClass *) klass)->create_thumbnail = video_import_source_real_create_thumbnail;
+ ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) video_import_source_real_create_thumbnail;
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataSourceClass *) klass)->get_typename = video_import_source_real_get_typename;
+ ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) video_import_source_real_get_typename;
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataSourceClass *) klass)->get_instance_id = video_import_source_real_get_instance_id;
+ ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) video_import_source_real_get_instance_id;
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = video_import_source_real_get_preferred_thumbnail_format;
+ ((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 = video_import_source_real_get_name;
-#line 3083 "ImportPage.c"
+ ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) video_import_source_real_get_name;
+#line 3087 "ImportPage.c"
}
@@ -3140,14 +3144,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 3143 "ImportPage.c"
+#line 3147 "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 3150 "ImportPage.c"
+#line 3154 "ImportPage.c"
}
@@ -3171,7 +3175,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 3174 "ImportPage.c"
+#line 3178 "ImportPage.c"
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3182,7 +3186,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 3185 "ImportPage.c"
+#line 3189 "ImportPage.c"
} else {
gchar* _tmp6_ = NULL;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3191,7 +3195,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 3194 "ImportPage.c"
+#line 3198 "ImportPage.c"
}
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
@@ -3199,7 +3203,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 3202 "ImportPage.c"
+#line 3206 "ImportPage.c"
}
@@ -3215,7 +3219,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 3218 "ImportPage.c"
+#line 3222 "ImportPage.c"
}
@@ -3231,7 +3235,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 3234 "ImportPage.c"
+#line 3238 "ImportPage.c"
}
@@ -3249,26 +3253,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 3252 "ImportPage.c"
+#line 3256 "ImportPage.c"
PhotoFileFormat _tmp3_ = 0;
#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 3258 "ImportPage.c"
+#line 3262 "ImportPage.c"
} else {
PhotoFileFormat _tmp4_ = 0;
#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 3265 "ImportPage.c"
+#line 3269 "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 3271 "ImportPage.c"
+#line 3275 "ImportPage.c"
}
@@ -3296,13 +3300,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 3299 "ImportPage.c"
+#line 3303 "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 3305 "ImportPage.c"
+#line 3309 "ImportPage.c"
GdkPixbuf* _tmp5_ = NULL;
GdkPixbuf* _tmp6_ = NULL;
gint _tmp7_ = 0;
@@ -3321,7 +3325,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 3324 "ImportPage.c"
+#line 3328 "ImportPage.c"
} else {
GdkPixbuf* _tmp9_ = NULL;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3330,20 +3334,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 3333 "ImportPage.c"
+#line 3337 "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 3339 "ImportPage.c"
+#line 3343 "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 3346 "ImportPage.c"
+#line 3350 "ImportPage.c"
}
@@ -3389,7 +3393,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 3392 "ImportPage.c"
+#line 3396 "ImportPage.c"
}
@@ -3408,7 +3412,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 3411 "ImportPage.c"
+#line 3415 "ImportPage.c"
time_t _tmp1_ = 0;
#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));
@@ -3416,7 +3420,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 3419 "ImportPage.c"
+#line 3423 "ImportPage.c"
}
#line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->metadata;
@@ -3428,7 +3432,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 3431 "ImportPage.c"
+#line 3435 "ImportPage.c"
MetadataDateTime* _tmp6_ = NULL;
time_t _tmp7_ = 0;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3437,14 +3441,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 3440 "ImportPage.c"
+#line 3444 "ImportPage.c"
} else {
time_t _tmp8_ = 0;
#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 3447 "ImportPage.c"
+#line 3451 "ImportPage.c"
}
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp4_;
@@ -3452,7 +3456,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 3455 "ImportPage.c"
+#line 3459 "ImportPage.c"
}
@@ -3466,7 +3470,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 3469 "ImportPage.c"
+#line 3473 "ImportPage.c"
PhotoMetadata* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3477,19 +3481,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 3480 "ImportPage.c"
+#line 3484 "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 3486 "ImportPage.c"
+#line 3490 "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 3492 "ImportPage.c"
+#line 3496 "ImportPage.c"
}
@@ -3504,7 +3508,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 3507 "ImportPage.c"
+#line 3511 "ImportPage.c"
PhotoImportSource* _tmp1_ = NULL;
PhotoMetadata* _tmp2_ = NULL;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3515,7 +3519,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
result = _tmp2_;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3518 "ImportPage.c"
+#line 3522 "ImportPage.c"
}
#line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->metadata;
@@ -3525,7 +3529,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
result = _tmp4_;
#line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3528 "ImportPage.c"
+#line 3532 "ImportPage.c"
}
@@ -3542,7 +3546,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 3545 "ImportPage.c"
+#line 3549 "ImportPage.c"
PhotoImportSource* _tmp1_ = NULL;
GdkPixbuf* _tmp2_ = NULL;
#line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3553,7 +3557,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 3556 "ImportPage.c"
+#line 3560 "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));
@@ -3565,7 +3569,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 3568 "ImportPage.c"
+#line 3572 "ImportPage.c"
GdkPixbuf* _tmp6_ = NULL;
#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));
@@ -3573,13 +3577,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 3576 "ImportPage.c"
+#line 3580 "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 3582 "ImportPage.c"
+#line 3586 "ImportPage.c"
}
@@ -3607,13 +3611,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 3610 "ImportPage.c"
+#line 3614 "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 3616 "ImportPage.c"
+#line 3620 "ImportPage.c"
GdkPixbuf* _tmp5_ = NULL;
GdkPixbuf* _tmp6_ = NULL;
gint _tmp7_ = 0;
@@ -3632,7 +3636,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 3635 "ImportPage.c"
+#line 3639 "ImportPage.c"
} else {
GdkPixbuf* _tmp9_ = NULL;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3641,13 +3645,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 3644 "ImportPage.c"
+#line 3648 "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 3650 "ImportPage.c"
+#line 3654 "ImportPage.c"
}
@@ -3662,7 +3666,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 3665 "ImportPage.c"
+#line 3669 "ImportPage.c"
}
@@ -3680,7 +3684,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 3683 "ImportPage.c"
+#line 3687 "ImportPage.c"
}
@@ -3699,7 +3703,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 3702 "ImportPage.c"
+#line 3706 "ImportPage.c"
}
@@ -3717,7 +3721,7 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self)
result = _tmp1_;
#line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3720 "ImportPage.c"
+#line 3724 "ImportPage.c"
}
@@ -3726,7 +3730,7 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
gboolean result = FALSE;
gboolean ret = FALSE;
gboolean _tmp0_ = FALSE;
- PhotoImportSource* _tmp1_ = NULL;
+ PhotoImportSource* _tmp2_ = NULL;
GError * _inner_error_ = NULL;
#line 256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
@@ -3736,46 +3740,50 @@ 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"
+ 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 FALSE;
-#line 3743 "ImportPage.c"
+ return _tmp1_;
+#line 3749 "ImportPage.c"
}
#line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = self->priv->associated;
+ _tmp2_ = self->priv->associated;
#line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp1_ != NULL) {
-#line 3749 "ImportPage.c"
- gboolean _tmp2_ = FALSE;
- PhotoImportSource* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ if (_tmp2_ != NULL) {
+#line 3755 "ImportPage.c"
+ gboolean _tmp3_ = FALSE;
+ PhotoImportSource* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
+ gboolean _tmp7_ = FALSE;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = self->priv->associated;
+ _tmp4_ = self->priv->associated;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource), &_inner_error_);
+ _tmp5_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), &_inner_error_);
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _tmp4_;
+ _tmp3_ = _tmp5_;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3768 "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 FALSE;
-#line 3766 "ImportPage.c"
+ return _tmp6_;
+#line 3774 "ImportPage.c"
}
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = ret;
+ _tmp7_ = ret;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ret = _tmp5_ & _tmp2_;
-#line 3772 "ImportPage.c"
+ ret = _tmp7_ & _tmp3_;
+#line 3780 "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 3778 "ImportPage.c"
+#line 3786 "ImportPage.c"
}
@@ -3785,26 +3793,26 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) {
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_type_class_add_private (klass, sizeof (PhotoImportSourcePrivate));
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataObjectClass *) klass)->get_name = photo_import_source_real_get_name;
+ ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) photo_import_source_real_get_name;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataSourceClass *) klass)->get_typename = photo_import_source_real_get_typename;
+ ((DataSourceClass *) klass)->get_typename = (gchar* (*)(DataSource*)) photo_import_source_real_get_typename;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataSourceClass *) klass)->get_instance_id = photo_import_source_real_get_instance_id;
+ ((DataSourceClass *) klass)->get_instance_id = (gint64 (*)(DataSource*)) photo_import_source_real_get_instance_id;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = photo_import_source_real_get_preferred_thumbnail_format;
+ ((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*)(ThumbnailSource*)) photo_import_source_real_get_preferred_thumbnail_format;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ThumbnailSourceClass *) klass)->create_thumbnail = photo_import_source_real_create_thumbnail;
+ ((ThumbnailSourceClass *) klass)->create_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) photo_import_source_real_create_thumbnail;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ImportSourceClass *) klass)->get_exposure_time = photo_import_source_real_get_exposure_time;
+ ((ImportSourceClass *) klass)->get_exposure_time = (time_t (*)(ImportSource*)) photo_import_source_real_get_exposure_time;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ImportSourceClass *) klass)->get_preview = photo_import_source_real_get_preview;
+ ((ImportSourceClass *) klass)->get_preview = (GdkPixbuf* (*)(ImportSource*)) photo_import_source_real_get_preview;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ThumbnailSourceClass *) klass)->get_thumbnail = photo_import_source_real_get_thumbnail;
+ ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) photo_import_source_real_get_thumbnail;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((DataSourceClass *) klass)->internal_delete_backing = photo_import_source_real_internal_delete_backing;
+ ((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 3807 "ImportPage.c"
+#line 3815 "ImportPage.c"
}
@@ -3819,7 +3827,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 3822 "ImportPage.c"
+#line 3830 "ImportPage.c"
}
@@ -3837,7 +3845,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 3840 "ImportPage.c"
+#line 3848 "ImportPage.c"
}
@@ -3897,11 +3905,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 3900 "ImportPage.c"
+#line 3908 "ImportPage.c"
}
#line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
pixbuf = NULL;
-#line 3904 "ImportPage.c"
+#line 3912 "ImportPage.c"
{
GdkPixbuf* _tmp6_ = NULL;
ImportSource* _tmp7_ = NULL;
@@ -3915,7 +3923,7 @@ 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 3918 "ImportPage.c"
+#line 3926 "ImportPage.c"
goto __catch64_g_error;
}
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3928,7 +3936,7 @@ 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 3931 "ImportPage.c"
+#line 3939 "ImportPage.c"
}
goto __finally64;
__catch64_g_error:
@@ -3956,7 +3964,7 @@ 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 3959 "ImportPage.c"
+#line 3967 "ImportPage.c"
}
__finally64:
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3969,7 +3977,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 3972 "ImportPage.c"
+#line 3980 "ImportPage.c"
}
#line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = pixbuf;
@@ -3979,7 +3987,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 3982 "ImportPage.c"
+#line 3990 "ImportPage.c"
GdkPixbuf* _tmp16_ = NULL;
GdkPixbuf* _tmp20_ = NULL;
GdkPixbuf* _tmp21_ = NULL;
@@ -3987,7 +3995,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 3990 "ImportPage.c"
+#line 3998 "ImportPage.c"
GdkPixbuf* _tmp17_ = NULL;
GdkPixbuf* _tmp18_ = NULL;
GdkPixbuf* _tmp19_ = NULL;
@@ -4005,7 +4013,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 4008 "ImportPage.c"
+#line 4016 "ImportPage.c"
}
#line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = import_preview_placeholder_preview;
@@ -4015,7 +4023,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 4018 "ImportPage.c"
+#line 4026 "ImportPage.c"
}
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = pixbuf;
@@ -4025,7 +4033,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 4028 "ImportPage.c"
+#line 4036 "ImportPage.c"
} else {
GdkPixbuf* _tmp25_ = NULL;
gint _tmp26_ = 0;
@@ -4035,11 +4043,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 4038 "ImportPage.c"
+#line 4046 "ImportPage.c"
}
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp22_) {
-#line 4042 "ImportPage.c"
+#line 4050 "ImportPage.c"
GdkPixbuf* _tmp27_ = NULL;
GdkPixbuf* _tmp28_ = NULL;
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4050,13 +4058,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 4053 "ImportPage.c"
+#line 4061 "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 4059 "ImportPage.c"
+#line 4067 "ImportPage.c"
PhotoImportSource* photo_import_source = NULL;
ImportSource* _tmp30_ = NULL;
PhotoImportSource* _tmp31_ = NULL;
@@ -4076,7 +4084,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 4079 "ImportPage.c"
+#line 4087 "ImportPage.c"
PhotoImportSource* _tmp34_ = NULL;
PhotoMetadata* _tmp35_ = NULL;
PhotoMetadata* _tmp36_ = NULL;
@@ -4090,15 +4098,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 4093 "ImportPage.c"
+#line 4101 "ImportPage.c"
} else {
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = FALSE;
-#line 4097 "ImportPage.c"
+#line 4105 "ImportPage.c"
}
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp32_) {
-#line 4101 "ImportPage.c"
+#line 4109 "ImportPage.c"
PhotoImportSource* _tmp37_ = NULL;
PhotoMetadata* _tmp38_ = NULL;
PhotoMetadata* _tmp39_ = NULL;
@@ -4123,7 +4131,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 4126 "ImportPage.c"
+#line 4134 "ImportPage.c"
}
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = photo_import_source;
@@ -4137,7 +4145,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 4140 "ImportPage.c"
+#line 4148 "ImportPage.c"
const gchar* _tmp47_ = NULL;
gchar* _tmp48_ = NULL;
gchar* _tmp49_ = NULL;
@@ -4151,11 +4159,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_, TRUE, PANGO_ALIGN_LEFT);
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp49_);
-#line 4154 "ImportPage.c"
+#line 4162 "ImportPage.c"
}
#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo_import_source);
-#line 4158 "ImportPage.c"
+#line 4166 "ImportPage.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = pixbuf;
@@ -4165,14 +4173,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 4168 "ImportPage.c"
+#line 4176 "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 4175 "ImportPage.c"
+#line 4183 "ImportPage.c"
}
@@ -4196,7 +4204,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 4199 "ImportPage.c"
+#line 4207 "ImportPage.c"
}
#line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source = _tmp1_;
@@ -4204,7 +4212,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 4207 "ImportPage.c"
+#line 4215 "ImportPage.c"
gchar* preview_md5 = NULL;
PhotoImportSource* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -4233,7 +4241,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 4236 "ImportPage.c"
+#line 4244 "ImportPage.c"
const gchar* _tmp10_ = NULL;
PhotoFileFormat _tmp11_ = 0;
gboolean _tmp12_ = FALSE;
@@ -4245,15 +4253,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 4248 "ImportPage.c"
+#line 4256 "ImportPage.c"
} else {
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = FALSE;
-#line 4252 "ImportPage.c"
+#line 4260 "ImportPage.c"
}
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp7_) {
-#line 4256 "ImportPage.c"
+#line 4264 "ImportPage.c"
const gchar* _tmp13_ = NULL;
PhotoFileFormat _tmp14_ = 0;
PhotoID _tmp15_ = {0};
@@ -4278,13 +4286,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 4281 "ImportPage.c"
+#line 4289 "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 4287 "ImportPage.c"
+#line 4295 "ImportPage.c"
guint64 filesize = 0ULL;
ImportSource* _tmp18_ = NULL;
ImportSource* _tmp19_ = NULL;
@@ -4307,7 +4315,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 4310 "ImportPage.c"
+#line 4318 "ImportPage.c"
PhotoID duplicated_photo_id = {0};
LibraryPhotoSourceCollection* _tmp23_ = NULL;
ImportSource* _tmp24_ = NULL;
@@ -4344,7 +4352,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 4347 "ImportPage.c"
+#line 4355 "ImportPage.c"
LibraryPhoto* duplicated_photo = NULL;
LibraryPhotoSourceCollection* _tmp32_ = NULL;
PhotoID _tmp33_ = {0};
@@ -4383,7 +4391,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 4386 "ImportPage.c"
+#line 4394 "ImportPage.c"
LibraryPhotoSourceCollection* _tmp41_ = NULL;
ImportSource* _tmp42_ = NULL;
ImportSource* _tmp43_ = NULL;
@@ -4426,11 +4434,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 4429 "ImportPage.c"
+#line 4437 "ImportPage.c"
}
#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (duplicated_photo);
-#line 4433 "ImportPage.c"
+#line 4441 "ImportPage.c"
}
}
}
@@ -4442,7 +4450,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 4445 "ImportPage.c"
+#line 4453 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = import_preview_get_import_source (self);
@@ -4452,7 +4460,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 4455 "ImportPage.c"
+#line 4463 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
video_import_source = _tmp50_;
@@ -4460,7 +4468,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 4463 "ImportPage.c"
+#line 4471 "ImportPage.c"
VideoSourceCollection* _tmp52_ = NULL;
VideoImportSource* _tmp53_ = NULL;
gchar* _tmp54_ = NULL;
@@ -4489,7 +4497,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 4492 "ImportPage.c"
+#line 4500 "ImportPage.c"
VideoSourceCollection* _tmp60_ = NULL;
VideoImportSource* _tmp61_ = NULL;
gchar* _tmp62_ = NULL;
@@ -4528,7 +4536,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 4531 "ImportPage.c"
+#line 4539 "ImportPage.c"
}
#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4538,7 +4546,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 4541 "ImportPage.c"
+#line 4549 "ImportPage.c"
}
#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4548,7 +4556,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 4551 "ImportPage.c"
+#line 4559 "ImportPage.c"
}
@@ -4567,7 +4575,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
result = NULL;
#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4570 "ImportPage.c"
+#line 4578 "ImportPage.c"
}
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->duplicated_file;
@@ -4577,7 +4585,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
result = _tmp2_;
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4580 "ImportPage.c"
+#line 4588 "ImportPage.c"
}
@@ -4592,7 +4600,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 4595 "ImportPage.c"
+#line 4603 "ImportPage.c"
}
@@ -4603,14 +4611,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 4606 "ImportPage.c"
+#line 4614 "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 4613 "ImportPage.c"
+#line 4621 "ImportPage.c"
}
@@ -4622,7 +4630,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 4625 "ImportPage.c"
+#line 4633 "ImportPage.c"
}
@@ -4660,14 +4668,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 4663 "ImportPage.c"
+#line 4671 "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 4670 "ImportPage.c"
+#line 4678 "ImportPage.c"
}
@@ -4676,7 +4684,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 4679 "ImportPage.c"
+#line 4687 "ImportPage.c"
}
@@ -4696,7 +4704,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 4699 "ImportPage.c"
+#line 4707 "ImportPage.c"
}
@@ -4712,7 +4720,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 4715 "ImportPage.c"
+#line 4723 "ImportPage.c"
}
@@ -4764,7 +4772,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 4767 "ImportPage.c"
+#line 4775 "ImportPage.c"
PhotoImportSource* _tmp7_ = NULL;
PhotoFileFormat _tmp8_ = 0;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4773,21 +4781,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 4776 "ImportPage.c"
+#line 4784 "ImportPage.c"
} else {
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = FALSE;
-#line 4780 "ImportPage.c"
+#line 4788 "ImportPage.c"
}
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 4784 "ImportPage.c"
+#line 4792 "ImportPage.c"
gint _tmp9_ = 0;
#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 4790 "ImportPage.c"
+#line 4798 "ImportPage.c"
} else {
gboolean _tmp10_ = FALSE;
PhotoImportSource* _tmp11_ = NULL;
@@ -4795,7 +4803,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 4798 "ImportPage.c"
+#line 4806 "ImportPage.c"
PhotoImportSource* _tmp12_ = NULL;
PhotoFileFormat _tmp13_ = 0;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4804,34 +4812,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 4807 "ImportPage.c"
+#line 4815 "ImportPage.c"
} else {
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = FALSE;
-#line 4811 "ImportPage.c"
+#line 4819 "ImportPage.c"
}
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp10_) {
-#line 4815 "ImportPage.c"
+#line 4823 "ImportPage.c"
gint _tmp14_ = 0;
#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 4821 "ImportPage.c"
+#line 4829 "ImportPage.c"
} else {
ImportSource* _tmp15_ = NULL;
#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 4828 "ImportPage.c"
+#line 4836 "ImportPage.c"
gint _tmp16_ = 0;
#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 4834 "ImportPage.c"
+#line 4842 "ImportPage.c"
}
}
}
@@ -4843,7 +4851,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 4846 "ImportPage.c"
+#line 4854 "ImportPage.c"
}
@@ -4883,7 +4891,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 4886 "ImportPage.c"
+#line 4894 "ImportPage.c"
PhotoImportSource* _tmp7_ = NULL;
PhotoFileFormat _tmp8_ = 0;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4892,15 +4900,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 4895 "ImportPage.c"
+#line 4903 "ImportPage.c"
} else {
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = FALSE;
-#line 4899 "ImportPage.c"
+#line 4907 "ImportPage.c"
}
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 4903 "ImportPage.c"
+#line 4911 "ImportPage.c"
gint _tmp9_ = 0;
gint _tmp10_ = 0;
#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4911,7 +4919,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 4914 "ImportPage.c"
+#line 4922 "ImportPage.c"
} else {
gboolean _tmp11_ = FALSE;
PhotoImportSource* _tmp12_ = NULL;
@@ -4919,7 +4927,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 4922 "ImportPage.c"
+#line 4930 "ImportPage.c"
PhotoImportSource* _tmp13_ = NULL;
PhotoFileFormat _tmp14_ = 0;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4928,15 +4936,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 4931 "ImportPage.c"
+#line 4939 "ImportPage.c"
} else {
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = FALSE;
-#line 4935 "ImportPage.c"
+#line 4943 "ImportPage.c"
}
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_) {
-#line 4939 "ImportPage.c"
+#line 4947 "ImportPage.c"
gint _tmp15_ = 0;
gint _tmp16_ = 0;
#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4947,14 +4955,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 4950 "ImportPage.c"
+#line 4958 "ImportPage.c"
} else {
ImportSource* _tmp17_ = NULL;
#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 4957 "ImportPage.c"
+#line 4965 "ImportPage.c"
gint _tmp18_ = 0;
gint _tmp19_ = 0;
#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4965,7 +4973,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 4968 "ImportPage.c"
+#line 4976 "ImportPage.c"
}
}
}
@@ -4977,7 +4985,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 4980 "ImportPage.c"
+#line 4988 "ImportPage.c"
}
@@ -4994,7 +5002,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 4997 "ImportPage.c"
+#line 5005 "ImportPage.c"
}
@@ -5021,7 +5029,7 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
result = _tmp4_;
#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5024 "ImportPage.c"
+#line 5032 "ImportPage.c"
}
@@ -5031,14 +5039,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 5034 "ImportPage.c"
+#line 5042 "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 5041 "ImportPage.c"
+#line 5049 "ImportPage.c"
}
@@ -5053,7 +5061,7 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
result = _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5056 "ImportPage.c"
+#line 5064 "ImportPage.c"
}
@@ -5067,7 +5075,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 5070 "ImportPage.c"
+#line 5078 "ImportPage.c"
}
@@ -5082,7 +5090,7 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
result = _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5085 "ImportPage.c"
+#line 5093 "ImportPage.c"
}
@@ -5096,7 +5104,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 5099 "ImportPage.c"
+#line 5107 "ImportPage.c"
}
@@ -5111,7 +5119,7 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
result = _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5114 "ImportPage.c"
+#line 5122 "ImportPage.c"
}
@@ -5125,7 +5133,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 5128 "ImportPage.c"
+#line 5136 "ImportPage.c"
}
@@ -5140,7 +5148,7 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
result = _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5143 "ImportPage.c"
+#line 5151 "ImportPage.c"
}
@@ -5154,7 +5162,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 5157 "ImportPage.c"
+#line 5165 "ImportPage.c"
}
@@ -5177,7 +5185,7 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS, 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, 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 5180 "ImportPage.c"
+#line 5188 "ImportPage.c"
}
@@ -5190,7 +5198,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 5193 "ImportPage.c"
+#line 5201 "ImportPage.c"
}
@@ -5205,7 +5213,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 5208 "ImportPage.c"
+#line 5216 "ImportPage.c"
}
@@ -5215,7 +5223,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 5218 "ImportPage.c"
+#line 5226 "ImportPage.c"
}
@@ -5262,13 +5270,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 5265 "ImportPage.c"
+#line 5273 "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 5271 "ImportPage.c"
+#line 5279 "ImportPage.c"
}
}
@@ -5302,13 +5310,13 @@ 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 5305 "ImportPage.c"
+#line 5313 "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 5311 "ImportPage.c"
+#line 5319 "ImportPage.c"
}
}
@@ -5316,7 +5324,7 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
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"
import_page_on_media_added_removed ((ImportPage*) self);
-#line 5319 "ImportPage.c"
+#line 5327 "ImportPage.c"
}
@@ -5335,28 +5343,28 @@ 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"
import_page_on_import_selected ((ImportPage*) self);
-#line 5338 "ImportPage.c"
+#line 5346 "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"
import_page_on_import_all ((ImportPage*) self);
-#line 5345 "ImportPage.c"
+#line 5353 "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"
page_on_action_toggle ((Page*) self, action, parameter);
-#line 5352 "ImportPage.c"
+#line 5360 "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"
import_page_on_display_titles ((ImportPage*) self, action, value);
-#line 5359 "ImportPage.c"
+#line 5367 "ImportPage.c"
}
@@ -5365,7 +5373,7 @@ static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpoi
result = import_page_preview_comparator (a, b);
#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5368 "ImportPage.c"
+#line 5376 "ImportPage.c"
}
@@ -5374,28 +5382,28 @@ static gboolean _import_page_preview_comparator_predicate_comparator_predicate (
result = import_page_preview_comparator_predicate (object, alteration);
#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5377 "ImportPage.c"
+#line 5385 "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"
import_page_on_view_changed ((ImportPage*) self);
-#line 5384 "ImportPage.c"
+#line 5392 "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"
import_page_on_view_changed ((ImportPage*) self);
-#line 5391 "ImportPage.c"
+#line 5399 "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"
import_page_on_view_changed ((ImportPage*) self);
-#line 5398 "ImportPage.c"
+#line 5406 "ImportPage.c"
}
@@ -5504,7 +5512,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
_tmp14_ = display_name;
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (NULL != _tmp14_) {
-#line 5507 "ImportPage.c"
+#line 5515 "ImportPage.c"
const gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5515,7 +5523,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
_g_free0 (self->priv->camera_name);
#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->camera_name = _tmp16_;
-#line 5518 "ImportPage.c"
+#line 5526 "ImportPage.c"
} else {
CameraAbilities abilities = {0};
int res = 0;
@@ -5537,7 +5545,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
_tmp20_ = res;
#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp20_ != GP_OK) {
-#line 5540 "ImportPage.c"
+#line 5548 "ImportPage.c"
int _tmp21_ = 0;
gchar* _tmp22_ = NULL;
gchar* _tmp23_ = NULL;
@@ -5561,11 +5569,11 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
_g_free0 (self->priv->camera_name);
#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->camera_name = _tmp25_;
-#line 5564 "ImportPage.c"
+#line 5572 "ImportPage.c"
}
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(abilities);
-#line 5568 "ImportPage.c"
+#line 5576 "ImportPage.c"
}
#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->camera_label;
@@ -5587,7 +5595,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
_tmp30_ = import_page_null_context;
#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp30_ == NULL) {
-#line 5590 "ImportPage.c"
+#line 5598 "ImportPage.c"
GPContextWrapper* _tmp31_ = NULL;
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = gp_context_wrapper_new ();
@@ -5595,13 +5603,13 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
_gp_context_wrapper_unref0 (import_page_null_context);
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_null_context = _tmp31_;
-#line 5598 "ImportPage.c"
+#line 5606 "ImportPage.c"
}
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = import_page_spin_idle_context;
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp32_ == NULL) {
-#line 5604 "ImportPage.c"
+#line 5612 "ImportPage.c"
GPSpinIdleWrapper* _tmp33_ = NULL;
#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = gp_spin_idle_wrapper_new ();
@@ -5609,7 +5617,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
_gp_context_wrapper_unref0 (import_page_spin_idle_context);
#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_spin_idle_context = _tmp33_;
-#line 5612 "ImportPage.c"
+#line 5620 "ImportPage.c"
}
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5691,21 +5699,21 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
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"
return self;
-#line 5694 "ImportPage.c"
+#line 5702 "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"
return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon);
-#line 5701 "ImportPage.c"
+#line 5709 "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"
import_page_on_hide_imported ((ImportPage*) self);
-#line 5708 "ImportPage.c"
+#line 5716 "ImportPage.c"
}
@@ -5721,7 +5729,7 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ == NULL) {
-#line 5724 "ImportPage.c"
+#line 5732 "ImportPage.c"
GtkToolbar* _tmp1_ = NULL;
GtkToolbar* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
@@ -6020,7 +6028,7 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
_g_object_unref0 (separator);
#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (hide_item);
-#line 6023 "ImportPage.c"
+#line 6031 "ImportPage.c"
}
#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
@@ -6030,14 +6038,14 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
result = _tmp60_;
#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6033 "ImportPage.c"
+#line 6041 "ImportPage.c"
}
static gpointer _core_tracker_ref0 (gpointer self) {
#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? core_tracker_ref (self) : NULL;
-#line 6040 "ImportPage.c"
+#line 6048 "ImportPage.c"
}
@@ -6056,7 +6064,7 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas
result = _tmp1_;
#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6059 "ImportPage.c"
+#line 6067 "ImportPage.c"
}
@@ -6075,7 +6083,7 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
result = _tmp1_;
#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6078 "ImportPage.c"
+#line 6086 "ImportPage.c"
}
@@ -6094,7 +6102,7 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba
result = _tmp1_;
#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6097 "ImportPage.c"
+#line 6105 "ImportPage.c"
}
@@ -6135,7 +6143,7 @@ static gint64 import_page_preview_comparator (void* a, void* b) {
result = _tmp8_;
#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6138 "ImportPage.c"
+#line 6146 "ImportPage.c"
}
@@ -6155,7 +6163,7 @@ static gboolean import_page_preview_comparator_predicate (DataObject* object, Al
result = _tmp1_;
#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6158 "ImportPage.c"
+#line 6166 "ImportPage.c"
}
@@ -6179,7 +6187,7 @@ static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void
result = (gint64) (_tmp1_ - _tmp3_);
#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6182 "ImportPage.c"
+#line 6190 "ImportPage.c"
}
@@ -6199,14 +6207,14 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_
_tmp1_ = ui_filenames;
#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
-#line 6202 "ImportPage.c"
+#line 6210 "ImportPage.c"
}
static GVariant* _variant_new15 (gboolean value) {
#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6209 "ImportPage.c"
+#line 6217 "ImportPage.c"
}
@@ -6252,7 +6260,7 @@ static void import_page_real_add_actions (Page* base, GActionMap* map) {
_g_object_unref0 (_tmp5_);
#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
-#line 6255 "ImportPage.c"
+#line 6263 "ImportPage.c"
}
@@ -6267,7 +6275,7 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
_tmp0_ = map;
#line 899 "/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 6270 "ImportPage.c"
+#line 6278 "ImportPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -6279,11 +6287,11 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
entry_collection_length1 = G_N_ELEMENTS (IMPORT_PAGE_entries);
#line 900 "/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 6282 "ImportPage.c"
+#line 6290 "ImportPage.c"
GActionEntry entry = {0};
#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
entry = entry_collection[entry_it];
-#line 6286 "ImportPage.c"
+#line 6294 "ImportPage.c"
{
GActionMap* _tmp1_ = NULL;
GActionEntry _tmp2_ = {0};
@@ -6296,7 +6304,7 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
_tmp3_ = _tmp2_.name;
#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 6299 "ImportPage.c"
+#line 6307 "ImportPage.c"
}
}
}
@@ -6317,7 +6325,7 @@ Camera* import_page_get_camera (ImportPage* self) {
result = _tmp1_;
#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6320 "ImportPage.c"
+#line 6328 "ImportPage.c"
}
@@ -6335,7 +6343,7 @@ gchar* import_page_get_uri (ImportPage* self) {
result = _tmp1_;
#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6338 "ImportPage.c"
+#line 6346 "ImportPage.c"
}
@@ -6350,7 +6358,7 @@ gboolean import_page_is_busy (ImportPage* self) {
result = _tmp0_;
#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6353 "ImportPage.c"
+#line 6361 "ImportPage.c"
}
@@ -6372,7 +6380,7 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
_tmp1_ = count;
#line 923 "/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 6375 "ImportPage.c"
+#line 6383 "ImportPage.c"
}
@@ -6386,23 +6394,23 @@ gboolean import_page_is_refreshed (ImportPage* self) {
_tmp1_ = self->priv->refreshed;
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6389 "ImportPage.c"
+#line 6397 "ImportPage.c"
gboolean _tmp2_ = FALSE;
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = !_tmp2_;
-#line 6395 "ImportPage.c"
+#line 6403 "ImportPage.c"
} else {
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6399 "ImportPage.c"
+#line 6407 "ImportPage.c"
}
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6405 "ImportPage.c"
+#line 6413 "ImportPage.c"
}
@@ -6418,7 +6426,7 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_tmp0_ = self->priv->refresh_error;
#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 6421 "ImportPage.c"
+#line 6429 "ImportPage.c"
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6429,14 +6437,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_g_free0 (msg);
#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp2_;
-#line 6432 "ImportPage.c"
+#line 6440 "ImportPage.c"
} else {
int _tmp3_ = 0;
#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->refresh_result;
#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp3_ == GP_OK) {
-#line 6439 "ImportPage.c"
+#line 6447 "ImportPage.c"
} else {
int _tmp4_ = 0;
gchar* _tmp5_ = NULL;
@@ -6448,14 +6456,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_g_free0 (msg);
#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp5_;
-#line 6451 "ImportPage.c"
+#line 6459 "ImportPage.c"
}
}
#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = msg;
#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6458 "ImportPage.c"
+#line 6466 "ImportPage.c"
}
@@ -6474,7 +6482,7 @@ static void import_page_update_status (ImportPage* self, gboolean busy, gboolean
self->priv->refreshed = _tmp1_;
#line 947 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 6477 "ImportPage.c"
+#line 6485 "ImportPage.c"
}
@@ -6486,7 +6494,7 @@ static void import_page_update_toolbar_state (ImportPage* self) {
_tmp0_ = self->priv->hide_imported;
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 6489 "ImportPage.c"
+#line 6497 "ImportPage.c"
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
gboolean _tmp3_ = FALSE;
@@ -6495,21 +6503,21 @@ static void import_page_update_toolbar_state (ImportPage* self) {
_tmp3_ = self->priv->busy;
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp3_) {
-#line 6498 "ImportPage.c"
+#line 6506 "ImportPage.c"
gboolean _tmp4_ = FALSE;
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->refreshed;
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp4_;
-#line 6504 "ImportPage.c"
+#line 6512 "ImportPage.c"
} else {
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = FALSE;
-#line 6508 "ImportPage.c"
+#line 6516 "ImportPage.c"
}
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 6512 "ImportPage.c"
+#line 6520 "ImportPage.c"
ViewCollection* _tmp5_ = NULL;
ViewCollection* _tmp6_ = NULL;
gint _tmp7_ = 0;
@@ -6523,17 +6531,17 @@ static void import_page_update_toolbar_state (ImportPage* self) {
_tmp1_ = _tmp7_ > 0;
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp6_);
-#line 6526 "ImportPage.c"
+#line 6534 "ImportPage.c"
} else {
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6530 "ImportPage.c"
+#line 6538 "ImportPage.c"
}
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->hide_imported;
#line 952 "/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 6536 "ImportPage.c"
+#line 6544 "ImportPage.c"
}
}
@@ -6553,21 +6561,21 @@ static void import_page_on_view_changed (ImportPage* self) {
_tmp2_ = self->priv->busy;
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp2_) {
-#line 6556 "ImportPage.c"
+#line 6564 "ImportPage.c"
gboolean _tmp3_ = FALSE;
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->refreshed;
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp3_;
-#line 6562 "ImportPage.c"
+#line 6570 "ImportPage.c"
} else {
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6566 "ImportPage.c"
+#line 6574 "ImportPage.c"
}
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6570 "ImportPage.c"
+#line 6578 "ImportPage.c"
ViewCollection* _tmp4_ = NULL;
ViewCollection* _tmp5_ = NULL;
gint _tmp6_ = 0;
@@ -6581,11 +6589,11 @@ static void import_page_on_view_changed (ImportPage* self) {
_tmp0_ = _tmp6_ > 0;
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp5_);
-#line 6584 "ImportPage.c"
+#line 6592 "ImportPage.c"
} else {
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6588 "ImportPage.c"
+#line 6596 "ImportPage.c"
}
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
@@ -6593,21 +6601,21 @@ static void import_page_on_view_changed (ImportPage* self) {
_tmp9_ = self->priv->busy;
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp9_) {
-#line 6596 "ImportPage.c"
+#line 6604 "ImportPage.c"
gboolean _tmp10_ = FALSE;
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = self->priv->refreshed;
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = _tmp10_;
-#line 6602 "ImportPage.c"
+#line 6610 "ImportPage.c"
} else {
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = FALSE;
-#line 6606 "ImportPage.c"
+#line 6614 "ImportPage.c"
}
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp8_) {
-#line 6610 "ImportPage.c"
+#line 6618 "ImportPage.c"
ViewCollection* _tmp11_ = NULL;
ViewCollection* _tmp12_ = NULL;
gint _tmp13_ = 0;
@@ -6621,11 +6629,11 @@ static void import_page_on_view_changed (ImportPage* self) {
_tmp7_ = _tmp13_ > 0;
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp12_);
-#line 6624 "ImportPage.c"
+#line 6632 "ImportPage.c"
} else {
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = FALSE;
-#line 6628 "ImportPage.c"
+#line 6636 "ImportPage.c"
}
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
@@ -6633,7 +6641,7 @@ static void import_page_on_view_changed (ImportPage* self) {
_tmp15_ = self->priv->busy;
#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp15_) {
-#line 6636 "ImportPage.c"
+#line 6644 "ImportPage.c"
ViewCollection* _tmp16_ = NULL;
ViewCollection* _tmp17_ = NULL;
gint _tmp18_ = 0;
@@ -6647,17 +6655,17 @@ static void import_page_on_view_changed (ImportPage* self) {
_tmp14_ = _tmp18_ > 0;
#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp17_);
-#line 6650 "ImportPage.c"
+#line 6658 "ImportPage.c"
} else {
#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = FALSE;
-#line 6654 "ImportPage.c"
+#line 6662 "ImportPage.c"
}
#line 958 "/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"
import_page_update_toolbar_state (self);
-#line 6660 "ImportPage.c"
+#line 6668 "ImportPage.c"
}
@@ -6669,7 +6677,7 @@ static void import_page_on_media_added_removed (ImportPage* self) {
_tmp0_ = self->priv->search_filter;
#line 964 "/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 6672 "ImportPage.c"
+#line 6680 "ImportPage.c"
}
@@ -6707,7 +6715,7 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti
_tmp5_ = value;
#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6710 "ImportPage.c"
+#line 6718 "ImportPage.c"
}
@@ -6730,7 +6738,7 @@ static void import_page_real_switched_to (Page* base) {
_g_object_unref0 (_tmp1_);
#line 979 "/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 6733 "ImportPage.c"
+#line 6741 "ImportPage.c"
}
@@ -6745,7 +6753,7 @@ static void import_page_real_ready (Page* base) {
_tmp0_ = self->priv->hide_imported_filter;
#line 984 "/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 6748 "ImportPage.c"
+#line 6756 "ImportPage.c"
}
@@ -6764,20 +6772,20 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
if (_tmp1_) {
#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
-#line 6767 "ImportPage.c"
+#line 6775 "ImportPage.c"
} else {
gboolean _tmp2_ = FALSE;
#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp2_;
-#line 6774 "ImportPage.c"
+#line 6782 "ImportPage.c"
}
#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 6780 "ImportPage.c"
+#line 6788 "ImportPage.c"
}
#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_page_refresh_camera (self);
@@ -6791,15 +6799,15 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
case IMPORT_PAGE_REFRESH_RESULT_OK:
#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6794 "ImportPage.c"
+#line 6802 "ImportPage.c"
{
#line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 6798 "ImportPage.c"
+#line 6806 "ImportPage.c"
}
#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6802 "ImportPage.c"
+#line 6810 "ImportPage.c"
{
gboolean _tmp5_ = FALSE;
const gchar* _tmp6_ = NULL;
@@ -6816,7 +6824,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 6819 "ImportPage.c"
+#line 6827 "ImportPage.c"
}
#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = self->priv->uri;
@@ -6830,7 +6838,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
uri = _tmp8_;
#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
mount = NULL;
-#line 6833 "ImportPage.c"
+#line 6841 "ImportPage.c"
{
GMount* _tmp9_ = NULL;
GFile* _tmp10_ = NULL;
@@ -6844,7 +6852,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_tmp9_ = _tmp11_;
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6847 "ImportPage.c"
+#line 6855 "ImportPage.c"
goto __catch65_g_error;
}
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6857,7 +6865,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
mount = _tmp12_;
#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
-#line 6860 "ImportPage.c"
+#line 6868 "ImportPage.c"
}
goto __finally65;
__catch65_g_error:
@@ -6869,7 +6877,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_inner_error_ = NULL;
#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 6872 "ImportPage.c"
+#line 6880 "ImportPage.c"
}
__finally65:
#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6884,13 +6892,13 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
g_clear_error (&_inner_error_);
#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 6887 "ImportPage.c"
+#line 6895 "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 6893 "ImportPage.c"
+#line 6901 "ImportPage.c"
gchar* mounted_message = NULL;
const gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
@@ -6955,26 +6963,26 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_tmp27_ = dialog_res;
#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) {
-#line 6957 "ImportPage.c"
+#line 6965 "ImportPage.c"
const gchar* _tmp28_ = NULL;
#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = _ ("Please unmount the camera.");
#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp28_);
-#line 6963 "ImportPage.c"
+#line 6971 "ImportPage.c"
} else {
GMount* _tmp29_ = NULL;
#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = mount;
#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_unmount_camera (self, _tmp29_);
-#line 6970 "ImportPage.c"
+#line 6978 "ImportPage.c"
}
#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dialog);
#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (mounted_message);
-#line 6976 "ImportPage.c"
+#line 6984 "ImportPage.c"
} else {
gchar* locked_message = NULL;
const gchar* _tmp30_ = NULL;
@@ -7033,7 +7041,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_g_object_unref0 (dialog);
#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (locked_message);
-#line 7033 "ImportPage.c"
+#line 7041 "ImportPage.c"
}
#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
@@ -7041,11 +7049,11 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_g_object_unref0 (uri);
#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7041 "ImportPage.c"
+#line 7049 "ImportPage.c"
}
#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7045 "ImportPage.c"
+#line 7053 "ImportPage.c"
{
const gchar* _tmp41_ = NULL;
gchar* _tmp42_ = NULL;
@@ -7070,7 +7078,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_g_free0 (_tmp43_);
#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7070 "ImportPage.c"
+#line 7078 "ImportPage.c"
}
default:
{
@@ -7079,7 +7087,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_tmp46_ = res;
#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp46_);
-#line 7079 "ImportPage.c"
+#line 7087 "ImportPage.c"
}
}
}
@@ -7088,7 +7096,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) {
#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 7088 "ImportPage.c"
+#line 7096 "ImportPage.c"
}
@@ -7097,7 +7105,7 @@ static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* sou
import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_unref (self);
-#line 7097 "ImportPage.c"
+#line 7105 "ImportPage.c"
}
@@ -7127,7 +7135,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
result = FALSE;
#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7127 "ImportPage.c"
+#line 7135 "ImportPage.c"
}
#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, TRUE, FALSE);
@@ -7175,7 +7183,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
result = TRUE;
#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7175 "ImportPage.c"
+#line 7183 "ImportPage.c"
}
@@ -7198,7 +7206,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
_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"
mount = _tmp1_;
-#line 7198 "ImportPage.c"
+#line 7206 "ImportPage.c"
{
GAsyncResult* _tmp2_ = NULL;
#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7207,7 +7215,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7207 "ImportPage.c"
+#line 7215 "ImportPage.c"
goto __catch66_g_error;
}
}
@@ -7248,7 +7256,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
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"
_g_error_free0 (err);
-#line 7248 "ImportPage.c"
+#line 7256 "ImportPage.c"
}
__finally66:
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7261,11 +7269,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
g_clear_error (&_inner_error_);
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 7261 "ImportPage.c"
+#line 7269 "ImportPage.c"
}
#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 7265 "ImportPage.c"
+#line 7273 "ImportPage.c"
}
@@ -7298,7 +7306,7 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
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"
import_page_try_refreshing_camera (self, TRUE);
-#line 7298 "ImportPage.c"
+#line 7306 "ImportPage.c"
}
@@ -7323,7 +7331,7 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (marker);
-#line 7323 "ImportPage.c"
+#line 7331 "ImportPage.c"
}
@@ -7395,7 +7403,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7395 "ImportPage.c"
+#line 7403 "ImportPage.c"
}
#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->camera;
@@ -7423,7 +7431,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7423 "ImportPage.c"
+#line 7431 "ImportPage.c"
}
#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = folders;
@@ -7431,19 +7439,19 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_tmp16_ = gp_list_count (_tmp15_);
#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_len = _tmp16_;
-#line 7431 "ImportPage.c"
+#line 7439 "ImportPage.c"
{
gint list_index = 0;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_index = 0;
-#line 7436 "ImportPage.c"
+#line 7444 "ImportPage.c"
{
gboolean _tmp17_ = FALSE;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = TRUE;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 7443 "ImportPage.c"
+#line 7451 "ImportPage.c"
gint _tmp19_ = 0;
gint _tmp20_ = 0;
gchar* tmp = NULL;
@@ -7455,13 +7463,13 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
const gchar* _tmp26_ = NULL;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp17_) {
-#line 7455 "ImportPage.c"
+#line 7463 "ImportPage.c"
gint _tmp18_ = 0;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = list_index;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_index = _tmp18_ + 1;
-#line 7461 "ImportPage.c"
+#line 7469 "ImportPage.c"
}
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = FALSE;
@@ -7473,7 +7481,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
if (!(_tmp19_ < _tmp20_)) {
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7473 "ImportPage.c"
+#line 7481 "ImportPage.c"
}
#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = folders;
@@ -7503,11 +7511,11 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7503 "ImportPage.c"
+#line 7511 "ImportPage.c"
}
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (tmp);
-#line 7507 "ImportPage.c"
+#line 7515 "ImportPage.c"
}
}
}
@@ -7519,7 +7527,7 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7519 "ImportPage.c"
+#line 7527 "ImportPage.c"
}
@@ -7574,7 +7582,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7574 "ImportPage.c"
+#line 7582 "ImportPage.c"
}
#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _ ("Starting import, please wait…");
@@ -7602,7 +7610,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp7_ = self->priv->refresh_result;
#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp7_ != GP_OK) {
-#line 7602 "ImportPage.c"
+#line 7610 "ImportPage.c"
int _tmp8_ = 0;
gchar* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
@@ -7624,17 +7632,17 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
if (_tmp12_ == GP_ERROR_IO_LOCK) {
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7624 "ImportPage.c"
+#line 7632 "ImportPage.c"
} else {
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7628 "ImportPage.c"
+#line 7636 "ImportPage.c"
}
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp11_;
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7634 "ImportPage.c"
+#line 7642 "ImportPage.c"
}
#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = self->priv->refreshed;
@@ -7665,7 +7673,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp20_ = 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 = _tmp20_;
#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7688,19 +7696,19 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp26_ = self->priv->refresh_result;
#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp26_ == GP_OK) {
-#line 7688 "ImportPage.c"
+#line 7696 "ImportPage.c"
{
gint fsid = 0;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
fsid = 0;
-#line 7693 "ImportPage.c"
+#line 7701 "ImportPage.c"
{
gboolean _tmp27_ = FALSE;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = TRUE;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 7700 "ImportPage.c"
+#line 7708 "ImportPage.c"
gint _tmp29_ = 0;
gint _tmp30_ = 0;
gboolean got_well_known_dir = FALSE;
@@ -7727,13 +7735,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
gboolean _tmp71_ = FALSE;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp27_) {
-#line 7727 "ImportPage.c"
+#line 7735 "ImportPage.c"
gint _tmp28_ = 0;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = fsid;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
fsid = _tmp28_ + 1;
-#line 7733 "ImportPage.c"
+#line 7741 "ImportPage.c"
}
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = FALSE;
@@ -7745,7 +7753,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
if (!(_tmp29_ < _tmp30_)) {
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7745 "ImportPage.c"
+#line 7753 "ImportPage.c"
}
#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = FALSE;
@@ -7755,7 +7763,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM");
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp32_) {
-#line 7755 "ImportPage.c"
+#line 7763 "ImportPage.c"
gint _tmp33_ = 0;
GeeArrayList* _tmp34_ = NULL;
#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7766,7 +7774,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7766 "ImportPage.c"
+#line 7774 "ImportPage.c"
}
#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = fsid;
@@ -7774,7 +7782,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim");
#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp36_) {
-#line 7774 "ImportPage.c"
+#line 7782 "ImportPage.c"
gint _tmp37_ = 0;
GeeArrayList* _tmp38_ = NULL;
#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7785,7 +7793,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_);
#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7785 "ImportPage.c"
+#line 7793 "ImportPage.c"
}
#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = fsid;
@@ -7793,7 +7801,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD");
#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp40_) {
-#line 7793 "ImportPage.c"
+#line 7801 "ImportPage.c"
gint _tmp41_ = 0;
GeeArrayList* _tmp42_ = NULL;
#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7804,7 +7812,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_);
#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7804 "ImportPage.c"
+#line 7812 "ImportPage.c"
}
#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = fsid;
@@ -7812,7 +7820,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd");
#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp44_) {
-#line 7812 "ImportPage.c"
+#line 7820 "ImportPage.c"
gint _tmp45_ = 0;
GeeArrayList* _tmp46_ = NULL;
#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7823,7 +7831,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_);
#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7823 "ImportPage.c"
+#line 7831 "ImportPage.c"
}
#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp47_ = fsid;
@@ -7831,7 +7839,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD");
#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp48_) {
-#line 7831 "ImportPage.c"
+#line 7839 "ImportPage.c"
gint _tmp49_ = 0;
GeeArrayList* _tmp50_ = NULL;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7842,7 +7850,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_);
#line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7842 "ImportPage.c"
+#line 7850 "ImportPage.c"
}
#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp51_ = fsid;
@@ -7850,7 +7858,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd");
#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp52_) {
-#line 7850 "ImportPage.c"
+#line 7858 "ImportPage.c"
gint _tmp53_ = 0;
GeeArrayList* _tmp54_ = NULL;
#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7861,7 +7869,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_);
#line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7861 "ImportPage.c"
+#line 7869 "ImportPage.c"
}
#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = fsid;
@@ -7869,7 +7877,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY");
#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp56_) {
-#line 7869 "ImportPage.c"
+#line 7877 "ImportPage.c"
gint _tmp57_ = 0;
GeeArrayList* _tmp58_ = NULL;
#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7880,7 +7888,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_);
#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7880 "ImportPage.c"
+#line 7888 "ImportPage.c"
}
#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = fsid;
@@ -7888,7 +7896,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony");
#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp60_) {
-#line 7888 "ImportPage.c"
+#line 7896 "ImportPage.c"
gint _tmp61_ = 0;
GeeArrayList* _tmp62_ = NULL;
#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7899,7 +7907,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_);
#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7899 "ImportPage.c"
+#line 7907 "ImportPage.c"
}
#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp63_ = fsid;
@@ -7907,7 +7915,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT");
#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp64_) {
-#line 7907 "ImportPage.c"
+#line 7915 "ImportPage.c"
gint _tmp65_ = 0;
GeeArrayList* _tmp66_ = NULL;
#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7918,7 +7926,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_);
#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7918 "ImportPage.c"
+#line 7926 "ImportPage.c"
}
#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp67_ = fsid;
@@ -7926,7 +7934,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root");
#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp68_) {
-#line 7926 "ImportPage.c"
+#line 7934 "ImportPage.c"
gint _tmp69_ = 0;
GeeArrayList* _tmp70_ = NULL;
#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7937,13 +7945,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_);
#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7937 "ImportPage.c"
+#line 7945 "ImportPage.c"
}
#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp71_ = got_well_known_dir;
#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp71_) {
-#line 7943 "ImportPage.c"
+#line 7951 "ImportPage.c"
gint _tmp72_ = 0;
GeeArrayList* _tmp73_ = NULL;
gboolean _tmp74_ = FALSE;
@@ -7957,7 +7965,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
if (!_tmp74_) {
#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7957 "ImportPage.c"
+#line 7965 "ImportPage.c"
}
}
}
@@ -8004,7 +8012,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp85_ = res;
#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp85_ != GP_OK) {
-#line 8004 "ImportPage.c"
+#line 8012 "ImportPage.c"
int _tmp86_ = 0;
gchar* _tmp87_ = NULL;
gchar* _tmp88_ = NULL;
@@ -8018,13 +8026,13 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp88_);
#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp88_);
-#line 8018 "ImportPage.c"
+#line 8026 "ImportPage.c"
}
#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp89_ = self->priv->refresh_result;
#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp89_ == GP_OK) {
-#line 8024 "ImportPage.c"
+#line 8032 "ImportPage.c"
SourceCollection* _tmp90_ = NULL;
gint _tmp91_ = 0;
#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8033,7 +8041,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection));
#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp91_ == 0) {
-#line 8033 "ImportPage.c"
+#line 8041 "ImportPage.c"
gchar* _tmp92_ = NULL;
gchar* _tmp93_ = NULL;
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8044,17 +8052,17 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp93_);
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp93_);
-#line 8044 "ImportPage.c"
+#line 8052 "ImportPage.c"
}
#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, TRUE);
-#line 8048 "ImportPage.c"
+#line 8056 "ImportPage.c"
} else {
#line 1287 "/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"
import_page_clear_all_import_sources (self);
-#line 8054 "ImportPage.c"
+#line 8062 "ImportPage.c"
}
#line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
@@ -8064,7 +8072,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
switch (_tmp94_) {
#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_OK:
-#line 8064 "ImportPage.c"
+#line 8072 "ImportPage.c"
{
#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_OK;
@@ -8072,11 +8080,11 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_g_object_unref0 (import_list);
#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8072 "ImportPage.c"
+#line 8080 "ImportPage.c"
}
#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_ERROR_IO_LOCK:
-#line 8076 "ImportPage.c"
+#line 8084 "ImportPage.c"
{
#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
@@ -8084,7 +8092,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_g_object_unref0 (import_list);
#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8084 "ImportPage.c"
+#line 8092 "ImportPage.c"
}
default:
{
@@ -8094,12 +8102,12 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_g_object_unref0 (import_list);
#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8094 "ImportPage.c"
+#line 8102 "ImportPage.c"
}
}
#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_list);
-#line 8099 "ImportPage.c"
+#line 8107 "ImportPage.c"
}
@@ -8117,7 +8125,7 @@ static gchar string_get (const gchar* self, glong index) {
result = _tmp1_;
#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8117 "ImportPage.c"
+#line 8125 "ImportPage.c"
}
@@ -8150,7 +8158,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp2_ = start;
#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
-#line 8150 "ImportPage.c"
+#line 8158 "ImportPage.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8159,13 +8167,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp4_ = start;
#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
-#line 8159 "ImportPage.c"
+#line 8167 "ImportPage.c"
}
#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
-#line 8165 "ImportPage.c"
+#line 8173 "ImportPage.c"
glong _tmp6_ = 0L;
glong _tmp7_ = 0L;
#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8174,13 +8182,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp7_ = end;
#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
-#line 8174 "ImportPage.c"
+#line 8182 "ImportPage.c"
}
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = start;
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
-#line 8180 "ImportPage.c"
+#line 8188 "ImportPage.c"
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8189,11 +8197,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp11_ = string_length;
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8189 "ImportPage.c"
+#line 8197 "ImportPage.c"
} else {
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
-#line 8193 "ImportPage.c"
+#line 8201 "ImportPage.c"
}
#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
@@ -8201,7 +8209,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp13_ = end;
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
-#line 8201 "ImportPage.c"
+#line 8209 "ImportPage.c"
glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8210,11 +8218,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
_tmp15_ = string_length;
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8210 "ImportPage.c"
+#line 8218 "ImportPage.c"
} else {
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 8214 "ImportPage.c"
+#line 8222 "ImportPage.c"
}
#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
@@ -8236,7 +8244,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
result = _tmp21_;
#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8236 "ImportPage.c"
+#line 8244 "ImportPage.c"
}
@@ -8259,7 +8267,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
offset = (glong) _tmp2_;
#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 8259 "ImportPage.c"
+#line 8267 "ImportPage.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
const gchar* _tmp5_ = NULL;
@@ -8276,7 +8284,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
if (!(_tmp4_ >= ((glong) 0))) {
#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 8276 "ImportPage.c"
+#line 8284 "ImportPage.c"
}
#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = str;
@@ -8288,7 +8296,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
_tmp8_ = ch;
#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp7_ != _tmp8_) {
-#line 8288 "ImportPage.c"
+#line 8296 "ImportPage.c"
const gchar* _tmp9_ = NULL;
glong _tmp10_ = 0L;
gchar* _tmp11_ = NULL;
@@ -8302,7 +8310,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
result = _tmp11_;
#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8302 "ImportPage.c"
+#line 8310 "ImportPage.c"
}
}
#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8311,7 +8319,7 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
result = _tmp12_;
#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8311 "ImportPage.c"
+#line 8319 "ImportPage.c"
}
@@ -8330,7 +8338,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
_tmp2_ = g_str_has_suffix (_tmp1_, "/");
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp2_) {
-#line 8330 "ImportPage.c"
+#line 8338 "ImportPage.c"
const gchar* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8339,15 +8347,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
_tmp4_ = g_str_has_prefix (_tmp3_, "/");
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = !_tmp4_;
-#line 8339 "ImportPage.c"
+#line 8347 "ImportPage.c"
} else {
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 8343 "ImportPage.c"
+#line 8351 "ImportPage.c"
}
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 8347 "ImportPage.c"
+#line 8355 "ImportPage.c"
const gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -8372,7 +8380,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
result = _tmp10_;
#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8372 "ImportPage.c"
+#line 8380 "ImportPage.c"
} else {
gboolean _tmp11_ = FALSE;
const gchar* _tmp12_ = NULL;
@@ -8383,7 +8391,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
_tmp13_ = g_str_has_suffix (_tmp12_, "/");
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp13_) {
-#line 8383 "ImportPage.c"
+#line 8391 "ImportPage.c"
const gchar* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8392,15 +8400,15 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
_tmp15_ = g_str_has_prefix (_tmp14_, "/");
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp15_;
-#line 8392 "ImportPage.c"
+#line 8400 "ImportPage.c"
} else {
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = FALSE;
-#line 8396 "ImportPage.c"
+#line 8404 "ImportPage.c"
}
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_) {
-#line 8400 "ImportPage.c"
+#line 8408 "ImportPage.c"
const gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
@@ -8425,7 +8433,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
result = _tmp21_;
#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8425 "ImportPage.c"
+#line 8433 "ImportPage.c"
} else {
const gchar* _tmp22_ = NULL;
const gchar* _tmp23_ = NULL;
@@ -8440,7 +8448,7 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
result = _tmp24_;
#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8440 "ImportPage.c"
+#line 8448 "ImportPage.c"
}
}
}
@@ -8492,7 +8500,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
result = NULL;
#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8492 "ImportPage.c"
+#line 8500 "ImportPage.c"
}
#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = fsid;
@@ -8504,7 +8512,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
result = NULL;
#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8504 "ImportPage.c"
+#line 8512 "ImportPage.c"
}
#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = sifs;
@@ -8518,7 +8526,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
_tmp12_ = (*_tmp11_).fields;
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8518 "ImportPage.c"
+#line 8526 "ImportPage.c"
CameraStorageInformation* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8527,11 +8535,11 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
_tmp14_ = (*_tmp13_).basedir;
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _tmp14_;
-#line 8527 "ImportPage.c"
+#line 8535 "ImportPage.c"
} else {
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = "/";
-#line 8531 "ImportPage.c"
+#line 8539 "ImportPage.c"
}
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = g_strdup (_tmp10_);
@@ -8539,7 +8547,7 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
result = _tmp15_;
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8539 "ImportPage.c"
+#line 8547 "ImportPage.c"
}
@@ -8574,7 +8582,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
result = NULL;
#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8574 "ImportPage.c"
+#line 8582 "ImportPage.c"
}
#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = camera;
@@ -8588,7 +8596,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
_tmp6_ = basedir;
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp6_ == NULL) {
-#line 8588 "ImportPage.c"
+#line 8596 "ImportPage.c"
const gchar* _tmp7_ = NULL;
gint _tmp8_ = 0;
const gchar* _tmp9_ = NULL;
@@ -8609,7 +8617,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
_g_free0 (basedir);
#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8609 "ImportPage.c"
+#line 8617 "ImportPage.c"
}
#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = basedir;
@@ -8623,7 +8631,7 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
_g_free0 (basedir);
#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8623 "ImportPage.c"
+#line 8631 "ImportPage.c"
}
@@ -8648,16 +8656,16 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
int _tmp18_ = 0;
int _tmp19_ = 0;
CameraList* folders = NULL;
- CameraList* _tmp109_ = NULL;
- int _tmp110_ = 0;
+ CameraList* _tmp110_ = NULL;
int _tmp111_ = 0;
- Camera* _tmp115_ = NULL;
- const gchar* _tmp116_ = NULL;
- CameraList* _tmp117_ = NULL;
- GPSpinIdleWrapper* _tmp118_ = NULL;
- GPContext* _tmp119_ = NULL;
- int _tmp120_ = 0;
+ int _tmp112_ = 0;
+ Camera* _tmp116_ = NULL;
+ const gchar* _tmp117_ = NULL;
+ CameraList* _tmp118_ = NULL;
+ GPSpinIdleWrapper* _tmp119_ = NULL;
+ GPContext* _tmp120_ = NULL;
int _tmp121_ = 0;
+ int _tmp122_ = 0;
GError * _inner_error_ = NULL;
#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
@@ -8681,7 +8689,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp5_ = fulldir;
#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_ == NULL) {
-#line 8681 "ImportPage.c"
+#line 8689 "ImportPage.c"
const gchar* _tmp6_ = NULL;
#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = dir;
@@ -8693,7 +8701,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8693 "ImportPage.c"
+#line 8701 "ImportPage.c"
}
#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = gp_list_new (&_tmp7_);
@@ -8707,7 +8715,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp9_ = self->priv->refresh_result;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp9_ != GP_OK) {
-#line 8707 "ImportPage.c"
+#line 8715 "ImportPage.c"
int _tmp10_ = 0;
gchar* _tmp11_ = NULL;
gchar* _tmp12_ = NULL;
@@ -8729,7 +8737,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8729 "ImportPage.c"
+#line 8737 "ImportPage.c"
}
#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = self->priv->camera;
@@ -8749,7 +8757,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp19_ = self->priv->refresh_result;
#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp19_ != GP_OK) {
-#line 8749 "ImportPage.c"
+#line 8757 "ImportPage.c"
const gchar* _tmp20_ = NULL;
int _tmp21_ = 0;
gchar* _tmp22_ = NULL;
@@ -8776,20 +8784,20 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8776 "ImportPage.c"
+#line 8784 "ImportPage.c"
}
{
gint ctr = 0;
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 8782 "ImportPage.c"
+#line 8790 "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"
while (TRUE) {
-#line 8789 "ImportPage.c"
+#line 8797 "ImportPage.c"
gint _tmp26_ = 0;
CameraList* _tmp27_ = NULL;
gint _tmp28_ = 0;
@@ -8802,13 +8810,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
int _tmp34_ = 0;
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp24_) {
-#line 8802 "ImportPage.c"
+#line 8810 "ImportPage.c"
gint _tmp25_ = 0;
#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 8808 "ImportPage.c"
+#line 8816 "ImportPage.c"
}
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = FALSE;
@@ -8822,7 +8830,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
if (!(_tmp26_ < _tmp28_)) {
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 8822 "ImportPage.c"
+#line 8830 "ImportPage.c"
}
#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = files;
@@ -8842,7 +8850,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp34_ = self->priv->refresh_result;
#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp34_ != GP_OK) {
-#line 8842 "ImportPage.c"
+#line 8850 "ImportPage.c"
gint _tmp35_ = 0;
const gchar* _tmp36_ = NULL;
int _tmp37_ = 0;
@@ -8872,7 +8880,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8872 "ImportPage.c"
+#line 8880 "ImportPage.c"
}
{
CameraFileInfo info = {0};
@@ -8912,12 +8920,12 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 8912 "ImportPage.c"
+#line 8920 "ImportPage.c"
goto __catch67_g_error;
}
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp40_) {
-#line 8917 "ImportPage.c"
+#line 8925 "ImportPage.c"
const gchar* _tmp48_ = NULL;
const gchar* _tmp49_ = NULL;
#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8932,7 +8940,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (filename);
#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 8932 "ImportPage.c"
+#line 8940 "ImportPage.c"
}
#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = info;
@@ -8942,7 +8950,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp52_ = _tmp51_.fields;
#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) {
-#line 8942 "ImportPage.c"
+#line 8950 "ImportPage.c"
const gchar* _tmp53_ = NULL;
const gchar* _tmp54_ = NULL;
CameraFileInfo _tmp55_ = {0};
@@ -8966,7 +8974,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (filename);
#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 8966 "ImportPage.c"
+#line 8974 "ImportPage.c"
}
#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp58_ = filename;
@@ -8974,7 +8982,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp59_ = video_reader_is_supported_video_filename (_tmp58_);
#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp59_) {
-#line 8974 "ImportPage.c"
+#line 8982 "ImportPage.c"
VideoImportSource* video_source = NULL;
const gchar* _tmp60_ = NULL;
Camera* _tmp61_ = NULL;
@@ -9024,7 +9032,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
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"
_g_object_unref0 (video_source);
-#line 9024 "ImportPage.c"
+#line 9032 "ImportPage.c"
} else {
PhotoFileFormat file_format = 0;
CameraFileInfo _tmp74_ = {0};
@@ -9061,7 +9069,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp78_ = file_format;
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9061 "ImportPage.c"
+#line 9069 "ImportPage.c"
const gchar* _tmp79_ = NULL;
PhotoFileFormat _tmp80_ = 0;
PhotoFileFormat _tmp81_ = 0;
@@ -9075,7 +9083,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp81_ = file_format;
#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9075 "ImportPage.c"
+#line 9083 "ImportPage.c"
const gchar* _tmp82_ = NULL;
const gchar* _tmp83_ = NULL;
CameraFileInfo _tmp84_ = {0};
@@ -9100,7 +9108,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (filename);
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 9099 "ImportPage.c"
+#line 9107 "ImportPage.c"
}
}
#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9137,7 +9145,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
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 9136 "ImportPage.c"
+#line 9144 "ImportPage.c"
}
#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp102_ = self->priv->progress_bar;
@@ -9147,7 +9155,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
spin_event_loop ();
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 9146 "ImportPage.c"
+#line 9154 "ImportPage.c"
}
goto __finally67;
__catch67_g_error:
@@ -9193,11 +9201,13 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9192 "ImportPage.c"
+#line 9200 "ImportPage.c"
}
__finally67:
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 9205 "ImportPage.c"
+ gboolean _tmp109_ = FALSE;
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9209,41 +9219,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return FALSE;
-#line 9209 "ImportPage.c"
+ return _tmp109_;
+#line 9219 "ImportPage.c"
}
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 9213 "ImportPage.c"
+#line 9223 "ImportPage.c"
}
}
}
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp110_ = gp_list_new (&_tmp109_);
+ _tmp111_ = gp_list_new (&_tmp110_);
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- folders = _tmp109_;
+ folders = _tmp110_;
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp110_;
+ self->priv->refresh_result = _tmp111_;
#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp111_ = self->priv->refresh_result;
+ _tmp112_ = self->priv->refresh_result;
#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp111_ != GP_OK) {
-#line 9229 "ImportPage.c"
- int _tmp112_ = 0;
- gchar* _tmp113_ = NULL;
+ if (_tmp112_ != GP_OK) {
+#line 9239 "ImportPage.c"
+ int _tmp113_ = 0;
gchar* _tmp114_ = NULL;
+ gchar* _tmp115_ = NULL;
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp112_ = self->priv->refresh_result;
+ _tmp113_ = self->priv->refresh_result;
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp113_ = gp_result_to_full_string (_tmp112_);
+ _tmp114_ = gp_result_to_full_string (_tmp113_);
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp114_ = _tmp113_;
+ _tmp115_ = _tmp114_;
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp114_);
+ g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp115_);
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp114_);
+ _g_free0 (_tmp115_);
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9254,43 +9264,43 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9253 "ImportPage.c"
+#line 9263 "ImportPage.c"
}
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp115_ = self->priv->camera;
+ _tmp116_ = self->priv->camera;
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp116_ = fulldir;
+ _tmp117_ = fulldir;
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp117_ = folders;
+ _tmp118_ = folders;
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp118_ = import_page_spin_idle_context;
+ _tmp119_ = import_page_spin_idle_context;
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp119_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp120_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp120_ = gp_camera_folder_list_folders (_tmp115_, _tmp116_, _tmp117_, _tmp119_);
+ _tmp121_ = gp_camera_folder_list_folders (_tmp116_, _tmp117_, _tmp118_, _tmp120_);
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp120_;
+ self->priv->refresh_result = _tmp121_;
#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp121_ = self->priv->refresh_result;
+ _tmp122_ = self->priv->refresh_result;
#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp121_ != GP_OK) {
-#line 9273 "ImportPage.c"
- const gchar* _tmp122_ = NULL;
- int _tmp123_ = 0;
- gchar* _tmp124_ = NULL;
+ if (_tmp122_ != GP_OK) {
+#line 9283 "ImportPage.c"
+ const gchar* _tmp123_ = NULL;
+ int _tmp124_ = 0;
gchar* _tmp125_ = NULL;
+ gchar* _tmp126_ = NULL;
#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp122_ = fulldir;
+ _tmp123_ = fulldir;
#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp123_ = self->priv->refresh_result;
+ _tmp124_ = self->priv->refresh_result;
#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp124_ = gp_result_to_full_string (_tmp123_);
+ _tmp125_ = gp_result_to_full_string (_tmp124_);
#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp125_ = _tmp124_;
+ _tmp126_ = _tmp125_;
#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1451: Unable to list folders in %s: %s", _tmp122_, _tmp125_);
+ 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 (_tmp125_);
+ _g_free0 (_tmp126_);
#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = GP_OK;
#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9303,97 +9313,97 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9302 "ImportPage.c"
+#line 9312 "ImportPage.c"
}
{
gint ctr = 0;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 9308 "ImportPage.c"
+#line 9318 "ImportPage.c"
{
- gboolean _tmp126_ = FALSE;
+ gboolean _tmp127_ = FALSE;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp126_ = TRUE;
+ _tmp127_ = TRUE;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9315 "ImportPage.c"
- gint _tmp128_ = 0;
- CameraList* _tmp129_ = NULL;
- gint _tmp130_ = 0;
+#line 9325 "ImportPage.c"
+ gint _tmp129_ = 0;
+ CameraList* _tmp130_ = NULL;
+ gint _tmp131_ = 0;
gchar* subdir = NULL;
- CameraList* _tmp131_ = NULL;
- gint _tmp132_ = 0;
- const gchar* _tmp133_ = NULL;
- int _tmp134_ = 0;
- gchar* _tmp135_ = NULL;
- int _tmp136_ = 0;
- gint _tmp141_ = 0;
- const gchar* _tmp142_ = NULL;
+ CameraList* _tmp132_ = NULL;
+ gint _tmp133_ = 0;
+ const gchar* _tmp134_ = NULL;
+ int _tmp135_ = 0;
+ gchar* _tmp136_ = NULL;
+ int _tmp137_ = 0;
+ gint _tmp142_ = 0;
const gchar* _tmp143_ = NULL;
- gchar* _tmp144_ = NULL;
+ const gchar* _tmp144_ = NULL;
gchar* _tmp145_ = NULL;
- GeeArrayList* _tmp146_ = NULL;
- gboolean _tmp147_ = FALSE;
+ gchar* _tmp146_ = NULL;
+ GeeArrayList* _tmp147_ = NULL;
gboolean _tmp148_ = FALSE;
+ gboolean _tmp149_ = FALSE;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp126_) {
-#line 9336 "ImportPage.c"
- gint _tmp127_ = 0;
+ if (!_tmp127_) {
+#line 9346 "ImportPage.c"
+ gint _tmp128_ = 0;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp127_ = ctr;
+ _tmp128_ = ctr;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ctr = _tmp127_ + 1;
-#line 9342 "ImportPage.c"
+ ctr = _tmp128_ + 1;
+#line 9352 "ImportPage.c"
}
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp126_ = FALSE;
+ _tmp127_ = FALSE;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp128_ = ctr;
+ _tmp129_ = ctr;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp129_ = folders;
+ _tmp130_ = folders;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp130_ = gp_list_count (_tmp129_);
+ _tmp131_ = gp_list_count (_tmp130_);
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp128_ < _tmp130_)) {
+ if (!(_tmp129_ < _tmp131_)) {
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9356 "ImportPage.c"
+#line 9366 "ImportPage.c"
}
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp131_ = folders;
+ _tmp132_ = folders;
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp132_ = ctr;
+ _tmp133_ = ctr;
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp134_ = gp_list_get_name (_tmp131_, _tmp132_, &_tmp133_);
+ _tmp135_ = gp_list_get_name (_tmp132_, _tmp133_, &_tmp134_);
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp135_ = g_strdup (_tmp133_);
+ _tmp136_ = g_strdup (_tmp134_);
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- subdir = _tmp135_;
+ subdir = _tmp136_;
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp134_;
+ self->priv->refresh_result = _tmp135_;
#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp136_ = self->priv->refresh_result;
+ _tmp137_ = self->priv->refresh_result;
#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp136_ != GP_OK) {
-#line 9376 "ImportPage.c"
- gint _tmp137_ = 0;
- int _tmp138_ = 0;
- gchar* _tmp139_ = NULL;
+ if (_tmp137_ != GP_OK) {
+#line 9386 "ImportPage.c"
+ gint _tmp138_ = 0;
+ int _tmp139_ = 0;
gchar* _tmp140_ = NULL;
+ gchar* _tmp141_ = NULL;
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp137_ = ctr;
+ _tmp138_ = ctr;
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp138_ = self->priv->refresh_result;
+ _tmp139_ = self->priv->refresh_result;
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp139_ = gp_result_to_full_string (_tmp138_);
+ _tmp140_ = gp_result_to_full_string (_tmp139_);
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp140_ = _tmp139_;
+ _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", _tmp137_, _tmp140_);
+ 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 (_tmp140_);
+ _g_free0 (_tmp141_);
#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9406,28 +9416,28 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9405 "ImportPage.c"
+#line 9415 "ImportPage.c"
}
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp141_ = fsid;
+ _tmp142_ = fsid;
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp142_ = dir;
+ _tmp143_ = dir;
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp143_ = subdir;
+ _tmp144_ = subdir;
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp144_ = import_page_append_path (_tmp142_, _tmp143_);
+ _tmp145_ = import_page_append_path (_tmp143_, _tmp144_);
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp145_ = _tmp144_;
+ _tmp146_ = _tmp145_;
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp146_ = import_list;
+ _tmp147_ = import_list;
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp147_ = import_page_enumerate_files (self, _tmp141_, _tmp145_, _tmp146_);
+ _tmp148_ = import_page_enumerate_files (self, _tmp142_, _tmp146_, _tmp147_);
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp148_ = !_tmp147_;
+ _tmp149_ = !_tmp148_;
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp145_);
+ _g_free0 (_tmp146_);
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp148_) {
+ if (_tmp149_) {
#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9440,11 +9450,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9439 "ImportPage.c"
+#line 9449 "ImportPage.c"
}
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
-#line 9443 "ImportPage.c"
+#line 9453 "ImportPage.c"
}
}
}
@@ -9458,7 +9468,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9457 "ImportPage.c"
+#line 9467 "ImportPage.c"
}
@@ -9467,19 +9477,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9466 "ImportPage.c"
+#line 9476 "ImportPage.c"
{
gint i = 0;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
i = 0;
-#line 9471 "ImportPage.c"
+#line 9481 "ImportPage.c"
{
gboolean _tmp0_ = FALSE;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9478 "ImportPage.c"
+#line 9488 "ImportPage.c"
gint _tmp2_ = 0;
GeeArrayList* _tmp3_ = NULL;
gint _tmp4_ = 0;
@@ -9505,13 +9515,13 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
PhotoImportSource* _tmp31_ = NULL;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp0_) {
-#line 9504 "ImportPage.c"
+#line 9514 "ImportPage.c"
gint _tmp1_ = 0;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = i;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
i = _tmp1_ + 1;
-#line 9510 "ImportPage.c"
+#line 9520 "ImportPage.c"
}
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
@@ -9520,14 +9530,14 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_list;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ _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"
_tmp5_ = _tmp4_;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!(_tmp2_ < _tmp5_)) {
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9526 "ImportPage.c"
+#line 9536 "ImportPage.c"
}
#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = import_list;
@@ -9543,7 +9553,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
if (_tmp10_ == NULL) {
#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
-#line 9542 "ImportPage.c"
+#line 9552 "ImportPage.c"
}
#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
current = _tmp10_;
@@ -9552,12 +9562,12 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = import_list;
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+ _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"
_tmp15_ = _tmp14_;
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((_tmp12_ + 1) < _tmp15_) {
-#line 9556 "ImportPage.c"
+#line 9566 "ImportPage.c"
GeeArrayList* _tmp16_ = NULL;
gint _tmp17_ = 0;
gpointer _tmp18_ = NULL;
@@ -9577,19 +9587,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
if (_tmp20_ == NULL) {
#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp19_);
-#line 9576 "ImportPage.c"
+#line 9586 "ImportPage.c"
}
#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp11_);
#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp20_;
-#line 9582 "ImportPage.c"
+#line 9592 "ImportPage.c"
} else {
#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp11_);
#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = NULL;
-#line 9588 "ImportPage.c"
+#line 9598 "ImportPage.c"
}
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = _g_object_ref0 (_tmp11_);
@@ -9599,7 +9609,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp23_ = i;
#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp23_ > 0) {
-#line 9598 "ImportPage.c"
+#line 9608 "ImportPage.c"
GeeArrayList* _tmp24_ = NULL;
gint _tmp25_ = 0;
gpointer _tmp26_ = NULL;
@@ -9619,19 +9629,19 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
if (_tmp28_ == NULL) {
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp27_);
-#line 9618 "ImportPage.c"
+#line 9628 "ImportPage.c"
}
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp22_);
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = _tmp28_;
-#line 9624 "ImportPage.c"
+#line 9634 "ImportPage.c"
} else {
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp22_);
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = NULL;
-#line 9630 "ImportPage.c"
+#line 9640 "ImportPage.c"
}
#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -9641,7 +9651,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp31_ = current;
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp31_ != NULL) {
-#line 9640 "ImportPage.c"
+#line 9650 "ImportPage.c"
PhotoImportSource* _tmp32_ = NULL;
PhotoFileFormat _tmp33_ = 0;
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9650,15 +9660,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp33_ = photo_import_source_get_file_format (_tmp32_);
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9649 "ImportPage.c"
+#line 9659 "ImportPage.c"
} else {
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = FALSE;
-#line 9653 "ImportPage.c"
+#line 9663 "ImportPage.c"
}
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp30_) {
-#line 9657 "ImportPage.c"
+#line 9667 "ImportPage.c"
gchar* current_name = NULL;
gchar* ext = NULL;
PhotoImportSource* _tmp34_ = NULL;
@@ -9696,7 +9706,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp40_ = next;
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp40_ != NULL) {
-#line 9695 "ImportPage.c"
+#line 9705 "ImportPage.c"
PhotoImportSource* _tmp41_ = NULL;
PhotoFileFormat _tmp42_ = 0;
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9705,15 +9715,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp42_ = photo_import_source_get_file_format (_tmp41_);
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9704 "ImportPage.c"
+#line 9714 "ImportPage.c"
} else {
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = FALSE;
-#line 9708 "ImportPage.c"
+#line 9718 "ImportPage.c"
}
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp39_) {
-#line 9712 "ImportPage.c"
+#line 9722 "ImportPage.c"
gchar* next_name = NULL;
PhotoImportSource* _tmp43_ = NULL;
gchar* _tmp44_ = NULL;
@@ -9746,7 +9756,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp49_ = current_name;
#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 9745 "ImportPage.c"
+#line 9755 "ImportPage.c"
PhotoImportSource* _tmp50_ = NULL;
PhotoImportSource* _tmp51_ = NULL;
#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9757,17 +9767,17 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_g_object_unref0 (associated);
#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = _tmp51_;
-#line 9756 "ImportPage.c"
+#line 9766 "ImportPage.c"
}
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (next_name);
-#line 9760 "ImportPage.c"
+#line 9770 "ImportPage.c"
}
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = prev;
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp53_ != NULL) {
-#line 9766 "ImportPage.c"
+#line 9776 "ImportPage.c"
PhotoImportSource* _tmp54_ = NULL;
PhotoFileFormat _tmp55_ = 0;
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9776,15 +9786,15 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp55_ = photo_import_source_get_file_format (_tmp54_);
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9775 "ImportPage.c"
+#line 9785 "ImportPage.c"
} else {
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = FALSE;
-#line 9779 "ImportPage.c"
+#line 9789 "ImportPage.c"
}
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp52_) {
-#line 9783 "ImportPage.c"
+#line 9793 "ImportPage.c"
gchar* prev_name = NULL;
PhotoImportSource* _tmp56_ = NULL;
gchar* _tmp57_ = NULL;
@@ -9817,7 +9827,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp62_ = current_name;
#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 9816 "ImportPage.c"
+#line 9826 "ImportPage.c"
PhotoImportSource* _tmp63_ = NULL;
PhotoImportSource* _tmp64_ = NULL;
#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9828,17 +9838,17 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_g_object_unref0 (associated);
#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = _tmp64_;
-#line 9827 "ImportPage.c"
+#line 9837 "ImportPage.c"
}
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (prev_name);
-#line 9831 "ImportPage.c"
+#line 9841 "ImportPage.c"
}
#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp65_ = associated;
#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp65_ != NULL) {
-#line 9837 "ImportPage.c"
+#line 9847 "ImportPage.c"
PhotoImportSource* _tmp66_ = NULL;
gchar* _tmp67_ = NULL;
gchar* _tmp68_ = NULL;
@@ -9882,7 +9892,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_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"
if (!_tmp76_) {
-#line 9881 "ImportPage.c"
+#line 9891 "ImportPage.c"
PhotoImportSource* _tmp77_ = NULL;
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_debug ("ImportPage.vala:1508: Unable to associate files");
@@ -9890,7 +9900,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp77_ = current;
#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source_set_associated (_tmp77_, NULL);
-#line 9889 "ImportPage.c"
+#line 9899 "ImportPage.c"
}
}
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9899,7 +9909,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_g_free0 (ext);
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (current_name);
-#line 9898 "ImportPage.c"
+#line 9908 "ImportPage.c"
}
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (prev);
@@ -9911,7 +9921,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_g_object_unref0 (_tmp11_);
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (current);
-#line 9910 "ImportPage.c"
+#line 9920 "ImportPage.c"
}
}
}
@@ -9927,7 +9937,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_return_if_fail (GEE_IS_LIST (import_list));
#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
loaded_photos = 0;
-#line 9926 "ImportPage.c"
+#line 9936 "ImportPage.c"
{
GeeList* _import_source_list = NULL;
GeeList* _tmp0_ = NULL;
@@ -9955,7 +9965,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_import_source_index = -1;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9954 "ImportPage.c"
+#line 9964 "ImportPage.c"
gint _tmp5_ = 0;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -10018,7 +10028,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
if (!(_tmp6_ < _tmp7_)) {
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 10017 "ImportPage.c"
+#line 10027 "ImportPage.c"
}
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = _import_source_list;
@@ -10044,7 +10054,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp15_ = fulldir;
#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp15_ == NULL) {
-#line 10043 "ImportPage.c"
+#line 10053 "ImportPage.c"
ImportSource* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
@@ -10067,7 +10077,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_object_unref0 (import_source);
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 10065 "ImportPage.c"
+#line 10075 "ImportPage.c"
}
#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = NULL;
@@ -10075,7 +10085,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp20_ = import_source;
#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10073 "ImportPage.c"
+#line 10083 "ImportPage.c"
ImportSource* _tmp21_ = NULL;
PhotoImportSource* _tmp22_ = NULL;
PhotoImportSource* _tmp23_ = NULL;
@@ -10089,15 +10099,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp19_ = _tmp23_ != NULL;
#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp23_);
-#line 10087 "ImportPage.c"
+#line 10097 "ImportPage.c"
} else {
#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = FALSE;
-#line 10091 "ImportPage.c"
+#line 10101 "ImportPage.c"
}
#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp19_) {
-#line 10095 "ImportPage.c"
+#line 10105 "ImportPage.c"
ImportSource* _tmp24_ = NULL;
PhotoImportSource* _tmp25_ = NULL;
#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10108,7 +10118,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_object_unref0 (associated);
#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = _tmp25_;
-#line 10106 "ImportPage.c"
+#line 10116 "ImportPage.c"
}
#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->progress_bar;
@@ -10142,7 +10152,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp35_ = video_reader_is_supported_video_filename (_tmp34_);
#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp35_) {
-#line 10140 "ImportPage.c"
+#line 10150 "ImportPage.c"
{
PhotoMetadata* _tmp36_ = NULL;
GPSpinIdleWrapper* _tmp37_ = NULL;
@@ -10168,7 +10178,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp36_ = _tmp42_;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10166 "ImportPage.c"
+#line 10176 "ImportPage.c"
goto __catch68_g_error;
}
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10181,7 +10191,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
metadata = _tmp43_;
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (_tmp36_);
-#line 10179 "ImportPage.c"
+#line 10189 "ImportPage.c"
}
goto __finally68;
__catch68_g_error:
@@ -10207,7 +10217,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10205 "ImportPage.c"
+#line 10215 "ImportPage.c"
}
__finally68:
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10230,7 +10240,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_clear_error (&_inner_error_);
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10228 "ImportPage.c"
+#line 10238 "ImportPage.c"
}
}
#line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10239,7 +10249,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp48_ = metadata;
#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp48_ != NULL) {
-#line 10237 "ImportPage.c"
+#line 10247 "ImportPage.c"
guint8* flattened_sans_thumbnail = NULL;
PhotoMetadata* _tmp49_ = NULL;
gint _tmp50_ = 0;
@@ -10265,7 +10275,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp53__length1 = flattened_sans_thumbnail_length1;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp53_ != NULL) {
-#line 10263 "ImportPage.c"
+#line 10273 "ImportPage.c"
guint8* _tmp54_ = NULL;
gint _tmp54__length1 = 0;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10274,15 +10284,15 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp54__length1 = flattened_sans_thumbnail_length1;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = _tmp54__length1 > 0;
-#line 10272 "ImportPage.c"
+#line 10282 "ImportPage.c"
} else {
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = FALSE;
-#line 10276 "ImportPage.c"
+#line 10286 "ImportPage.c"
}
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp52_) {
-#line 10280 "ImportPage.c"
+#line 10290 "ImportPage.c"
guint8* _tmp55_ = NULL;
gint _tmp55__length1 = 0;
guint8* _tmp56_ = NULL;
@@ -10302,11 +10312,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (exif_only_md5);
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
exif_only_md5 = _tmp57_;
-#line 10300 "ImportPage.c"
+#line 10310 "ImportPage.c"
}
#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10304 "ImportPage.c"
+#line 10314 "ImportPage.c"
}
#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_raw = NULL;
@@ -10318,7 +10328,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
preview_raw_length = (gsize) 0;
#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview = NULL;
-#line 10316 "ImportPage.c"
+#line 10326 "ImportPage.c"
{
gchar* preview_fulldir = NULL;
const gchar* _tmp58_ = NULL;
@@ -10354,7 +10364,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp62_ = associated;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp62_ != NULL) {
-#line 10352 "ImportPage.c"
+#line 10362 "ImportPage.c"
PhotoImportSource* _tmp63_ = NULL;
gchar* _tmp64_ = NULL;
PhotoImportSource* _tmp65_ = NULL;
@@ -10375,7 +10385,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (preview_filename);
#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_filename = _tmp66_;
-#line 10373 "ImportPage.c"
+#line 10383 "ImportPage.c"
}
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp68_ = import_page_spin_idle_context;
@@ -10407,7 +10417,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (preview_filename);
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10405 "ImportPage.c"
+#line 10415 "ImportPage.c"
goto __catch69_g_error;
}
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10424,7 +10434,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (preview_filename);
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10422 "ImportPage.c"
+#line 10432 "ImportPage.c"
}
goto __finally69;
__catch69_g_error:
@@ -10442,7 +10452,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp79_ = video_reader_is_supported_video_filename (_tmp78_);
#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp79_) {
-#line 10440 "ImportPage.c"
+#line 10450 "ImportPage.c"
const gchar* _tmp80_ = NULL;
const gchar* _tmp81_ = NULL;
GError* _tmp82_ = NULL;
@@ -10457,11 +10467,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp83_ = _tmp82_->message;
#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_);
-#line 10455 "ImportPage.c"
+#line 10465 "ImportPage.c"
}
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10459 "ImportPage.c"
+#line 10469 "ImportPage.c"
}
__finally69:
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10490,7 +10500,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_clear_error (&_inner_error_);
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10488 "ImportPage.c"
+#line 10498 "ImportPage.c"
}
#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_md5 = NULL;
@@ -10498,7 +10508,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp86_ = preview;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp86_ != NULL) {
-#line 10496 "ImportPage.c"
+#line 10506 "ImportPage.c"
guint8* _tmp87_ = NULL;
gint _tmp87__length1 = 0;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10507,29 +10517,29 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp87__length1 = preview_raw_length1;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp85_ = _tmp87_ != NULL;
-#line 10505 "ImportPage.c"
+#line 10515 "ImportPage.c"
} else {
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp85_ = FALSE;
-#line 10509 "ImportPage.c"
+#line 10519 "ImportPage.c"
}
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp85_) {
-#line 10513 "ImportPage.c"
+#line 10523 "ImportPage.c"
gsize _tmp88_ = 0UL;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp88_ = preview_raw_length;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp84_ = _tmp88_ > ((gsize) 0);
-#line 10519 "ImportPage.c"
+#line 10529 "ImportPage.c"
} else {
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp84_ = FALSE;
-#line 10523 "ImportPage.c"
+#line 10533 "ImportPage.c"
}
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp84_) {
-#line 10527 "ImportPage.c"
+#line 10537 "ImportPage.c"
guint8* _tmp89_ = NULL;
gint _tmp89__length1 = 0;
gsize _tmp90_ = 0UL;
@@ -10546,13 +10556,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (preview_md5);
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_md5 = _tmp91_;
-#line 10544 "ImportPage.c"
+#line 10554 "ImportPage.c"
}
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp92_ = import_source;
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10550 "ImportPage.c"
+#line 10560 "ImportPage.c"
ImportSource* _tmp93_ = NULL;
GdkPixbuf* _tmp94_ = NULL;
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10561,13 +10571,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp94_ = preview;
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp93_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp93_) : NULL, _tmp94_);
-#line 10559 "ImportPage.c"
+#line 10569 "ImportPage.c"
}
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp95_ = import_source;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10565 "ImportPage.c"
+#line 10575 "ImportPage.c"
ImportSource* _tmp96_ = NULL;
GdkPixbuf* _tmp97_ = NULL;
const gchar* _tmp98_ = NULL;
@@ -10585,13 +10595,13 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_tmp100_ = exif_only_md5;
#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp96_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp96_) : NULL, _tmp97_, _tmp98_, _tmp99_, _tmp100_);
-#line 10583 "ImportPage.c"
+#line 10593 "ImportPage.c"
}
#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp101_ = associated;
#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp101_ != NULL) {
-#line 10589 "ImportPage.c"
+#line 10599 "ImportPage.c"
{
PhotoMetadata* associated_metadata = NULL;
GPSpinIdleWrapper* _tmp102_ = NULL;
@@ -10639,7 +10649,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
associated_metadata = _tmp112_;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10637 "ImportPage.c"
+#line 10647 "ImportPage.c"
goto __catch70_g_error;
}
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10654,7 +10664,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL);
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (associated_metadata);
-#line 10652 "ImportPage.c"
+#line 10662 "ImportPage.c"
}
goto __finally70;
__catch70_g_error:
@@ -10696,7 +10706,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (_tmp119_);
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10694 "ImportPage.c"
+#line 10704 "ImportPage.c"
}
__finally70:
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10727,7 +10737,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_clear_error (&_inner_error_);
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10725 "ImportPage.c"
+#line 10735 "ImportPage.c"
}
}
#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10772,11 +10782,11 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (filename);
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_source);
-#line 10770 "ImportPage.c"
+#line 10780 "ImportPage.c"
}
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_import_source_list);
-#line 10774 "ImportPage.c"
+#line 10784 "ImportPage.c"
}
}
@@ -10796,7 +10806,7 @@ static void import_page_on_hide_imported (ImportPage* self) {
_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"
if (_tmp1_) {
-#line 10794 "ImportPage.c"
+#line 10804 "ImportPage.c"
ViewCollection* _tmp2_ = NULL;
ViewCollection* _tmp3_ = NULL;
ImportPageHideImportedViewFilter* _tmp4_ = NULL;
@@ -10810,7 +10820,7 @@ static void import_page_on_hide_imported (ImportPage* self) {
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"
_data_collection_unref0 (_tmp3_);
-#line 10808 "ImportPage.c"
+#line 10818 "ImportPage.c"
} else {
ViewCollection* _tmp5_ = NULL;
ViewCollection* _tmp6_ = NULL;
@@ -10825,7 +10835,7 @@ static void import_page_on_hide_imported (ImportPage* self) {
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"
_data_collection_unref0 (_tmp6_);
-#line 10823 "ImportPage.c"
+#line 10833 "ImportPage.c"
}
#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = config_facade_get_instance ();
@@ -10839,7 +10849,7 @@ static void import_page_on_hide_imported (ImportPage* self) {
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"
_g_object_unref0 (_tmp9_);
-#line 10837 "ImportPage.c"
+#line 10847 "ImportPage.c"
}
@@ -10864,7 +10874,7 @@ static void import_page_on_import_selected (ImportPage* self) {
_g_object_unref0 (_tmp3_);
#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 10862 "ImportPage.c"
+#line 10872 "ImportPage.c"
}
@@ -10889,7 +10899,7 @@ static void import_page_on_import_all (ImportPage* self) {
_g_object_unref0 (_tmp3_);
#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 10887 "ImportPage.c"
+#line 10897 "ImportPage.c"
}
@@ -10898,28 +10908,28 @@ static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, g
result = import_page_import_job_comparator ((ImportPage*) self, a, b);
#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 10896 "ImportPage.c"
+#line 10906 "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"
import_page_import_reporter ((ImportPage*) self, manifest);
-#line 10903 "ImportPage.c"
+#line 10913 "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"
import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 10910 "ImportPage.c"
+#line 10920 "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"
import_page_close_import ((ImportPage*) self);
-#line 10917 "ImportPage.c"
+#line 10927 "ImportPage.c"
}
@@ -10961,7 +10971,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_tmp4_ = res;
#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ != GP_OK) {
-#line 10959 "ImportPage.c"
+#line 10969 "ImportPage.c"
const gchar* _tmp5_ = NULL;
int _tmp6_ = 0;
gchar* _tmp7_ = NULL;
@@ -10988,7 +10998,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_g_free0 (_tmp8_);
#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10986 "ImportPage.c"
+#line 10996 "ImportPage.c"
}
#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = self->priv->refreshed;
@@ -11001,14 +11011,14 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
+ _tmp13_ = 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"
jobs = _tmp13_;
#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
+ _tmp14_ = 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"
already_imported = _tmp14_;
-#line 11006 "ImportPage.c"
+#line 11016 "ImportPage.c"
{
GeeIterator* _object_it = NULL;
GeeIterable* _tmp15_ = NULL;
@@ -11021,7 +11031,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_object_it = _tmp16_;
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 11019 "ImportPage.c"
+#line 11029 "ImportPage.c"
GeeIterator* _tmp17_ = NULL;
gboolean _tmp18_ = FALSE;
DataObject* object = NULL;
@@ -11051,7 +11061,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
if (!_tmp18_) {
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11049 "ImportPage.c"
+#line 11059 "ImportPage.c"
}
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _object_it;
@@ -11077,7 +11087,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_tmp26_ = import_preview_is_already_imported (_tmp25_);
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp26_) {
-#line 11075 "ImportPage.c"
+#line 11085 "ImportPage.c"
ImportSource* _tmp27_ = NULL;
gchar* _tmp28_ = NULL;
gchar* _tmp29_ = NULL;
@@ -11130,7 +11140,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_g_object_unref0 (object);
#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 11127 "ImportPage.c"
+#line 11137 "ImportPage.c"
}
#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp38_ = import_page_null_context;
@@ -11144,7 +11154,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_tmp42_ = import_file;
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11141 "ImportPage.c"
+#line 11151 "ImportPage.c"
ImportSource* _tmp43_ = NULL;
PhotoImportSource* _tmp44_ = NULL;
PhotoImportSource* _tmp45_ = NULL;
@@ -11158,15 +11168,15 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_tmp41_ = _tmp45_ != NULL;
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp45_);
-#line 11155 "ImportPage.c"
+#line 11165 "ImportPage.c"
} else {
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = FALSE;
-#line 11159 "ImportPage.c"
+#line 11169 "ImportPage.c"
}
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp41_) {
-#line 11163 "ImportPage.c"
+#line 11173 "ImportPage.c"
ImportPageCameraImportJob* _tmp46_ = NULL;
GPContextWrapper* _tmp47_ = NULL;
ImportSource* _tmp48_ = NULL;
@@ -11194,7 +11204,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_batch_import_job_unref0 (_tmp52_);
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp50_);
-#line 11191 "ImportPage.c"
+#line 11201 "ImportPage.c"
}
#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = jobs;
@@ -11210,11 +11220,11 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_g_object_unref0 (preview);
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (object);
-#line 11207 "ImportPage.c"
+#line 11217 "ImportPage.c"
}
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_object_it);
-#line 11211 "ImportPage.c"
+#line 11221 "ImportPage.c"
}
#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = jobs;
@@ -11234,7 +11244,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_tmp61_ = _tmp60_;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp61_ > 0) {
-#line 11231 "ImportPage.c"
+#line 11241 "ImportPage.c"
ImportPage* _tmp62_ = NULL;
ImportPage* _tmp63_ = NULL;
BatchImport* batch_import = NULL;
@@ -11297,7 +11307,7 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_g_object_unref0 (_tmp74_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (batch_import);
-#line 11294 "ImportPage.c"
+#line 11304 "ImportPage.c"
} else {
GeeArrayList* _tmp75_ = NULL;
gint _tmp76_ = 0;
@@ -11305,12 +11315,12 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp75_ = already_imported;
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp77_ = _tmp76_;
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp77_ > 0) {
-#line 11307 "ImportPage.c"
+#line 11317 "ImportPage.c"
GeeArrayList* _tmp78_ = NULL;
ImportManifest* _tmp79_ = NULL;
ImportManifest* _tmp80_ = NULL;
@@ -11324,17 +11334,17 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
import_page_import_reporter (self, _tmp80_);
#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_manifest_unref0 (_tmp80_);
-#line 11321 "ImportPage.c"
+#line 11331 "ImportPage.c"
}
#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_close_import (self);
-#line 11325 "ImportPage.c"
+#line 11335 "ImportPage.c"
}
#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (already_imported);
#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (jobs);
-#line 11331 "ImportPage.c"
+#line 11341 "ImportPage.c"
}
@@ -11355,7 +11365,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
if (_tmp2_ == NULL) {
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
-#line 11352 "ImportPage.c"
+#line 11362 "ImportPage.c"
} else {
BatchImportResult* _tmp3_ = NULL;
ImportResult _tmp4_ = 0;
@@ -11365,13 +11375,13 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
_tmp4_ = _tmp3_->result;
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11362 "ImportPage.c"
+#line 11372 "ImportPage.c"
}
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
#line 1716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11368 "ImportPage.c"
+#line 11378 "ImportPage.c"
}
{
BatchImportResult* _tmp5_ = NULL;
@@ -11384,7 +11394,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
g_file_delete (_tmp6_, NULL, &_inner_error_);
#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11381 "ImportPage.c"
+#line 11391 "ImportPage.c"
goto __catch71_g_error;
}
}
@@ -11420,7 +11430,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
_g_free0 (_tmp10_);
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 11417 "ImportPage.c"
+#line 11427 "ImportPage.c"
}
__finally71:
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11431,7 +11441,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
g_clear_error (&_inner_error_);
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11428 "ImportPage.c"
+#line 11438 "ImportPage.c"
}
}
@@ -11439,7 +11449,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
static gpointer _batch_import_job_ref0 (gpointer self) {
#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? batch_import_job_ref (self) : NULL;
-#line 11436 "ImportPage.c"
+#line 11446 "ImportPage.c"
}
@@ -11448,7 +11458,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 11445 "ImportPage.c"
+#line 11455 "ImportPage.c"
}
@@ -11502,7 +11512,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_tmp5_ = _tmp4_;
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_ > 0) {
-#line 11499 "ImportPage.c"
+#line 11509 "ImportPage.c"
gchar* photos_string = NULL;
ImportManifest* _tmp6_ = NULL;
GeeList* _tmp7_ = NULL;
@@ -11698,7 +11708,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_g_object_unref0 (local_ref);
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11695 "ImportPage.c"
+#line 11705 "ImportPage.c"
}
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_ui_question_params_unref0 (question);
@@ -11712,7 +11722,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_g_free0 (videos_string);
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (photos_string);
-#line 11709 "ImportPage.c"
+#line 11719 "ImportPage.c"
} else {
ImportManifest* _tmp59_ = NULL;
#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11723,7 +11733,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_g_object_unref0 (local_ref);
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11720 "ImportPage.c"
+#line 11730 "ImportPage.c"
}
#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp60_ = self->priv->import_sources;
@@ -11731,7 +11741,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
marker = _tmp61_;
-#line 11728 "ImportPage.c"
+#line 11738 "ImportPage.c"
{
GeeList* _batch_result_list = NULL;
ImportManifest* _tmp62_ = NULL;
@@ -11762,7 +11772,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_batch_result_index = -1;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 11759 "ImportPage.c"
+#line 11769 "ImportPage.c"
gint _tmp68_ = 0;
gint _tmp69_ = 0;
gint _tmp70_ = 0;
@@ -11790,7 +11800,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
if (!(_tmp69_ < _tmp70_)) {
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11787 "ImportPage.c"
+#line 11797 "ImportPage.c"
}
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp71_ = _batch_result_list;
@@ -11824,11 +11834,11 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_batch_import_job_unref0 (job);
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_result_unref0 (batch_result);
-#line 11821 "ImportPage.c"
+#line 11831 "ImportPage.c"
}
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_batch_result_list);
-#line 11825 "ImportPage.c"
+#line 11835 "ImportPage.c"
}
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp81_ = app_window_get_instance ();
@@ -11866,7 +11876,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_tmp92_ = error_count;
#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp92_ > 0) {
-#line 11863 "ImportPage.c"
+#line 11873 "ImportPage.c"
gchar* error_string = NULL;
gint _tmp93_ = 0;
const gchar* _tmp94_ = NULL;
@@ -11889,7 +11899,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
app_window_error_message (_tmp97_, NULL);
#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (error_string);
-#line 11886 "ImportPage.c"
+#line 11896 "ImportPage.c"
}
#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp98_ = progress;
@@ -11905,7 +11915,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_g_object_unref0 (marker);
#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
-#line 11902 "ImportPage.c"
+#line 11912 "ImportPage.c"
}
@@ -11933,7 +11943,7 @@ static void import_page_close_import (ImportPage* self) {
_tmp4_ = res;
#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ != GP_OK) {
-#line 11930 "ImportPage.c"
+#line 11940 "ImportPage.c"
int _tmp5_ = 0;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -11947,7 +11957,7 @@ static void import_page_close_import (ImportPage* self) {
g_message ("ImportPage.vala:1792: Unable to unlock camera: %s", _tmp7_);
#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp7_);
-#line 11944 "ImportPage.c"
+#line 11954 "ImportPage.c"
}
#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->refreshed;
@@ -11955,7 +11965,7 @@ static void import_page_close_import (ImportPage* self) {
import_page_update_status (self, FALSE, _tmp8_);
#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 11952 "ImportPage.c"
+#line 11962 "ImportPage.c"
}
@@ -11973,14 +11983,14 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea
_tmp1_ = display;
#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 11970 "ImportPage.c"
+#line 11980 "ImportPage.c"
}
static gpointer _view_filter_ref0 (gpointer self) {
#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? view_filter_ref (self) : NULL;
-#line 11977 "ImportPage.c"
+#line 11987 "ImportPage.c"
}
@@ -11999,7 +12009,7 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
result = _tmp1_;
#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 11996 "ImportPage.c"
+#line 12006 "ImportPage.c"
}
@@ -12021,14 +12031,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 12018 "ImportPage.c"
+#line 12028 "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 12025 "ImportPage.c"
+#line 12035 "ImportPage.c"
}
@@ -12049,7 +12059,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 12046 "ImportPage.c"
+#line 12056 "ImportPage.c"
}
@@ -12061,15 +12071,15 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((ViewManagerClass *) klass)->create_view = import_page_import_view_manager_real_create_view;
-#line 12059 "ImportPage.c"
+ ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) import_page_import_view_manager_real_create_view;
+#line 12069 "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 12066 "ImportPage.c"
+#line 12076 "ImportPage.c"
}
@@ -12081,7 +12091,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 12078 "ImportPage.c"
+#line 12088 "ImportPage.c"
}
@@ -12100,7 +12110,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 12097 "ImportPage.c"
+#line 12107 "ImportPage.c"
}
@@ -12196,7 +12206,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 12193 "ImportPage.c"
+#line 12203 "ImportPage.c"
ImportSource* _tmp17_ = NULL;
PhotoMetadata* _tmp18_ = NULL;
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12207,13 +12217,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 12204 "ImportPage.c"
+#line 12214 "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 12210 "ImportPage.c"
+#line 12220 "ImportPage.c"
}
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12231,14 +12241,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 12228 "ImportPage.c"
+#line 12238 "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 12235 "ImportPage.c"
+#line 12245 "ImportPage.c"
}
@@ -12253,7 +12263,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 12250 "ImportPage.c"
+#line 12260 "ImportPage.c"
}
@@ -12272,7 +12282,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 12269 "ImportPage.c"
+#line 12279 "ImportPage.c"
}
@@ -12287,23 +12297,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 12284 "ImportPage.c"
+#line 12294 "ImportPage.c"
time_t _tmp2_ = 0;
#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 12290 "ImportPage.c"
+#line 12300 "ImportPage.c"
} else {
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = (time_t) 0;
-#line 12294 "ImportPage.c"
+#line 12304 "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 12300 "ImportPage.c"
+#line 12310 "ImportPage.c"
}
@@ -12322,7 +12332,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 12319 "ImportPage.c"
+#line 12329 "ImportPage.c"
}
@@ -12341,7 +12351,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 12338 "ImportPage.c"
+#line 12348 "ImportPage.c"
}
@@ -12360,7 +12370,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 12357 "ImportPage.c"
+#line 12367 "ImportPage.c"
}
@@ -12379,7 +12389,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 12376 "ImportPage.c"
+#line 12386 "ImportPage.c"
}
@@ -12399,7 +12409,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 12396 "ImportPage.c"
+#line 12406 "ImportPage.c"
}
@@ -12417,7 +12427,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 12414 "ImportPage.c"
+#line 12424 "ImportPage.c"
}
@@ -12430,7 +12440,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 12427 "ImportPage.c"
+#line 12437 "ImportPage.c"
}
@@ -12456,21 +12466,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 12453 "ImportPage.c"
+#line 12463 "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 12459 "ImportPage.c"
+#line 12469 "ImportPage.c"
} else {
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file);
-#line 12463 "ImportPage.c"
+#line 12473 "ImportPage.c"
}
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12467 "ImportPage.c"
+#line 12477 "ImportPage.c"
}
@@ -12480,11 +12490,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
gboolean _vala_copy_to_library = FALSE;
gboolean result = FALSE;
GFile* dest_file = NULL;
- GFile* _tmp12_ = NULL;
- GFile* _tmp16_ = NULL;
- ImportPageCameraImportJob* _tmp24_ = NULL;
- GFile* _tmp55_ = NULL;
- GFile* _tmp56_ = NULL;
+ GFile* _tmp13_ = NULL;
+ GFile* _tmp17_ = NULL;
+ ImportPageCameraImportJob* _tmp26_ = NULL;
+ GFile* _tmp59_ = NULL;
+ GFile* _tmp60_ = NULL;
GError * _inner_error_ = NULL;
#line 558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
@@ -12496,7 +12506,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 12493 "ImportPage.c"
+#line 12503 "ImportPage.c"
{
gboolean collision = FALSE;
GFile* _tmp0_ = NULL;
@@ -12520,7 +12530,7 @@ 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 12517 "ImportPage.c"
+#line 12527 "ImportPage.c"
goto __catch72_g_error;
}
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12533,7 +12543,7 @@ 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 12530 "ImportPage.c"
+#line 12540 "ImportPage.c"
}
goto __finally72;
__catch72_g_error:
@@ -12564,37 +12574,39 @@ 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 12561 "ImportPage.c"
+#line 12571 "ImportPage.c"
}
__finally72:
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12576 "ImportPage.c"
+ gboolean _tmp12_ = FALSE;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dest_file);
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return FALSE;
-#line 12572 "ImportPage.c"
+ return _tmp12_;
+#line 12584 "ImportPage.c"
}
#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = dest_file;
+ _tmp13_ = dest_file;
#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp12_ == NULL) {
-#line 12578 "ImportPage.c"
- ImportSource* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
+ if (_tmp13_ == NULL) {
+#line 12590 "ImportPage.c"
+ ImportSource* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
+ gchar* _tmp16_ = NULL;
#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = self->priv->import_file;
+ _tmp14_ = self->priv->import_file;
#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = import_source_get_filename (_tmp13_);
+ _tmp15_ = import_source_get_filename (_tmp14_);
#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = _tmp14_;
+ _tmp16_ = _tmp15_;
#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:573: Unable to generate local file for %s", _tmp15_);
+ g_message ("ImportPage.vala:573: Unable to generate local file for %s", _tmp16_);
#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp16_);
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12603,185 +12615,189 @@ 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 12600 "ImportPage.c"
+#line 12612 "ImportPage.c"
} else {
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12604 "ImportPage.c"
+#line 12616 "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 12610 "ImportPage.c"
+#line 12622 "ImportPage.c"
}
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12614 "ImportPage.c"
+#line 12626 "ImportPage.c"
}
#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = dest_file;
+ _tmp17_ = dest_file;
#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_monitor_blacklist_file (_tmp16_, "CameraImportJob.prepare");
-#line 12620 "ImportPage.c"
+ library_monitor_blacklist_file (_tmp17_, "CameraImportJob.prepare");
+#line 12632 "ImportPage.c"
{
- GPContextWrapper* _tmp17_ = NULL;
- GPContext* _tmp18_ = NULL;
- Camera* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
+ GPContextWrapper* _tmp18_ = NULL;
+ GPContext* _tmp19_ = NULL;
+ Camera* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
- GFile* _tmp22_ = NULL;
+ const gchar* _tmp22_ = NULL;
+ GFile* _tmp23_ = NULL;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = self->priv->context;
+ _tmp18_ = self->priv->context;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = _tmp17_->context;
+ _tmp19_ = _tmp18_->context;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = self->priv->camera;
+ _tmp20_ = self->priv->camera;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = self->priv->fulldir;
+ _tmp21_ = self->priv->fulldir;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = self->priv->filename;
+ _tmp22_ = self->priv->filename;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = dest_file;
+ _tmp23_ = dest_file;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gp_save_image (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, &_inner_error_);
+ 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 12644 "ImportPage.c"
+#line 12656 "ImportPage.c"
goto __finally73;
}
}
__finally73:
{
- GFile* _tmp23_ = NULL;
+ GFile* _tmp24_ = NULL;
#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = dest_file;
+ _tmp24_ = dest_file;
#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_monitor_unblacklist_file (_tmp23_);
-#line 12655 "ImportPage.c"
+ library_monitor_unblacklist_file (_tmp24_);
+#line 12667 "ImportPage.c"
}
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12671 "ImportPage.c"
+ gboolean _tmp25_ = FALSE;
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dest_file);
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return FALSE;
-#line 12665 "ImportPage.c"
+ return _tmp25_;
+#line 12679 "ImportPage.c"
}
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = self->priv->associated;
+ _tmp26_ = self->priv->associated;
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp24_ != NULL) {
-#line 12671 "ImportPage.c"
- BackingPhotoRow* _tmp39_ = NULL;
- GFile* assoc_dest = NULL;
+ if (_tmp26_ != NULL) {
+#line 12685 "ImportPage.c"
BackingPhotoRow* _tmp42_ = NULL;
- const gchar* _tmp43_ = NULL;
- GFile* _tmp44_ = NULL;
- GFile* _tmp45_ = NULL;
+ GFile* assoc_dest = NULL;
+ BackingPhotoRow* _tmp45_ = NULL;
+ const gchar* _tmp46_ = NULL;
+ GFile* _tmp47_ = NULL;
+ GFile* _tmp48_ = NULL;
{
- BackingPhotoRow* _tmp25_ = NULL;
- GFile* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- ImportPageCameraImportJob* _tmp29_ = NULL;
+ BackingPhotoRow* _tmp27_ = NULL;
+ GFile* _tmp28_ = NULL;
+ gchar* _tmp29_ = NULL;
gchar* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- BackingPhotoRow* _tmp32_ = NULL;
- BackingPhotoRow* _tmp33_ = NULL;
+ ImportPageCameraImportJob* _tmp31_ = NULL;
+ gchar* _tmp32_ = NULL;
+ gchar* _tmp33_ = NULL;
BackingPhotoRow* _tmp34_ = NULL;
+ BackingPhotoRow* _tmp35_ = NULL;
+ BackingPhotoRow* _tmp36_ = NULL;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = dest_file;
+ _tmp28_ = dest_file;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = g_file_get_path (_tmp26_);
+ _tmp29_ = g_file_get_path (_tmp28_);
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = _tmp27_;
+ _tmp30_ = _tmp29_;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = self->priv->associated;
+ _tmp31_ = self->priv->associated;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = batch_import_job_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
+ _tmp32_ = batch_import_job_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = _tmp30_;
+ _tmp33_ = _tmp32_;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = raw_developer_create_backing_row_for_development (RAW_DEVELOPER_CAMERA, _tmp28_, _tmp31_, &_inner_error_);
+ _tmp34_ = raw_developer_create_backing_row_for_development (RAW_DEVELOPER_CAMERA, _tmp30_, _tmp33_, &_inner_error_);
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = _tmp32_;
+ _tmp35_ = _tmp34_;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp33_);
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp28_);
+ _g_free0 (_tmp30_);
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = _tmp33_;
+ _tmp27_ = _tmp35_;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12713 "ImportPage.c"
+#line 12727 "ImportPage.c"
goto __catch74_g_error;
}
#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = _tmp25_;
+ _tmp36_ = _tmp27_;
#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = NULL;
+ _tmp27_ = NULL;
#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_backing_photo_row_unref0 (self->priv->associated_file);
#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->associated_file = _tmp34_;
+ self->priv->associated_file = _tmp36_;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _backing_photo_row_unref0 (_tmp25_);
-#line 12726 "ImportPage.c"
+ _backing_photo_row_unref0 (_tmp27_);
+#line 12740 "ImportPage.c"
}
goto __finally74;
__catch74_g_error:
{
GError* err = NULL;
- ImportPageCameraImportJob* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
- GError* _tmp37_ = NULL;
+ ImportPageCameraImportJob* _tmp37_ = NULL;
const gchar* _tmp38_ = NULL;
+ GError* _tmp39_ = NULL;
+ const gchar* _tmp40_ = NULL;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = self->priv->associated;
+ _tmp37_ = self->priv->associated;
#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp35_->priv->filename;
+ _tmp38_ = _tmp37_->priv->filename;
#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = err;
+ _tmp39_ = err;
#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = _tmp37_->message;
+ _tmp40_ = _tmp39_->message;
#line 594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_warning ("ImportPage.vala:594: Unable to generate backing associated file for %s" \
-": %s", _tmp36_, _tmp38_);
+": %s", _tmp38_, _tmp40_);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 12752 "ImportPage.c"
+#line 12766 "ImportPage.c"
}
__finally74:
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12771 "ImportPage.c"
+ gboolean _tmp41_ = FALSE;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dest_file);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return FALSE;
-#line 12763 "ImportPage.c"
+ return _tmp41_;
+#line 12779 "ImportPage.c"
}
#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = self->priv->associated_file;
+ _tmp42_ = self->priv->associated_file;
#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp39_ == NULL) {
-#line 12769 "ImportPage.c"
- ImportPageCameraImportJob* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
+ if (_tmp42_ == NULL) {
+#line 12785 "ImportPage.c"
+ ImportPageCameraImportJob* _tmp43_ = NULL;
+ const gchar* _tmp44_ = NULL;
#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = self->priv->associated;
+ _tmp43_ = self->priv->associated;
#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = _tmp40_->priv->filename;
+ _tmp44_ = _tmp43_->priv->filename;
#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:599: Unable to generate backing associated file for %s", _tmp41_);
+ g_message ("ImportPage.vala:599: Unable to generate backing associated file for %s", _tmp44_);
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12790,79 +12806,81 @@ 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 12786 "ImportPage.c"
+#line 12802 "ImportPage.c"
} else {
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12790 "ImportPage.c"
+#line 12806 "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 12796 "ImportPage.c"
+#line 12812 "ImportPage.c"
}
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12800 "ImportPage.c"
+#line 12816 "ImportPage.c"
}
#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = self->priv->associated_file;
+ _tmp45_ = self->priv->associated_file;
#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = _tmp42_->filepath;
+ _tmp46_ = _tmp45_->filepath;
#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = g_file_new_for_path (_tmp43_);
+ _tmp47_ = g_file_new_for_path (_tmp46_);
#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- assoc_dest = _tmp44_;
+ assoc_dest = _tmp47_;
#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = assoc_dest;
+ _tmp48_ = assoc_dest;
#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_monitor_blacklist_file (_tmp45_, "CameraImportJob.prepare");
-#line 12814 "ImportPage.c"
+ library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare");
+#line 12830 "ImportPage.c"
{
- GPContextWrapper* _tmp46_ = NULL;
- GPContext* _tmp47_ = NULL;
- Camera* _tmp48_ = NULL;
- ImportPageCameraImportJob* _tmp49_ = NULL;
- const gchar* _tmp50_ = NULL;
- ImportPageCameraImportJob* _tmp51_ = NULL;
- const gchar* _tmp52_ = NULL;
- GFile* _tmp53_ = NULL;
+ GPContextWrapper* _tmp49_ = NULL;
+ GPContext* _tmp50_ = NULL;
+ Camera* _tmp51_ = NULL;
+ ImportPageCameraImportJob* _tmp52_ = NULL;
+ const gchar* _tmp53_ = NULL;
+ ImportPageCameraImportJob* _tmp54_ = NULL;
+ const gchar* _tmp55_ = NULL;
+ GFile* _tmp56_ = NULL;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = self->priv->context;
+ _tmp49_ = self->priv->context;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = _tmp46_->context;
+ _tmp50_ = _tmp49_->context;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = self->priv->camera;
+ _tmp51_ = self->priv->camera;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = self->priv->associated;
+ _tmp52_ = self->priv->associated;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = _tmp49_->priv->fulldir;
+ _tmp53_ = _tmp52_->priv->fulldir;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = self->priv->associated;
+ _tmp54_ = self->priv->associated;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = _tmp51_->priv->filename;
+ _tmp55_ = _tmp54_->priv->filename;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = assoc_dest;
+ _tmp56_ = assoc_dest;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gp_save_image (_tmp47_, _tmp48_, _tmp50_, _tmp52_, _tmp53_, &_inner_error_);
+ 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 12844 "ImportPage.c"
+#line 12860 "ImportPage.c"
goto __finally75;
}
}
__finally75:
{
- GFile* _tmp54_ = NULL;
+ GFile* _tmp57_ = NULL;
#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = assoc_dest;
+ _tmp57_ = assoc_dest;
#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_monitor_unblacklist_file (_tmp54_);
-#line 12855 "ImportPage.c"
+ library_monitor_unblacklist_file (_tmp57_);
+#line 12871 "ImportPage.c"
}
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12875 "ImportPage.c"
+ gboolean _tmp58_ = FALSE;
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12870,21 +12888,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dest_file);
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return FALSE;
-#line 12867 "ImportPage.c"
+ return _tmp58_;
+#line 12885 "ImportPage.c"
}
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (assoc_dest);
-#line 12871 "ImportPage.c"
+#line 12889 "ImportPage.c"
}
#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = dest_file;
+ _tmp59_ = dest_file;
#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = _g_object_ref0 (_tmp55_);
+ _tmp60_ = _g_object_ref0 (_tmp59_);
#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _vala_file_to_import = _tmp56_;
+ _vala_file_to_import = _tmp60_;
#line 614 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_vala_copy_to_library = FALSE;
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12895,21 +12913,21 @@ 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 12891 "ImportPage.c"
+#line 12909 "ImportPage.c"
} else {
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12895 "ImportPage.c"
+#line 12913 "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 12901 "ImportPage.c"
+#line 12919 "ImportPage.c"
}
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12905 "ImportPage.c"
+#line 12923 "ImportPage.c"
}
@@ -12931,7 +12949,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
_tmp0_ = source;
#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 12927 "ImportPage.c"
+#line 12945 "ImportPage.c"
Photo* photo = NULL;
MediaSource* _tmp1_ = NULL;
Photo* _tmp2_ = NULL;
@@ -12946,13 +12964,13 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
_tmp3_ = self->priv->associated_file;
#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp3_ != NULL) {
-#line 12942 "ImportPage.c"
+#line 12960 "ImportPage.c"
Photo* _tmp4_ = NULL;
BackingPhotoRow* _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
- ConfigFacade* _tmp7_ = NULL;
+ Photo* _tmp7_ = NULL;
ConfigFacade* _tmp8_ = NULL;
- RawDeveloper _tmp9_ = 0;
+ ConfigFacade* _tmp9_ = NULL;
+ RawDeveloper _tmp10_ = 0;
#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = photo;
#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12961,39 +12979,41 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
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 12975 "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 FALSE;
-#line 12963 "ImportPage.c"
+ return _tmp6_;
+#line 12983 "ImportPage.c"
}
#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ret = TRUE;
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = photo;
+ _tmp7_ = photo;
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = config_facade_get_instance ();
+ _tmp8_ = config_facade_get_instance ();
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp9_ = _tmp8_;
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _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 (_tmp6_, _tmp9_);
+ photo_set_raw_developer (_tmp7_, _tmp10_);
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp8_);
-#line 12979 "ImportPage.c"
+ _g_object_unref0 (_tmp9_);
+#line 12999 "ImportPage.c"
}
#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 12983 "ImportPage.c"
+#line 13003 "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 12989 "ImportPage.c"
+#line 13009 "ImportPage.c"
}
@@ -13005,28 +13025,28 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_type_class_add_private (klass, sizeof (ImportPageCameraImportJobPrivate));
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->get_duplicated_file = import_page_camera_import_job_real_get_duplicated_file;
+ ((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_duplicated_file;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->get_exposure_time_override = import_page_camera_import_job_real_get_exposure_time_override;
+ ((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*)(BatchImportJob*)) import_page_camera_import_job_real_get_exposure_time_override;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->get_dest_identifier = import_page_camera_import_job_real_get_dest_identifier;
+ ((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_dest_identifier;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->get_source_identifier = import_page_camera_import_job_real_get_source_identifier;
+ ((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_source_identifier;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->get_basename = import_page_camera_import_job_real_get_basename;
+ ((BatchImportJobClass *) klass)->get_basename = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_basename;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->get_path = import_page_camera_import_job_real_get_path;
+ ((BatchImportJobClass *) klass)->get_path = (gchar* (*)(BatchImportJob*)) import_page_camera_import_job_real_get_path;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->set_associated = import_page_camera_import_job_real_set_associated;
+ ((BatchImportJobClass *) klass)->set_associated = (void (*)(BatchImportJob*, BatchImportJob*)) import_page_camera_import_job_real_set_associated;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->is_directory = import_page_camera_import_job_real_is_directory;
+ ((BatchImportJobClass *) klass)->is_directory = (gboolean (*)(BatchImportJob*)) import_page_camera_import_job_real_is_directory;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->determine_file_size = import_page_camera_import_job_real_determine_file_size;
+ ((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) import_page_camera_import_job_real_determine_file_size;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((BatchImportJobClass *) klass)->prepare = import_page_camera_import_job_real_prepare;
+ ((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 = import_page_camera_import_job_real_complete;
-#line 13022 "ImportPage.c"
+ ((BatchImportJobClass *) klass)->complete = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
+#line 13042 "ImportPage.c"
}
@@ -13037,7 +13057,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 13033 "ImportPage.c"
+#line 13053 "ImportPage.c"
}
@@ -13065,7 +13085,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 13061 "ImportPage.c"
+#line 13081 "ImportPage.c"
}
@@ -13090,7 +13110,7 @@ static guint import_page_import_page_search_view_filter_real_get_criteria (Searc
result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA);
#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13086 "ImportPage.c"
+#line 13106 "ImportPage.c"
}
@@ -13110,7 +13130,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
result = _tmp1_ != NULL;
#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 13106 "ImportPage.c"
+#line 13126 "ImportPage.c"
}
@@ -13137,27 +13157,27 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_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"
if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 13133 "ImportPage.c"
+#line 13153 "ImportPage.c"
gboolean _tmp4_ = FALSE;
#line 644 "/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"
_tmp2_ = _tmp4_;
-#line 13139 "ImportPage.c"
+#line 13159 "ImportPage.c"
} else {
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = FALSE;
-#line 13143 "ImportPage.c"
+#line 13163 "ImportPage.c"
}
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 13147 "ImportPage.c"
+#line 13167 "ImportPage.c"
ImportSource* _tmp5_ = NULL;
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = source;
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13153 "ImportPage.c"
+#line 13173 "ImportPage.c"
gboolean _tmp6_ = FALSE;
gboolean _tmp7_ = FALSE;
#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13172,7 +13192,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13168 "ImportPage.c"
+#line 13188 "ImportPage.c"
}
} else {
ImportSource* _tmp8_ = NULL;
@@ -13180,7 +13200,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_tmp8_ = source;
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13176 "ImportPage.c"
+#line 13196 "ImportPage.c"
PhotoImportSource* photo = NULL;
ImportSource* _tmp9_ = NULL;
PhotoImportSource* _tmp10_ = NULL;
@@ -13198,7 +13218,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_tmp12_ = photo_import_source_get_file_format (_tmp11_);
#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13194 "ImportPage.c"
+#line 13214 "ImportPage.c"
PhotoImportSource* _tmp13_ = NULL;
PhotoImportSource* _tmp14_ = NULL;
PhotoImportSource* _tmp15_ = NULL;
@@ -13215,7 +13235,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (_tmp15_);
#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp16_) {
-#line 13211 "ImportPage.c"
+#line 13231 "ImportPage.c"
gboolean _tmp17_ = FALSE;
gboolean _tmp18_ = FALSE;
gboolean _tmp19_ = FALSE;
@@ -13225,7 +13245,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_tmp19_ = _tmp18_;
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp19_) {
-#line 13221 "ImportPage.c"
+#line 13241 "ImportPage.c"
gboolean _tmp20_ = FALSE;
gboolean _tmp21_ = FALSE;
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13234,11 +13254,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_tmp21_ = _tmp20_;
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = !_tmp21_;
-#line 13230 "ImportPage.c"
+#line 13250 "ImportPage.c"
} else {
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = FALSE;
-#line 13234 "ImportPage.c"
+#line 13254 "ImportPage.c"
}
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp17_) {
@@ -13250,7 +13270,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13246 "ImportPage.c"
+#line 13266 "ImportPage.c"
}
} else {
gboolean _tmp22_ = FALSE;
@@ -13269,7 +13289,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13265 "ImportPage.c"
+#line 13285 "ImportPage.c"
}
}
} else {
@@ -13289,12 +13309,12 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13285 "ImportPage.c"
+#line 13305 "ImportPage.c"
}
}
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 13290 "ImportPage.c"
+#line 13310 "ImportPage.c"
}
}
}
@@ -13302,7 +13322,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_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"
if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13298 "ImportPage.c"
+#line 13318 "ImportPage.c"
const gchar* keywords = NULL;
ImportSource* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
@@ -13328,11 +13348,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13324 "ImportPage.c"
+#line 13344 "ImportPage.c"
}
#line 668 "/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 13328 "ImportPage.c"
+#line 13348 "ImportPage.c"
{
gchar** word_collection = NULL;
gint word_collection_length1 = 0;
@@ -13344,11 +13364,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
word_collection_length1 = _tmp31_;
#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13340 "ImportPage.c"
+#line 13360 "ImportPage.c"
const gchar* word = NULL;
#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
word = word_collection[word_it];
-#line 13344 "ImportPage.c"
+#line 13364 "ImportPage.c"
{
const gchar* _tmp33_ = NULL;
const gchar* _tmp34_ = NULL;
@@ -13367,7 +13387,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13363 "ImportPage.c"
+#line 13383 "ImportPage.c"
}
}
}
@@ -13379,7 +13399,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13375 "ImportPage.c"
+#line 13395 "ImportPage.c"
}
@@ -13389,14 +13409,14 @@ static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view
self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 13385 "ImportPage.c"
+#line 13405 "ImportPage.c"
}
static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
#line 635 "/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 13392 "ImportPage.c"
+#line 13412 "ImportPage.c"
}
@@ -13404,10 +13424,10 @@ static void import_page_import_page_search_view_filter_class_init (ImportPageImp
#line 635 "/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"
- ((SearchViewFilterClass *) klass)->get_criteria = import_page_import_page_search_view_filter_real_get_criteria;
+ ((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"
- ((ViewFilterClass *) klass)->predicate = import_page_import_page_search_view_filter_real_predicate;
-#line 13403 "ImportPage.c"
+ ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) import_page_import_page_search_view_filter_real_predicate;
+#line 13423 "ImportPage.c"
}
@@ -13444,7 +13464,7 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
result = !_tmp1_;
#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13440 "ImportPage.c"
+#line 13460 "ImportPage.c"
}
@@ -13454,14 +13474,14 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_c
self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 13450 "ImportPage.c"
+#line 13470 "ImportPage.c"
}
static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13457 "ImportPage.c"
+#line 13477 "ImportPage.c"
}
@@ -13469,8 +13489,8 @@ static void import_page_hide_imported_view_filter_class_init (ImportPageHideImpo
#line 679 "/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"
- ((ViewFilterClass *) klass)->predicate = import_page_hide_imported_view_filter_real_predicate;
-#line 13466 "ImportPage.c"
+ ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) import_page_hide_imported_view_filter_real_predicate;
+#line 13486 "ImportPage.c"
}
@@ -13496,32 +13516,32 @@ static void import_page_class_init (ImportPageClass * klass) {
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_type_class_add_private (klass, sizeof (ImportPagePrivate));
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((PageClass *) klass)->get_toolbar = import_page_real_get_toolbar;
+ ((PageClass *) klass)->get_toolbar = (GtkToolbar* (*)(Page*)) import_page_real_get_toolbar;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((CheckerboardPageClass *) klass)->get_view_tracker = import_page_real_get_view_tracker;
+ ((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) import_page_real_get_view_tracker;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((CheckerboardPageClass *) klass)->get_view_empty_message = import_page_real_get_view_empty_message;
+ ((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) import_page_real_get_view_empty_message;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((CheckerboardPageClass *) klass)->get_filter_no_match_message = import_page_real_get_filter_no_match_message;
+ ((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) import_page_real_get_filter_no_match_message;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((PageClass *) klass)->init_collect_ui_filenames = import_page_real_init_collect_ui_filenames;
+ ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) import_page_real_init_collect_ui_filenames;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((PageClass *) klass)->add_actions = import_page_real_add_actions;
+ ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) import_page_real_add_actions;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((PageClass *) klass)->remove_actions = import_page_real_remove_actions;
+ ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) import_page_real_remove_actions;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((PageClass *) klass)->init_actions = import_page_real_init_actions;
+ ((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) import_page_real_init_actions;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((PageClass *) klass)->switched_to = import_page_real_switched_to;
+ ((PageClass *) klass)->switched_to = (void (*)(Page*)) import_page_real_switched_to;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((PageClass *) klass)->ready = import_page_real_ready;
+ ((PageClass *) klass)->ready = (void (*)(Page*)) import_page_real_ready;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((CheckerboardPageClass *) klass)->set_display_titles = import_page_real_set_display_titles;
+ ((CheckerboardPageClass *) klass)->set_display_titles = (void (*)(CheckerboardPage*, gboolean)) import_page_real_set_display_titles;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ((CheckerboardPageClass *) klass)->get_search_view_filter = import_page_real_get_search_view_filter;
+ ((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 13517 "ImportPage.c"
+#line 13537 "ImportPage.c"
}
@@ -13566,7 +13586,7 @@ static void import_page_instance_init (ImportPage * self) {
_tmp3_ = import_page_hide_imported_view_filter_new ();
#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->hide_imported_filter = _tmp3_;
-#line 13562 "ImportPage.c"
+#line 13582 "ImportPage.c"
}
@@ -13620,7 +13640,7 @@ static void import_page_finalize (GObject* obj) {
_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 13616 "ImportPage.c"
+#line 13636 "ImportPage.c"
}