summaryrefslogtreecommitdiff
path: root/src/camera
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/camera
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/camera')
-rw-r--r--src/camera/Branch.c241
-rw-r--r--src/camera/Camera.c2
-rw-r--r--src/camera/CameraTable.c1680
-rw-r--r--src/camera/GPhoto.c1944
-rw-r--r--src/camera/GPhoto.vala18
-rw-r--r--src/camera/ImportPage.c6314
6 files changed, 5013 insertions, 5186 deletions
diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index e41b06f..60ed699 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -426,7 +426,7 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void camera_branch_finalize (GObject* obj);
+static void camera_branch_finalize (GObject * obj);
GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
@@ -453,7 +453,7 @@ ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* disp
ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
GType checkerboard_page_get_type (void) G_GNUC_CONST;
GType import_page_get_type (void) G_GNUC_CONST;
-static void camera_sidebar_entry_finalize (GObject* obj);
+static void camera_sidebar_entry_finalize (GObject * obj);
static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
@@ -481,12 +481,12 @@ static void _camera_branch_on_camera_removed_camera_table_camera_removed (Camera
CameraBranch* camera_branch_construct (GType object_type) {
CameraBranch * self = NULL;
- CameraHeader* _tmp0_ = NULL;
- CameraHeader* _tmp1_ = NULL;
- CameraTable* _tmp13_ = NULL;
- CameraTable* _tmp14_ = NULL;
- CameraTable* _tmp15_ = NULL;
- CameraTable* _tmp16_ = NULL;
+ CameraHeader* _tmp0_;
+ CameraHeader* _tmp1_;
+ CameraTable* _tmp13_;
+ CameraTable* _tmp14_;
+ CameraTable* _tmp15_;
+ CameraTable* _tmp16_;
#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp0_ = camera_header_new ();
#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -498,12 +498,12 @@ CameraBranch* camera_branch_construct (GType object_type) {
#line 499 "Branch.c"
{
GeeIterator* _camera_it = NULL;
- CameraTable* _tmp2_ = NULL;
- CameraTable* _tmp3_ = NULL;
- GeeIterable* _tmp4_ = NULL;
- GeeIterable* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ CameraTable* _tmp2_;
+ CameraTable* _tmp3_;
+ GeeIterable* _tmp4_;
+ GeeIterable* _tmp5_;
+ GeeIterator* _tmp6_;
+ GeeIterator* _tmp7_;
#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp2_ = camera_table_get_instance ();
#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -525,12 +525,12 @@ CameraBranch* camera_branch_construct (GType object_type) {
#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
while (TRUE) {
#line 528 "Branch.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
DiscoveredCamera* camera = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- DiscoveredCamera* _tmp12_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
+ DiscoveredCamera* _tmp12_;
#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp8_ = _camera_it;
#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -605,18 +605,18 @@ static gpointer _g_object_ref0 (gpointer self) {
static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
gint result = 0;
- SidebarEntry* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
+ SidebarEntry* _tmp0_;
+ SidebarEntry* _tmp1_;
gint ret = 0;
- SidebarEntry* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
+ SidebarEntry* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ SidebarEntry* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
#line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -661,20 +661,20 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
if (_tmp10_ == 0) {
#line 663 "Branch.c"
CameraSidebarEntry* cam_a = NULL;
- SidebarEntry* _tmp11_ = NULL;
- CameraSidebarEntry* _tmp12_ = NULL;
+ SidebarEntry* _tmp11_;
+ CameraSidebarEntry* _tmp12_;
CameraSidebarEntry* cam_b = NULL;
- SidebarEntry* _tmp13_ = NULL;
- CameraSidebarEntry* _tmp14_ = NULL;
+ SidebarEntry* _tmp13_;
+ CameraSidebarEntry* _tmp14_;
gboolean _tmp15_ = FALSE;
- CameraSidebarEntry* _tmp16_ = NULL;
- CameraSidebarEntry* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- CameraSidebarEntry* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- gint _tmp24_ = 0;
+ CameraSidebarEntry* _tmp16_;
+ CameraSidebarEntry* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ CameraSidebarEntry* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ gint _tmp24_;
#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp11_ = a;
#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -692,7 +692,7 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
if (_tmp16_ != NULL) {
#line 695 "Branch.c"
- CameraSidebarEntry* _tmp17_ = NULL;
+ CameraSidebarEntry* _tmp17_;
#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp17_ = cam_b;
#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -741,9 +741,9 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera) {
CameraSidebarEntry* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- DiscoveredCamera* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ DiscoveredCamera* _tmp1_;
+ gpointer _tmp2_;
#line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL);
#line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -763,7 +763,7 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc
static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) {
- DiscoveredCamera* _tmp0_ = NULL;
+ DiscoveredCamera* _tmp0_;
#line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -777,7 +777,7 @@ static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera*
static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) {
- DiscoveredCamera* _tmp0_ = NULL;
+ DiscoveredCamera* _tmp0_;
#line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -791,16 +791,16 @@ static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamer
static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera) {
- GeeHashMap* _tmp0_ = NULL;
- DiscoveredCamera* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeHashMap* _tmp0_;
+ DiscoveredCamera* _tmp1_;
+ gboolean _tmp2_;
CameraSidebarEntry* entry = NULL;
- DiscoveredCamera* _tmp3_ = NULL;
- CameraSidebarEntry* _tmp4_ = NULL;
- GeeHashMap* _tmp5_ = NULL;
- DiscoveredCamera* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
- SidebarEntry* _tmp8_ = NULL;
+ DiscoveredCamera* _tmp3_;
+ CameraSidebarEntry* _tmp4_;
+ GeeHashMap* _tmp5_;
+ DiscoveredCamera* _tmp6_;
+ SidebarEntry* _tmp7_;
+ SidebarEntry* _tmp8_;
#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -840,17 +840,17 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came
static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera) {
- GeeHashMap* _tmp0_ = NULL;
- DiscoveredCamera* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeHashMap* _tmp0_;
+ DiscoveredCamera* _tmp1_;
+ gboolean _tmp2_;
CameraSidebarEntry* entry = NULL;
- GeeHashMap* _tmp3_ = NULL;
- DiscoveredCamera* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeHashMap* _tmp3_;
+ DiscoveredCamera* _tmp4_;
+ gpointer _tmp5_;
gboolean removed = FALSE;
- GeeHashMap* _tmp6_ = NULL;
- DiscoveredCamera* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ GeeHashMap* _tmp6_;
+ DiscoveredCamera* _tmp7_;
+ gboolean _tmp8_;
#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -892,7 +892,7 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c
static void camera_branch_class_init (CameraBranchClass * klass) {
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
camera_branch_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -908,7 +908,7 @@ static void camera_branch_class_init (CameraBranchClass * klass) {
static void camera_branch_instance_init (CameraBranch * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#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"
@@ -919,7 +919,7 @@ static void camera_branch_instance_init (CameraBranch * self) {
}
-static void camera_branch_finalize (GObject* obj) {
+static void camera_branch_finalize (GObject * obj) {
CameraBranch * self;
#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch);
@@ -945,28 +945,25 @@ GType camera_branch_get_type (void) {
CameraHeader* camera_header_construct (GType object_type) {
CameraHeader * self = NULL;
- const gchar* _tmp0_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- _tmp0_ = _ ("Cameras");
#line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- self = (CameraHeader*) sidebar_header_construct (object_type, _tmp0_, TRUE);
+ self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), TRUE);
#line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return self;
-#line 956 "Branch.c"
+#line 953 "Branch.c"
}
CameraHeader* camera_header_new (void) {
#line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return camera_header_construct (CAMERA_TYPE_HEADER);
-#line 963 "Branch.c"
+#line 960 "Branch.c"
}
static void camera_header_class_init (CameraHeaderClass * klass) {
#line 83 "/home/jens/Source/shotwell/src/camera/Branch.vala"
camera_header_parent_class = g_type_class_peek_parent (klass);
-#line 970 "Branch.c"
+#line 967 "Branch.c"
}
@@ -989,17 +986,17 @@ GType camera_header_get_type (void) {
static gpointer _discovered_camera_ref0 (gpointer self) {
#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return self ? discovered_camera_ref (self) : NULL;
-#line 993 "Branch.c"
+#line 990 "Branch.c"
}
CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera) {
CameraSidebarEntry * self = NULL;
- DiscoveredCamera* _tmp0_ = NULL;
- DiscoveredCamera* _tmp1_ = NULL;
- DiscoveredCamera* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ DiscoveredCamera* _tmp0_;
+ DiscoveredCamera* _tmp1_;
+ DiscoveredCamera* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1024,14 +1021,14 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
self->priv->uri = _tmp4_;
#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return self;
-#line 1028 "Branch.c"
+#line 1025 "Branch.c"
}
CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) {
#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera);
-#line 1035 "Branch.c"
+#line 1032 "Branch.c"
}
@@ -1039,9 +1036,9 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
CameraSidebarEntry * self;
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
- DiscoveredCamera* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp4_ = NULL;
+ DiscoveredCamera* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 98 "/home/jens/Source/shotwell/src/camera/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1052,21 +1049,17 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
_tmp0_ = _tmp2_;
#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
if (_tmp0_ == NULL) {
-#line 1056 "Branch.c"
- const gchar* _tmp3_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- _tmp3_ = _ ("Camera");
#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- _tmp0_ = _tmp3_;
-#line 1062 "Branch.c"
+ _tmp0_ = _ ("Camera");
+#line 1055 "Branch.c"
}
#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- _tmp4_ = g_strdup (_tmp0_);
+ _tmp3_ = g_strdup (_tmp0_);
#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return result;
-#line 1070 "Branch.c"
+#line 1063 "Branch.c"
}
@@ -1074,9 +1067,9 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
CameraSidebarEntry * self;
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
- DiscoveredCamera* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp4_ = NULL;
+ DiscoveredCamera* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp4_;
#line 102 "/home/jens/Source/shotwell/src/camera/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1087,13 +1080,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
_tmp0_ = _tmp2_;
#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
if (_tmp0_ == NULL) {
-#line 1091 "Branch.c"
- const gchar* _tmp3_ = NULL;
+#line 1084 "Branch.c"
+ const gchar* _tmp3_;
#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp3_ = camera_branch_cameras_icon;
#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp0_ = _tmp3_;
-#line 1097 "Branch.c"
+#line 1090 "Branch.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
_tmp4_ = g_strdup (_tmp0_);
@@ -1101,22 +1094,22 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
result = _tmp4_;
#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return result;
-#line 1105 "Branch.c"
+#line 1098 "Branch.c"
}
static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
CameraSidebarEntry * self;
Page* result = NULL;
- DiscoveredCamera* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- ImportPage* _tmp7_ = NULL;
- Page* _tmp8_ = NULL;
+ DiscoveredCamera* _tmp0_;
+ Camera* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ ImportPage* _tmp7_;
+ Page* _tmp8_;
#line 106 "/home/jens/Source/shotwell/src/camera/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1147,14 +1140,14 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base
result = _tmp8_;
#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return result;
-#line 1151 "Branch.c"
+#line 1144 "Branch.c"
}
gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 110 "/home/jens/Source/shotwell/src/camera/Branch.vala"
g_return_val_if_fail (CAMERA_IS_SIDEBAR_ENTRY (self), NULL);
#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
@@ -1165,7 +1158,7 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
result = _tmp1_;
#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
return result;
-#line 1169 "Branch.c"
+#line 1162 "Branch.c"
}
@@ -1175,25 +1168,25 @@ 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 = (gchar* (*)(SidebarSimplePageEntry*)) 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 = (gchar* (*)(SidebarSimplePageEntry*)) 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 = (Page* (*)(SidebarSimplePageEntry*)) 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"
+#line 1179 "Branch.c"
}
static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) {
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1193 "Branch.c"
+#line 1186 "Branch.c"
}
-static void camera_sidebar_entry_finalize (GObject* obj) {
+static void camera_sidebar_entry_finalize (GObject * obj) {
CameraSidebarEntry * self;
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
@@ -1203,7 +1196,7 @@ static void camera_sidebar_entry_finalize (GObject* obj) {
_g_free0 (self->priv->uri);
#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj);
-#line 1207 "Branch.c"
+#line 1200 "Branch.c"
}
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index a67eb27..0d6d3ce 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.34.7, the Vala compiler
+/* Camera.c generated by valac 0.36.6, 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 bbf944b..864a4e8 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.34.7, the Vala compiler
+/* CameraTable.c generated by valac 0.36.6, the Vala compiler
* generated from CameraTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -103,6 +103,12 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
#define _gp_list_unref0(var) ((var == NULL) ? NULL : (var = (gp_list_unref (var), NULL)))
#define _discovered_camera_unref0(var) ((var == NULL) ? NULL : (var = (discovered_camera_unref (var), NULL)))
typedef struct _ParamSpecCameraTable ParamSpecCameraTable;
+enum {
+ CAMERA_TABLE_CAMERA_ADDED_SIGNAL,
+ CAMERA_TABLE_CAMERA_REMOVED_SIGNAL,
+ CAMERA_TABLE_LAST_SIGNAL
+};
+static guint camera_table_signals[CAMERA_TABLE_LAST_SIGNAL] = {0};
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -174,7 +180,7 @@ enum {
};
DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon);
DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon);
-static void discovered_camera_finalize (DiscoveredCamera* obj);
+static void discovered_camera_finalize (DiscoveredCamera * obj);
gpointer camera_table_ref (gpointer instance);
void camera_table_unref (gpointer instance);
GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -221,18 +227,18 @@ gint camera_table_get_count (CameraTable* self);
DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri);
static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error);
static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1);
-static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value);
static void _g_object_unref0_ (gpointer var);
static void _g_list_free__g_object_unref0_ (GList* self);
-static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar** full_port);
+static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port);
gchar* camera_table_get_port_uri (const gchar* port);
gchar* camera_table_get_port_path (const gchar* port);
static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid);
static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid);
-static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value);
+static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void camera_table_finalize (CameraTable* obj);
+static void camera_table_finalize (CameraTable * obj);
static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -241,20 +247,20 @@ static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL};
static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 245 "CameraTable.c"
+#line 251 "CameraTable.c"
}
DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
DiscoveredCamera* self = NULL;
- Camera* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ Camera* _tmp0_;
+ Camera* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (gcamera != NULL, NULL);
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -297,21 +303,21 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer
self->icon = _tmp7_;
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 301 "CameraTable.c"
+#line 307 "CameraTable.c"
}
DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon);
-#line 308 "CameraTable.c"
+#line 314 "CameraTable.c"
}
static void value_discovered_camera_init (GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 315 "CameraTable.c"
+#line 321 "CameraTable.c"
}
@@ -320,7 +326,7 @@ static void value_discovered_camera_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (value->data[0].v_pointer);
-#line 324 "CameraTable.c"
+#line 330 "CameraTable.c"
}
}
@@ -330,11 +336,11 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
if (src_value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = discovered_camera_ref (src_value->data[0].v_pointer);
-#line 334 "CameraTable.c"
+#line 340 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 338 "CameraTable.c"
+#line 344 "CameraTable.c"
}
}
@@ -342,66 +348,66 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
static gpointer value_discovered_camera_peek_pointer (const GValue* value) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 346 "CameraTable.c"
+#line 352 "CameraTable.c"
}
static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (collect_values[0].v_pointer) {
-#line 353 "CameraTable.c"
- DiscoveredCamera* object;
+#line 359 "CameraTable.c"
+ DiscoveredCamera * object;
object = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (object->parent_instance.g_class == NULL) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 360 "CameraTable.c"
+#line 366 "CameraTable.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 364 "CameraTable.c"
+#line 370 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = discovered_camera_ref (object);
-#line 368 "CameraTable.c"
+#line 374 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 372 "CameraTable.c"
+#line 378 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 376 "CameraTable.c"
+#line 382 "CameraTable.c"
}
static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- DiscoveredCamera** object_p;
+ DiscoveredCamera ** object_p;
object_p = collect_values[0].v_pointer;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!object_p) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 387 "CameraTable.c"
+#line 393 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!value->data[0].v_pointer) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = NULL;
-#line 393 "CameraTable.c"
+#line 399 "CameraTable.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = value->data[0].v_pointer;
-#line 397 "CameraTable.c"
+#line 403 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 401 "CameraTable.c"
+#line 407 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 405 "CameraTable.c"
+#line 411 "CameraTable.c"
}
@@ -415,7 +421,7 @@ GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return G_PARAM_SPEC (spec);
-#line 419 "CameraTable.c"
+#line 425 "CameraTable.c"
}
@@ -424,12 +430,12 @@ gpointer value_get_discovered_camera (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA), NULL);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return value->data[0].v_pointer;
-#line 428 "CameraTable.c"
+#line 434 "CameraTable.c"
}
void value_set_discovered_camera (GValue* value, gpointer v_object) {
- DiscoveredCamera* old;
+ DiscoveredCamera * old;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA));
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -444,23 +450,23 @@ void value_set_discovered_camera (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_ref (value->data[0].v_pointer);
-#line 448 "CameraTable.c"
+#line 454 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 452 "CameraTable.c"
+#line 458 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (old);
-#line 458 "CameraTable.c"
+#line 464 "CameraTable.c"
}
}
void value_take_discovered_camera (GValue* value, gpointer v_object) {
- DiscoveredCamera* old;
+ DiscoveredCamera * old;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA));
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -473,17 +479,17 @@ void value_take_discovered_camera (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = v_object;
-#line 477 "CameraTable.c"
+#line 483 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 481 "CameraTable.c"
+#line 487 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (old) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
discovered_camera_unref (old);
-#line 487 "CameraTable.c"
+#line 493 "CameraTable.c"
}
}
@@ -493,18 +499,18 @@ static void discovered_camera_class_init (DiscoveredCameraClass * klass) {
discovered_camera_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
((DiscoveredCameraClass *) klass)->finalize = discovered_camera_finalize;
-#line 497 "CameraTable.c"
+#line 503 "CameraTable.c"
}
static void discovered_camera_instance_init (DiscoveredCamera * self) {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 504 "CameraTable.c"
+#line 510 "CameraTable.c"
}
-static void discovered_camera_finalize (DiscoveredCamera* obj) {
+static void discovered_camera_finalize (DiscoveredCamera * obj) {
DiscoveredCamera * self;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DISCOVERED_CAMERA, DiscoveredCamera);
@@ -518,7 +524,7 @@ static void discovered_camera_finalize (DiscoveredCamera* obj) {
_g_free0 (self->display_name);
#line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->icon);
-#line 522 "CameraTable.c"
+#line 528 "CameraTable.c"
}
@@ -537,18 +543,18 @@ GType discovered_camera_get_type (void) {
gpointer discovered_camera_ref (gpointer instance) {
- DiscoveredCamera* self;
+ DiscoveredCamera * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_atomic_int_inc (&self->ref_count);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 547 "CameraTable.c"
+#line 553 "CameraTable.c"
}
void discovered_camera_unref (gpointer instance) {
- DiscoveredCamera* self;
+ DiscoveredCamera * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -556,7 +562,7 @@ void discovered_camera_unref (gpointer instance) {
DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 560 "CameraTable.c"
+#line 566 "CameraTable.c"
}
}
@@ -564,28 +570,28 @@ void discovered_camera_unref (gpointer instance) {
static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) {
#line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_update_cameras ((CameraTable*) self);
-#line 568 "CameraTable.c"
+#line 574 "CameraTable.c"
}
static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
#line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_udev_event ((CameraTable*) self, action, device);
-#line 575 "CameraTable.c"
+#line 581 "CameraTable.c"
}
static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
#line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 582 "CameraTable.c"
+#line 588 "CameraTable.c"
}
static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
#line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 589 "CameraTable.c"
+#line 595 "CameraTable.c"
}
@@ -594,17 +600,17 @@ static gboolean _camera_table_delayed_init_gsource_func (gpointer self) {
result = camera_table_delayed_init ((CameraTable*) self);
#line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 598 "CameraTable.c"
+#line 604 "CameraTable.c"
}
static CameraTable* camera_table_construct (GType object_type) {
CameraTable* self = NULL;
- OneShotScheduler* _tmp0_ = NULL;
- GUdevClient* _tmp1_ = NULL;
- GVolumeMonitor* _tmp2_ = NULL;
- GVolumeMonitor* _tmp3_ = NULL;
- GVolumeMonitor* _tmp4_ = NULL;
+ OneShotScheduler* _tmp0_;
+ GUdevClient* _tmp1_;
+ GVolumeMonitor* _tmp2_;
+ GVolumeMonitor* _tmp3_;
+ GVolumeMonitor* _tmp4_;
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self = (CameraTable*) g_type_create_instance (object_type);
#line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -635,23 +641,23 @@ static CameraTable* camera_table_construct (GType object_type) {
g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref);
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 639 "CameraTable.c"
+#line 645 "CameraTable.c"
}
static CameraTable* camera_table_new (void) {
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 646 "CameraTable.c"
+#line 652 "CameraTable.c"
}
static gboolean camera_table_delayed_init (CameraTable* self) {
gboolean result = FALSE;
- AppWindow* _tmp0_ = NULL;
- LibraryWindow* _tmp1_ = NULL;
- AppWindow* _tmp10_ = NULL;
- LibraryWindow* _tmp11_ = NULL;
+ AppWindow* _tmp0_;
+ LibraryWindow* _tmp1_;
+ AppWindow* _tmp10_;
+ LibraryWindow* _tmp11_;
GError * _inner_error_ = NULL;
#line 57 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
@@ -663,18 +669,18 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
library_window_set_page_switching_enabled (_tmp1_, FALSE);
#line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_tmp1_);
-#line 667 "CameraTable.c"
+#line 673 "CameraTable.c"
{
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_init_camera_table (self, &_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 673 "CameraTable.c"
+#line 679 "CameraTable.c"
gboolean _tmp2_ = FALSE;
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 677 "CameraTable.c"
- goto __catch57_gphoto_error;
+#line 683 "CameraTable.c"
+ goto __catch58_gphoto_error;
}
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -682,15 +688,15 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp2_;
-#line 686 "CameraTable.c"
+#line 692 "CameraTable.c"
}
}
- goto __finally57;
- __catch57_gphoto_error:
+ goto __finally58;
+ __catch58_gphoto_error:
{
GError* err = NULL;
- GError* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+ GError* _tmp3_;
+ const gchar* _tmp4_;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -707,12 +713,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
_g_error_free0 (err);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 711 "CameraTable.c"
+#line 717 "CameraTable.c"
}
- __finally57:
+ __finally58:
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 716 "CameraTable.c"
+#line 722 "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);
@@ -720,19 +726,19 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp5_;
-#line 724 "CameraTable.c"
+#line 730 "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"
+#line 737 "CameraTable.c"
gboolean _tmp6_ = FALSE;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 735 "CameraTable.c"
- goto __catch58_gphoto_error;
+#line 741 "CameraTable.c"
+ goto __catch59_gphoto_error;
}
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -740,15 +746,15 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp6_;
-#line 744 "CameraTable.c"
+#line 750 "CameraTable.c"
}
}
- goto __finally58;
- __catch58_gphoto_error:
+ goto __finally59;
+ __catch59_gphoto_error:
{
GError* err = NULL;
- GError* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+ GError* _tmp7_;
+ const gchar* _tmp8_;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -761,12 +767,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 765 "CameraTable.c"
+#line 771 "CameraTable.c"
}
- __finally58:
+ __finally59:
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 770 "CameraTable.c"
+#line 776 "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);
@@ -774,7 +780,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return _tmp9_;
-#line 778 "CameraTable.c"
+#line 784 "CameraTable.c"
}
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp10_ = app_window_get_instance ();
@@ -788,35 +794,35 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
result = FALSE;
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 792 "CameraTable.c"
+#line 798 "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 799 "CameraTable.c"
+#line 805 "CameraTable.c"
}
CameraTable* camera_table_get_instance (void) {
CameraTable* result = NULL;
- CameraTable* _tmp0_ = NULL;
- CameraTable* _tmp2_ = NULL;
- CameraTable* _tmp3_ = NULL;
+ CameraTable* _tmp0_;
+ CameraTable* _tmp2_;
+ CameraTable* _tmp3_;
#line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = camera_table_instance;
#line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp0_ == NULL) {
-#line 812 "CameraTable.c"
- CameraTable* _tmp1_ = NULL;
+#line 818 "CameraTable.c"
+ CameraTable* _tmp1_;
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = camera_table_new ();
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_camera_table_unref0 (camera_table_instance);
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_instance = _tmp1_;
-#line 820 "CameraTable.c"
+#line 826 "CameraTable.c"
}
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = camera_table_instance;
@@ -826,15 +832,15 @@ CameraTable* camera_table_get_instance (void) {
result = _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 830 "CameraTable.c"
+#line 836 "CameraTable.c"
}
GeeIterable* camera_table_get_cameras (CameraTable* self) {
GeeIterable* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
#line 89 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -847,15 +853,15 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
#line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 851 "CameraTable.c"
+#line 857 "CameraTable.c"
}
gint camera_table_get_count (CameraTable* self) {
gint result = 0;
- GeeHashMap* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeHashMap* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 93 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), 0);
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -868,15 +874,15 @@ gint camera_table_get_count (CameraTable* self) {
result = _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 872 "CameraTable.c"
+#line 878 "CameraTable.c"
}
DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri) {
DiscoveredCamera* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ const gchar* _tmp1_;
+ gpointer _tmp2_;
#line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
#line 97 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -891,12 +897,12 @@ 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 895 "CameraTable.c"
+#line 901 "CameraTable.c"
}
static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error) {
- int _tmp0_ = 0;
+ int _tmp0_;
GError * _inner_error_ = NULL;
#line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -906,12 +912,12 @@ 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 910 "CameraTable.c"
- int _tmp1_ = 0;
- const gchar* _tmp2_ = NULL;
- int _tmp3_ = 0;
- const gchar* _tmp4_ = NULL;
- GError* _tmp5_ = NULL;
+#line 916 "CameraTable.c"
+ int _tmp1_;
+ const gchar* _tmp2_;
+ int _tmp3_;
+ const gchar* _tmp4_;
+ GError* _tmp5_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = res;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -930,7 +936,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 934 "CameraTable.c"
+#line 940 "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);
@@ -938,7 +944,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 942 "CameraTable.c"
+#line 948 "CameraTable.c"
}
}
}
@@ -946,10 +952,10 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
static void camera_table_init_camera_table (CameraTable* self, GError** error) {
CameraAbilitiesList* _tmp0_ = NULL;
- int _tmp1_ = 0;
- CameraAbilitiesList* _tmp2_ = NULL;
- GPContext* _tmp3_ = NULL;
- int _tmp4_ = 0;
+ int _tmp1_;
+ CameraAbilitiesList* _tmp2_;
+ GPContext* _tmp3_;
+ int _tmp4_;
GError * _inner_error_ = NULL;
#line 106 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -969,7 +975,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 973 "CameraTable.c"
+#line 979 "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);
@@ -977,7 +983,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 981 "CameraTable.c"
+#line 987 "CameraTable.c"
}
}
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -996,7 +1002,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 1000 "CameraTable.c"
+#line 1006 "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);
@@ -1004,7 +1010,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 1008 "CameraTable.c"
+#line 1014 "CameraTable.c"
}
}
}
@@ -1013,31 +1019,31 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
static gpointer _g_object_ref0 (gpointer self) {
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self ? g_object_ref (self) : NULL;
-#line 1017 "CameraTable.c"
+#line 1023 "CameraTable.c"
}
-static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1028 "CameraTable.c"
+#line 1034 "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 1034 "CameraTable.c"
+#line 1040 "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 1041 "CameraTable.c"
+#line 1047 "CameraTable.c"
}
@@ -1046,22 +1052,22 @@ 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 1050 "CameraTable.c"
+#line 1056 "CameraTable.c"
}
static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1) {
gchar** result = NULL;
gchar** cameras = NULL;
- gchar** _tmp0_ = NULL;
- gint cameras_length1 = 0;
- gint _cameras_size_ = 0;
+ gchar** _tmp0_;
+ gint cameras_length1;
+ gint _cameras_size_;
GList* device_list = NULL;
- GUdevClient* _tmp1_ = NULL;
- GList* _tmp2_ = NULL;
- GList* _tmp3_ = NULL;
- gchar** _tmp25_ = NULL;
- gint _tmp25__length1 = 0;
+ GUdevClient* _tmp1_;
+ GList* _tmp2_;
+ GList* _tmp3_;
+ gchar** _tmp25_;
+ gint _tmp25__length1;
#line 111 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1080,7 +1086,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 1084 "CameraTable.c"
+#line 1090 "CameraTable.c"
{
GList* device_collection = NULL;
GList* device_it = NULL;
@@ -1088,22 +1094,22 @@ 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 1092 "CameraTable.c"
- GUdevDevice* _tmp4_ = NULL;
+#line 1098 "CameraTable.c"
+ GUdevDevice* _tmp4_;
GUdevDevice* device = NULL;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp4_ = _g_object_ref0 ((GUdevDevice*) device_it->data);
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
device = _tmp4_;
-#line 1099 "CameraTable.c"
+#line 1105 "CameraTable.c"
{
gchar* device_file = NULL;
- GUdevDevice* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ GUdevDevice* _tmp5_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
gboolean _tmp8_ = FALSE;
gboolean _tmp9_ = FALSE;
- const gchar* _tmp10_ = NULL;
+ const gchar* _tmp10_;
#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp5_ = device;
#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1116,62 +1122,62 @@ 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 1120 "CameraTable.c"
- GUdevDevice* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 1126 "CameraTable.c"
+ GUdevDevice* _tmp11_;
+ gboolean _tmp12_;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp11_ = device;
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = _tmp12_;
-#line 1129 "CameraTable.c"
+#line 1135 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = FALSE;
-#line 1133 "CameraTable.c"
+#line 1139 "CameraTable.c"
}
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp9_) {
-#line 1137 "CameraTable.c"
- GUdevDevice* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+#line 1143 "CameraTable.c"
+ GUdevDevice* _tmp13_;
+ gboolean _tmp14_;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp13_ = device;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = _tmp14_;
-#line 1146 "CameraTable.c"
+#line 1152 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = FALSE;
-#line 1150 "CameraTable.c"
+#line 1156 "CameraTable.c"
}
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp8_) {
-#line 1154 "CameraTable.c"
+#line 1160 "CameraTable.c"
gint camera_bus = 0;
gint camera_device = 0;
- const gchar* _tmp15_ = NULL;
- gint _tmp16_ = 0;
+ const gchar* _tmp15_;
+ gint _tmp16_;
gchar* camera = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gchar* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- gchar** _tmp22_ = NULL;
- gint _tmp22__length1 = 0;
- const gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
+ gint _tmp18_;
+ gint _tmp19_;
+ gchar* _tmp20_;
+ const gchar* _tmp21_;
+ gchar** _tmp22_;
+ gint _tmp22__length1;
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = device_file;
#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_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 1174 "CameraTable.c"
- const gchar* _tmp17_ = NULL;
+#line 1180 "CameraTable.c"
+ const gchar* _tmp17_;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = device_file;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1183,7 +1189,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 1186 "CameraTable.c"
+#line 1192 "CameraTable.c"
}
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp18_ = camera_bus;
@@ -1209,13 +1215,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 1212 "CameraTable.c"
+#line 1218 "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 1218 "CameraTable.c"
+#line 1224 "CameraTable.c"
}
}
}
@@ -1227,7 +1233,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 1230 "CameraTable.c"
+#line 1236 "CameraTable.c"
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = _tmp25_;
@@ -1235,26 +1241,26 @@ 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 1238 "CameraTable.c"
+#line 1244 "CameraTable.c"
}
-static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar** full_port) {
+static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port) {
gchar* _vala_full_port = NULL;
gboolean result = FALSE;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- const gchar* _tmp2_ = NULL;
+ gint _tmp0_;
+ gint _tmp1_;
+ const gchar* _tmp2_;
gboolean _tmp3_ = FALSE;
- gint _tmp4_ = 0;
- const gchar* _tmp11_ = NULL;
+ gint _tmp4_;
+ const gchar* _tmp11_;
gint bus = 0;
gint device = 0;
- const gchar* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gchar** _tmp16_ = NULL;
- gint _tmp16__length1 = 0;
- const gchar* _tmp30_ = NULL;
+ const gchar* _tmp13_;
+ gint _tmp14_;
+ gchar** _tmp16_;
+ gint _tmp16__length1;
+ const gchar* _tmp30_;
#line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
#line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1277,30 +1283,30 @@ 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 1280 "CameraTable.c"
- gchar** _tmp5_ = NULL;
- gint _tmp5__length1 = 0;
+#line 1286 "CameraTable.c"
+ gchar** _tmp5_;
+ gint _tmp5__length1;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp5_ = usb_cameras;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp5__length1 = usb_cameras_length1;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = _tmp5__length1 == 1;
-#line 1289 "CameraTable.c"
+#line 1295 "CameraTable.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = FALSE;
-#line 1293 "CameraTable.c"
+#line 1299 "CameraTable.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp3_) {
-#line 1297 "CameraTable.c"
- gchar** _tmp6_ = NULL;
- gint _tmp6__length1 = 0;
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
+#line 1303 "CameraTable.c"
+ gchar** _tmp6_;
+ gint _tmp6__length1;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
+ const gchar* _tmp9_;
+ const gchar* _tmp10_;
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp6_ = usb_cameras;
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1325,22 +1331,22 @@ 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 1328 "CameraTable.c"
+#line 1334 "CameraTable.c"
} else {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1332 "CameraTable.c"
+#line 1338 "CameraTable.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1336 "CameraTable.c"
+#line 1342 "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 1342 "CameraTable.c"
- const gchar* _tmp12_ = NULL;
+#line 1348 "CameraTable.c"
+ const gchar* _tmp12_;
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp12_ = port;
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1351,15 +1357,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 1354 "CameraTable.c"
+#line 1360 "CameraTable.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1358 "CameraTable.c"
+#line 1364 "CameraTable.c"
}
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1362 "CameraTable.c"
+#line 1368 "CameraTable.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp13_ = port;
@@ -1367,8 +1373,8 @@ 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 1370 "CameraTable.c"
- const gchar* _tmp15_ = NULL;
+#line 1376 "CameraTable.c"
+ const gchar* _tmp15_;
#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = port;
#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1379,21 +1385,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 1382 "CameraTable.c"
+#line 1388 "CameraTable.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1386 "CameraTable.c"
+#line 1392 "CameraTable.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1390 "CameraTable.c"
+#line 1396 "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 1396 "CameraTable.c"
+#line 1402 "CameraTable.c"
{
gchar** usb_camera_collection = NULL;
gint usb_camera_collection_length1 = 0;
@@ -1405,30 +1411,30 @@ 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 1408 "CameraTable.c"
- gchar* _tmp17_ = NULL;
+#line 1414 "CameraTable.c"
+ gchar* _tmp17_;
gchar* usb_camera = NULL;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]);
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
usb_camera = _tmp17_;
-#line 1415 "CameraTable.c"
+#line 1421 "CameraTable.c"
{
gint camera_bus = 0;
gint camera_device = 0;
- const gchar* _tmp18_ = NULL;
- gint _tmp19_ = 0;
+ const gchar* _tmp18_;
+ gint _tmp19_;
gboolean _tmp21_ = FALSE;
- gint _tmp22_ = 0;
- gint _tmp23_ = 0;
+ gint _tmp22_;
+ gint _tmp23_;
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp18_ = usb_camera;
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp19_ < 2) {
-#line 1430 "CameraTable.c"
- const gchar* _tmp20_ = NULL;
+#line 1436 "CameraTable.c"
+ const gchar* _tmp20_;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp20_ = usb_camera;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1437,7 +1443,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 1440 "CameraTable.c"
+#line 1446 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp22_ = bus;
@@ -1445,28 +1451,28 @@ 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 1448 "CameraTable.c"
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+#line 1454 "CameraTable.c"
+ gint _tmp24_;
+ gint _tmp25_;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp24_ = device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp25_ = camera_device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = _tmp24_ == _tmp25_;
-#line 1457 "CameraTable.c"
+#line 1463 "CameraTable.c"
} else {
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp21_ = FALSE;
-#line 1461 "CameraTable.c"
+#line 1467 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp21_) {
-#line 1465 "CameraTable.c"
- const gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
+#line 1471 "CameraTable.c"
+ const gchar* _tmp26_;
+ gchar* _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp26_ = port;
#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1489,19 +1495,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 1492 "CameraTable.c"
+#line 1498 "CameraTable.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1496 "CameraTable.c"
+#line 1502 "CameraTable.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1500 "CameraTable.c"
+#line 1506 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
-#line 1504 "CameraTable.c"
+#line 1510 "CameraTable.c"
}
}
}
@@ -1516,22 +1522,22 @@ 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 1518 "CameraTable.c"
+#line 1524 "CameraTable.c"
} else {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1522 "CameraTable.c"
+#line 1528 "CameraTable.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1526 "CameraTable.c"
+#line 1532 "CameraTable.c"
}
gchar* camera_table_get_port_uri (const gchar* port) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 205 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (port != NULL, NULL);
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1542,50 +1548,50 @@ gchar* camera_table_get_port_uri (const gchar* port) {
result = _tmp1_;
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1544 "CameraTable.c"
+#line 1550 "CameraTable.c"
}
static glong string_strnlen (gchar* str, glong maxlen) {
glong result = 0L;
gchar* end = NULL;
- gchar* _tmp0_ = NULL;
- glong _tmp1_ = 0L;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 1567 "CameraTable.c"
- glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1573 "CameraTable.c"
+ glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1575 "CameraTable.c"
+#line 1581 "CameraTable.c"
} else {
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1587 "CameraTable.c"
+#line 1593 "CameraTable.c"
}
}
@@ -1594,242 +1600,284 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_ = 0L;
- glong _tmp8_ = 0L;
- glong _tmp14_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- glong _tmp21_ = 0L;
- gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp1_;
+ glong _tmp8_;
+ glong _tmp14_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ glong _tmp21_;
+ gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 1611 "CameraTable.c"
- glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1617 "CameraTable.c"
+ glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1617 "CameraTable.c"
+#line 1623 "CameraTable.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1621 "CameraTable.c"
+#line 1627 "CameraTable.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1625 "CameraTable.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1631 "CameraTable.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 1637 "CameraTable.c"
+#line 1643 "CameraTable.c"
} else {
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp6_;
+ gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 1647 "CameraTable.c"
+#line 1653 "CameraTable.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 1653 "CameraTable.c"
- glong _tmp9_ = 0L;
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1659 "CameraTable.c"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1667 "CameraTable.c"
+#line 1673 "CameraTable.c"
} else {
- glong _tmp12_ = 0L;
- glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp12_;
+ glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1677 "CameraTable.c"
+#line 1683 "CameraTable.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 1683 "CameraTable.c"
- glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1689 "CameraTable.c"
+ glong _tmp15_;
+ glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 1692 "CameraTable.c"
+#line 1698 "CameraTable.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1712 "CameraTable.c"
+#line 1718 "CameraTable.c"
}
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
+ gboolean _tmp0_ = FALSE;
+ gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1725 "CameraTable.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = TRUE;
+#line 1737 "CameraTable.c"
+ } else {
+ const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 1744 "CameraTable.c"
+ }
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = TRUE;
+#line 1750 "CameraTable.c"
+ } else {
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 1760 "CameraTable.c"
+ }
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 1764 "CameraTable.c"
+ gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ return result;
+#line 1772 "CameraTable.c"
+ }
{
GRegex* regex = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- GRegex* _tmp3_ = NULL;
- GRegex* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- GRegex* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ GRegex* _tmp9_;
+ GRegex* _tmp10_;
+ gchar* _tmp11_ = NULL;
+ GRegex* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1756 "CameraTable.c"
- goto __catch59_g_regex_error;
+#line 1804 "CameraTable.c"
+ goto __catch60_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1765 "CameraTable.c"
+#line 1813 "CameraTable.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1781 "CameraTable.c"
- goto __catch59_g_regex_error;
+#line 1829 "CameraTable.c"
+ goto __catch60_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1792 "CameraTable.c"
+#line 1840 "CameraTable.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1806 "CameraTable.c"
+#line 1854 "CameraTable.c"
}
- goto __finally59;
- __catch59_g_regex_error:
+ goto __finally60;
+ __catch60_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 1820 "CameraTable.c"
+#line 1868 "CameraTable.c"
}
- __finally59:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ __finally60:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
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 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 1831 "CameraTable.c"
+#line 1879 "CameraTable.c"
}
}
@@ -1837,8 +1885,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
gchar* camera_table_get_port_path (const gchar* port) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 209 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (port != NULL, NULL);
#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1847,13 +1895,13 @@ 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 1849 "CameraTable.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+#line 1897 "CameraTable.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = port;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1874,26 +1922,26 @@ 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 1876 "CameraTable.c"
+#line 1924 "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 1882 "CameraTable.c"
+#line 1930 "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 1888 "CameraTable.c"
+#line 1936 "CameraTable.c"
}
static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid) {
gchar* result = NULL;
- GVolumeMonitor* _tmp0_ = NULL;
- GList* _tmp1_ = NULL;
+ GVolumeMonitor* _tmp0_;
+ GList* _tmp1_;
#line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
#line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1902,7 +1950,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 1904 "CameraTable.c"
+#line 1952 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1910,20 +1958,20 @@ 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 1912 "CameraTable.c"
- GVolume* _tmp2_ = NULL;
+#line 1960 "CameraTable.c"
+ GVolume* _tmp2_;
GVolume* volume = NULL;
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 1919 "CameraTable.c"
+#line 1967 "CameraTable.c"
{
- GVolume* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GVolume* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gboolean _tmp7_;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = volume;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1938,9 +1986,9 @@ 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 1940 "CameraTable.c"
- GVolume* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
+#line 1988 "CameraTable.c"
+ GVolume* _tmp8_;
+ gchar* _tmp9_;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = volume;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1953,29 +2001,29 @@ 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 1955 "CameraTable.c"
+#line 2003 "CameraTable.c"
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 1959 "CameraTable.c"
+#line 2007 "CameraTable.c"
}
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 1964 "CameraTable.c"
+#line 2012 "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 1970 "CameraTable.c"
+#line 2018 "CameraTable.c"
}
static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid) {
gchar* result = NULL;
- GVolumeMonitor* _tmp0_ = NULL;
- GList* _tmp1_ = NULL;
+ GVolumeMonitor* _tmp0_;
+ GList* _tmp1_;
#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1984,7 +2032,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 1986 "CameraTable.c"
+#line 2034 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1992,20 +2040,20 @@ 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 1994 "CameraTable.c"
- GVolume* _tmp2_ = NULL;
+#line 2042 "CameraTable.c"
+ GVolume* _tmp2_;
GVolume* volume = NULL;
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
volume = _tmp2_;
-#line 2001 "CameraTable.c"
+#line 2049 "CameraTable.c"
{
- GVolume* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GVolume* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ gboolean _tmp7_;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = volume;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2020,12 +2068,12 @@ 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 2022 "CameraTable.c"
- GVolume* _tmp8_ = NULL;
- GIcon* _tmp9_ = NULL;
- GIcon* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
+#line 2070 "CameraTable.c"
+ GVolume* _tmp8_;
+ GIcon* _tmp9_;
+ GIcon* _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = volume;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2046,76 +2094,76 @@ 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 2048 "CameraTable.c"
+#line 2096 "CameraTable.c"
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2052 "CameraTable.c"
+#line 2100 "CameraTable.c"
}
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2057 "CameraTable.c"
+#line 2105 "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 2063 "CameraTable.c"
+#line 2111 "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 2070 "CameraTable.c"
+#line 2118 "CameraTable.c"
}
-static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value) {
+static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2081 "CameraTable.c"
+#line 2129 "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 2087 "CameraTable.c"
+#line 2135 "CameraTable.c"
}
static void camera_table_update_camera_table (CameraTable* self, GError** error) {
GPPortInfoList* port_info_list = NULL;
GPPortInfoList* _tmp0_ = NULL;
- int _tmp1_ = 0;
- GPPortInfoList* _tmp2_ = NULL;
- int _tmp3_ = 0;
+ int _tmp1_;
+ GPPortInfoList* _tmp2_;
+ int _tmp3_;
CameraList* camera_list = NULL;
CameraList* _tmp4_ = NULL;
- int _tmp5_ = 0;
- CameraAbilitiesList* _tmp6_ = NULL;
- GPPortInfoList* _tmp7_ = NULL;
- CameraList* _tmp8_ = NULL;
- GPContext* _tmp9_ = NULL;
- int _tmp10_ = 0;
+ int _tmp5_;
+ CameraAbilitiesList* _tmp6_;
+ GPPortInfoList* _tmp7_;
+ CameraList* _tmp8_;
+ GPContext* _tmp9_;
+ int _tmp10_;
GeeHashMap* detected_map = NULL;
- GeeHashMap* _tmp11_ = NULL;
+ GeeHashMap* _tmp11_;
gchar** usb_cameras = NULL;
- gint _tmp12_ = 0;
- gchar** _tmp13_ = NULL;
- gint usb_cameras_length1 = 0;
- gint _usb_cameras_size_ = 0;
+ gint _tmp12_;
+ gchar** _tmp13_;
+ gint usb_cameras_length1;
+ gint _usb_cameras_size_;
DiscoveredCamera** missing = NULL;
- DiscoveredCamera** _tmp47_ = NULL;
- gint missing_length1 = 0;
- gint _missing_size_ = 0;
- DiscoveredCamera** _tmp80_ = NULL;
- gint _tmp80__length1 = 0;
+ DiscoveredCamera** _tmp47_;
+ gint missing_length1;
+ gint _missing_size_;
+ DiscoveredCamera** _tmp80_;
+ gint _tmp80__length1;
GError * _inner_error_ = NULL;
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -2137,7 +2185,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 2139 "CameraTable.c"
+#line 2187 "CameraTable.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2147,7 +2195,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 2149 "CameraTable.c"
+#line 2197 "CameraTable.c"
}
}
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2166,7 +2214,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 2168 "CameraTable.c"
+#line 2216 "CameraTable.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2176,7 +2224,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 2178 "CameraTable.c"
+#line 2226 "CameraTable.c"
}
}
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2199,7 +2247,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 2201 "CameraTable.c"
+#line 2249 "CameraTable.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2211,7 +2259,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 2213 "CameraTable.c"
+#line 2261 "CameraTable.c"
}
}
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2238,7 +2286,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 2240 "CameraTable.c"
+#line 2288 "CameraTable.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2250,7 +2298,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 2252 "CameraTable.c"
+#line 2300 "CameraTable.c"
}
}
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2265,53 +2313,53 @@ 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 2267 "CameraTable.c"
+#line 2315 "CameraTable.c"
{
gint ctr = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = 0;
-#line 2272 "CameraTable.c"
+#line 2320 "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 2279 "CameraTable.c"
- gint _tmp16_ = 0;
- CameraList* _tmp17_ = NULL;
- gint _tmp18_ = 0;
+#line 2327 "CameraTable.c"
+ gint _tmp16_;
+ CameraList* _tmp17_;
+ gint _tmp18_;
gchar* name = NULL;
- CameraList* _tmp19_ = NULL;
- gint _tmp20_ = 0;
+ CameraList* _tmp19_;
+ gint _tmp20_;
const gchar* _tmp21_ = NULL;
- int _tmp22_ = 0;
- gchar* _tmp23_ = NULL;
+ int _tmp22_;
+ gchar* _tmp23_;
gchar* port = NULL;
- CameraList* _tmp24_ = NULL;
- gint _tmp25_ = 0;
+ CameraList* _tmp24_;
+ gint _tmp25_;
const gchar* _tmp26_ = NULL;
- int _tmp27_ = 0;
- gchar* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- CameraList* _tmp30_ = NULL;
- gint _tmp31_ = 0;
- const gchar* _tmp32_ = NULL;
- const gchar* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
- GeeHashMap* _tmp44_ = NULL;
- const gchar* _tmp45_ = NULL;
- const gchar* _tmp46_ = NULL;
+ int _tmp27_;
+ gchar* _tmp28_;
+ gint _tmp29_;
+ CameraList* _tmp30_;
+ gint _tmp31_;
+ const gchar* _tmp32_;
+ const gchar* _tmp33_;
+ const gchar* _tmp34_;
+ gboolean _tmp35_;
+ GeeHashMap* _tmp44_;
+ const gchar* _tmp45_;
+ const gchar* _tmp46_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (!_tmp14_) {
-#line 2307 "CameraTable.c"
- gint _tmp15_ = 0;
+#line 2355 "CameraTable.c"
+ gint _tmp15_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp15_ = ctr;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = _tmp15_ + 1;
-#line 2313 "CameraTable.c"
+#line 2361 "CameraTable.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp14_ = FALSE;
@@ -2325,7 +2373,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 2327 "CameraTable.c"
+#line 2375 "CameraTable.c"
}
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp19_ = camera_list;
@@ -2359,7 +2407,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 2361 "CameraTable.c"
+#line 2409 "CameraTable.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
@@ -2377,7 +2425,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 2379 "CameraTable.c"
+#line 2427 "CameraTable.c"
}
}
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2414,7 +2462,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 2416 "CameraTable.c"
+#line 2464 "CameraTable.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
@@ -2434,7 +2482,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 2436 "CameraTable.c"
+#line 2484 "CameraTable.c"
}
}
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2455,17 +2503,17 @@ 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 2457 "CameraTable.c"
+#line 2505 "CameraTable.c"
gchar* full_port = NULL;
- CameraList* _tmp36_ = NULL;
- gint _tmp37_ = 0;
- gchar** _tmp38_ = NULL;
- gint _tmp38__length1 = 0;
- const gchar* _tmp39_ = NULL;
+ CameraList* _tmp36_;
+ gint _tmp37_;
+ gchar** _tmp38_;
+ gint _tmp38__length1;
+ const gchar* _tmp39_;
gchar* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
- const gchar* _tmp42_ = NULL;
- gchar* _tmp43_ = NULL;
+ gboolean _tmp41_;
+ const gchar* _tmp42_;
+ gchar* _tmp43_;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp36_ = camera_list;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2492,7 +2540,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 2494 "CameraTable.c"
+#line 2542 "CameraTable.c"
}
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp42_ = full_port;
@@ -2504,7 +2552,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 2506 "CameraTable.c"
+#line 2554 "CameraTable.c"
}
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp44_ = detected_map;
@@ -2518,7 +2566,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 2520 "CameraTable.c"
+#line 2568 "CameraTable.c"
}
}
}
@@ -2530,15 +2578,15 @@ 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 2532 "CameraTable.c"
+#line 2580 "CameraTable.c"
{
GeeIterator* _camera_it = NULL;
- GeeHashMap* _tmp48_ = NULL;
- GeeCollection* _tmp49_ = NULL;
- GeeCollection* _tmp50_ = NULL;
- GeeCollection* _tmp51_ = NULL;
- GeeIterator* _tmp52_ = NULL;
- GeeIterator* _tmp53_ = NULL;
+ GeeHashMap* _tmp48_;
+ GeeCollection* _tmp49_;
+ GeeCollection* _tmp50_;
+ GeeCollection* _tmp51_;
+ GeeIterator* _tmp52_;
+ GeeIterator* _tmp53_;
#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"
@@ -2557,35 +2605,35 @@ 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 2559 "CameraTable.c"
- GeeIterator* _tmp54_ = NULL;
- gboolean _tmp55_ = FALSE;
+#line 2607 "CameraTable.c"
+ GeeIterator* _tmp54_;
+ gboolean _tmp55_;
DiscoveredCamera* camera = NULL;
- GeeIterator* _tmp56_ = NULL;
- gpointer _tmp57_ = NULL;
+ GeeIterator* _tmp56_;
+ gpointer _tmp57_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- DiscoveredCamera* _tmp58_ = NULL;
- Camera* _tmp59_ = NULL;
+ DiscoveredCamera* _tmp58_;
+ Camera* _tmp59_;
GPPortInfo _tmp60_ = {0};
- int _tmp61_ = 0;
+ int _tmp61_;
const gchar* _tmp62_ = NULL;
- gchar* _tmp63_ = NULL;
+ gchar* _tmp63_;
CameraAbilities abilities = {0};
- DiscoveredCamera* _tmp64_ = NULL;
- Camera* _tmp65_ = NULL;
+ DiscoveredCamera* _tmp64_;
+ Camera* _tmp65_;
CameraAbilities _tmp66_ = {0};
- int _tmp67_ = 0;
- GeeHashMap* _tmp68_ = NULL;
- const gchar* _tmp69_ = NULL;
- gboolean _tmp70_ = FALSE;
- CameraAbilities _tmp74_ = {0};
- const gchar* _tmp75_ = NULL;
- const gchar* _tmp76_ = NULL;
- DiscoveredCamera** _tmp77_ = NULL;
- gint _tmp77__length1 = 0;
- DiscoveredCamera* _tmp78_ = NULL;
- DiscoveredCamera* _tmp79_ = NULL;
+ int _tmp67_;
+ GeeHashMap* _tmp68_;
+ const gchar* _tmp69_;
+ gboolean _tmp70_;
+ CameraAbilities _tmp74_;
+ const gchar* _tmp75_;
+ const gchar* _tmp76_;
+ DiscoveredCamera** _tmp77_;
+ gint _tmp77__length1;
+ DiscoveredCamera* _tmp78_;
+ DiscoveredCamera* _tmp79_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp54_ = _camera_it;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2594,7 +2642,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 2596 "CameraTable.c"
+#line 2644 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp56_ = _camera_it;
@@ -2640,7 +2688,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 2642 "CameraTable.c"
+#line 2690 "CameraTable.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2666,7 +2714,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 2668 "CameraTable.c"
+#line 2716 "CameraTable.c"
}
}
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2717,7 +2765,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 2719 "CameraTable.c"
+#line 2767 "CameraTable.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2745,7 +2793,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 2747 "CameraTable.c"
+#line 2795 "CameraTable.c"
}
}
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2756,10 +2804,10 @@ 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 2758 "CameraTable.c"
- CameraAbilities _tmp71_ = {0};
- const gchar* _tmp72_ = NULL;
- const gchar* _tmp73_ = NULL;
+#line 2806 "CameraTable.c"
+ CameraAbilities _tmp71_;
+ const gchar* _tmp72_;
+ const gchar* _tmp73_;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp71_ = abilities;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2778,7 +2826,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 2780 "CameraTable.c"
+#line 2828 "CameraTable.c"
}
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp74_ = abilities;
@@ -2806,17 +2854,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 2808 "CameraTable.c"
+#line 2856 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_camera_it);
-#line 2812 "CameraTable.c"
+#line 2860 "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 2818 "CameraTable.c"
+#line 2866 "CameraTable.c"
{
DiscoveredCamera** camera_collection = NULL;
gint camera_collection_length1 = 0;
@@ -2828,36 +2876,36 @@ 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 2830 "CameraTable.c"
- DiscoveredCamera* _tmp81_ = NULL;
+#line 2878 "CameraTable.c"
+ DiscoveredCamera* _tmp81_;
DiscoveredCamera* camera = NULL;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera = _tmp81_;
-#line 2837 "CameraTable.c"
+#line 2885 "CameraTable.c"
{
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- DiscoveredCamera* _tmp82_ = NULL;
- Camera* _tmp83_ = NULL;
+ DiscoveredCamera* _tmp82_;
+ Camera* _tmp83_;
GPPortInfo _tmp84_ = {0};
- int _tmp85_ = 0;
+ int _tmp85_;
const gchar* _tmp86_ = NULL;
- gchar* _tmp87_ = NULL;
+ gchar* _tmp87_;
CameraAbilities abilities = {0};
- DiscoveredCamera* _tmp88_ = NULL;
- Camera* _tmp89_ = NULL;
+ DiscoveredCamera* _tmp88_;
+ Camera* _tmp89_;
CameraAbilities _tmp90_ = {0};
- int _tmp91_ = 0;
- CameraAbilities _tmp92_ = {0};
- const gchar* _tmp93_ = NULL;
- const gchar* _tmp94_ = NULL;
- GeeHashMap* _tmp95_ = NULL;
- const gchar* _tmp96_ = NULL;
- gchar* _tmp97_ = NULL;
- gchar* _tmp98_ = NULL;
- DiscoveredCamera* _tmp99_ = NULL;
+ int _tmp91_;
+ CameraAbilities _tmp92_;
+ const gchar* _tmp93_;
+ const gchar* _tmp94_;
+ GeeHashMap* _tmp95_;
+ const gchar* _tmp96_;
+ gchar* _tmp97_;
+ gchar* _tmp98_;
+ DiscoveredCamera* _tmp99_;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp82_ = camera;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2894,7 +2942,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 2896 "CameraTable.c"
+#line 2944 "CameraTable.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2918,7 +2966,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 2920 "CameraTable.c"
+#line 2968 "CameraTable.c"
}
}
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2967,7 +3015,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 2969 "CameraTable.c"
+#line 3017 "CameraTable.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2993,7 +3041,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 2995 "CameraTable.c"
+#line 3043 "CameraTable.c"
}
}
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3019,7 +3067,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp99_ = camera;
#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_signal_emit_by_name (self, "camera-removed", _tmp99_);
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp99_);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3028,18 +3076,18 @@ 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 3030 "CameraTable.c"
+#line 3078 "CameraTable.c"
}
}
}
{
GeeIterator* _port_it = NULL;
- GeeHashMap* _tmp100_ = NULL;
- GeeSet* _tmp101_ = NULL;
- GeeSet* _tmp102_ = NULL;
- GeeSet* _tmp103_ = NULL;
- GeeIterator* _tmp104_ = NULL;
- GeeIterator* _tmp105_ = NULL;
+ GeeHashMap* _tmp100_;
+ GeeSet* _tmp101_;
+ GeeSet* _tmp102_;
+ GeeSet* _tmp103_;
+ GeeIterator* _tmp104_;
+ GeeIterator* _tmp105_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp100_ = detected_map;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3058,90 +3106,90 @@ 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 3060 "CameraTable.c"
- GeeIterator* _tmp106_ = NULL;
- gboolean _tmp107_ = FALSE;
+#line 3108 "CameraTable.c"
+ GeeIterator* _tmp106_;
+ gboolean _tmp107_;
gchar* port = NULL;
- GeeIterator* _tmp108_ = NULL;
- gpointer _tmp109_ = NULL;
+ GeeIterator* _tmp108_;
+ gpointer _tmp109_;
gchar* name = NULL;
- GeeHashMap* _tmp110_ = NULL;
- const gchar* _tmp111_ = NULL;
- gpointer _tmp112_ = NULL;
+ GeeHashMap* _tmp110_;
+ const gchar* _tmp111_;
+ gpointer _tmp112_;
gchar* display_name = NULL;
gchar* icon = NULL;
gchar* uri = NULL;
- const gchar* _tmp113_ = NULL;
- gchar* _tmp114_ = NULL;
- GeeHashMap* _tmp115_ = NULL;
- const gchar* _tmp116_ = NULL;
- gboolean _tmp117_ = FALSE;
+ const gchar* _tmp113_;
+ gchar* _tmp114_;
+ GeeHashMap* _tmp115_;
+ const gchar* _tmp116_;
+ gboolean _tmp117_;
gchar* path = NULL;
- const gchar* _tmp120_ = NULL;
- gchar* _tmp121_ = NULL;
- const gchar* _tmp122_ = NULL;
- const gchar* _tmp142_ = NULL;
+ const gchar* _tmp120_;
+ gchar* _tmp121_;
+ const gchar* _tmp122_;
+ const gchar* _tmp142_;
gint index = 0;
- GPPortInfoList* _tmp145_ = NULL;
- const gchar* _tmp146_ = NULL;
- gint _tmp147_ = 0;
- gint _tmp148_ = 0;
+ GPPortInfoList* _tmp145_;
+ const gchar* _tmp146_;
+ gint _tmp147_;
+ gint _tmp148_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- GPPortInfoList* _tmp153_ = NULL;
- gint _tmp154_ = 0;
+ GPPortInfoList* _tmp153_;
+ gint _tmp154_;
GPPortInfo _tmp155_ = {0};
- int _tmp156_ = 0;
- const gchar* _tmp157_ = NULL;
- gchar* _tmp158_ = NULL;
- gchar* _tmp159_ = NULL;
+ int _tmp156_;
+ const gchar* _tmp157_;
+ gchar* _tmp158_;
+ gchar* _tmp159_;
const gchar* _tmp160_ = NULL;
- gchar* _tmp161_ = NULL;
- const gchar* _tmp162_ = NULL;
- const gchar* _tmp163_ = NULL;
- CameraAbilitiesList* _tmp164_ = NULL;
- const gchar* _tmp165_ = NULL;
- gint _tmp166_ = 0;
- gint _tmp167_ = 0;
+ gchar* _tmp161_;
+ const gchar* _tmp162_;
+ const gchar* _tmp163_;
+ CameraAbilitiesList* _tmp164_;
+ const gchar* _tmp165_;
+ gint _tmp166_;
+ gint _tmp167_;
CameraAbilities camera_abilities = {0};
- CameraAbilitiesList* _tmp172_ = NULL;
- gint _tmp173_ = 0;
+ CameraAbilitiesList* _tmp172_;
+ gint _tmp173_;
CameraAbilities _tmp174_ = {0};
- int _tmp175_ = 0;
- const gchar* _tmp176_ = NULL;
- gchar* _tmp177_ = NULL;
- gchar* _tmp178_ = NULL;
+ int _tmp175_;
+ const gchar* _tmp176_;
+ gchar* _tmp177_;
+ gchar* _tmp178_;
Camera* gcamera = NULL;
Camera* _tmp179_ = NULL;
- int _tmp180_ = 0;
- const gchar* _tmp181_ = NULL;
- gchar* _tmp182_ = NULL;
- gchar* _tmp183_ = NULL;
- Camera* _tmp184_ = NULL;
- CameraAbilities _tmp185_ = {0};
- int _tmp186_ = 0;
- const gchar* _tmp187_ = NULL;
- gchar* _tmp188_ = NULL;
- gchar* _tmp189_ = NULL;
- Camera* _tmp190_ = NULL;
- GPPortInfo _tmp191_ = {0};
- int _tmp192_ = 0;
- const gchar* _tmp193_ = NULL;
- const gchar* _tmp194_ = NULL;
- gchar* _tmp195_ = NULL;
- gchar* _tmp196_ = NULL;
- const gchar* _tmp197_ = NULL;
- const gchar* _tmp198_ = NULL;
+ int _tmp180_;
+ const gchar* _tmp181_;
+ gchar* _tmp182_;
+ gchar* _tmp183_;
+ Camera* _tmp184_;
+ CameraAbilities _tmp185_;
+ int _tmp186_;
+ const gchar* _tmp187_;
+ gchar* _tmp188_;
+ gchar* _tmp189_;
+ Camera* _tmp190_;
+ GPPortInfo _tmp191_;
+ int _tmp192_;
+ const gchar* _tmp193_;
+ const gchar* _tmp194_;
+ gchar* _tmp195_;
+ gchar* _tmp196_;
+ const gchar* _tmp197_;
+ const gchar* _tmp198_;
DiscoveredCamera* camera = NULL;
- Camera* _tmp199_ = NULL;
- const gchar* _tmp200_ = NULL;
- const gchar* _tmp201_ = NULL;
- const gchar* _tmp202_ = NULL;
- DiscoveredCamera* _tmp203_ = NULL;
- GeeHashMap* _tmp204_ = NULL;
- const gchar* _tmp205_ = NULL;
- DiscoveredCamera* _tmp206_ = NULL;
- DiscoveredCamera* _tmp207_ = NULL;
+ Camera* _tmp199_;
+ const gchar* _tmp200_;
+ const gchar* _tmp201_;
+ const gchar* _tmp202_;
+ DiscoveredCamera* _tmp203_;
+ GeeHashMap* _tmp204_;
+ const gchar* _tmp205_;
+ DiscoveredCamera* _tmp206_;
+ DiscoveredCamera* _tmp207_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp106_ = _port_it;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3150,7 +3198,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 3152 "CameraTable.c"
+#line 3200 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp108_ = _port_it;
@@ -3184,9 +3232,9 @@ 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 3186 "CameraTable.c"
- const gchar* _tmp118_ = NULL;
- const gchar* _tmp119_ = NULL;
+#line 3234 "CameraTable.c"
+ const gchar* _tmp118_;
+ const gchar* _tmp119_;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp118_ = name;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3205,7 +3253,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 3207 "CameraTable.c"
+#line 3255 "CameraTable.c"
}
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp120_ = port;
@@ -3217,18 +3265,18 @@ 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 3219 "CameraTable.c"
+#line 3267 "CameraTable.c"
GUdevDevice* device = NULL;
- GUdevClient* _tmp123_ = NULL;
- const gchar* _tmp124_ = NULL;
- GUdevDevice* _tmp125_ = NULL;
+ GUdevClient* _tmp123_;
+ const gchar* _tmp124_;
+ GUdevDevice* _tmp125_;
gchar* serial = NULL;
- GUdevDevice* _tmp126_ = NULL;
- const gchar* _tmp127_ = NULL;
- gchar* _tmp128_ = NULL;
- const gchar* _tmp129_ = NULL;
- const gchar* _tmp134_ = NULL;
- const gchar* _tmp138_ = NULL;
+ GUdevDevice* _tmp126_;
+ const gchar* _tmp127_;
+ gchar* _tmp128_;
+ const gchar* _tmp129_;
+ const gchar* _tmp134_;
+ const gchar* _tmp138_;
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp123_ = self->priv->client;
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3249,11 +3297,11 @@ 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 3251 "CameraTable.c"
- const gchar* _tmp130_ = NULL;
- gchar* _tmp131_ = NULL;
- const gchar* _tmp132_ = NULL;
- gchar* _tmp133_ = NULL;
+#line 3299 "CameraTable.c"
+ const gchar* _tmp130_;
+ gchar* _tmp131_;
+ const gchar* _tmp132_;
+ gchar* _tmp133_;
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp130_ = serial;
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3270,16 +3318,16 @@ 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 3272 "CameraTable.c"
+#line 3320 "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 3278 "CameraTable.c"
- GUdevDevice* _tmp135_ = NULL;
- const gchar* _tmp136_ = NULL;
- gchar* _tmp137_ = NULL;
+#line 3326 "CameraTable.c"
+ GUdevDevice* _tmp135_;
+ const gchar* _tmp136_;
+ gchar* _tmp137_;
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp135_ = device;
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3290,16 +3338,16 @@ 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 3292 "CameraTable.c"
+#line 3340 "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 3298 "CameraTable.c"
- GUdevDevice* _tmp139_ = NULL;
- const gchar* _tmp140_ = NULL;
- gchar* _tmp141_ = NULL;
+#line 3346 "CameraTable.c"
+ GUdevDevice* _tmp139_;
+ const gchar* _tmp140_;
+ gchar* _tmp141_;
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp139_ = device;
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3310,21 +3358,21 @@ 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 3312 "CameraTable.c"
+#line 3360 "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 3318 "CameraTable.c"
+#line 3366 "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 3324 "CameraTable.c"
- const gchar* _tmp143_ = NULL;
- gchar* _tmp144_ = NULL;
+#line 3372 "CameraTable.c"
+ const gchar* _tmp143_;
+ gchar* _tmp144_;
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp143_ = name;
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3333,7 +3381,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 3335 "CameraTable.c"
+#line 3383 "CameraTable.c"
}
#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp145_ = port_info_list;
@@ -3347,11 +3395,11 @@ 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 3349 "CameraTable.c"
- gint _tmp149_ = 0;
- const gchar* _tmp150_ = NULL;
- gchar* _tmp151_ = NULL;
- gchar* _tmp152_ = NULL;
+#line 3397 "CameraTable.c"
+ gint _tmp149_;
+ const gchar* _tmp150_;
+ gchar* _tmp151_;
+ gchar* _tmp152_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp149_ = index;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3396,7 +3444,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 3398 "CameraTable.c"
+#line 3446 "CameraTable.c"
} else {
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
@@ -3428,7 +3476,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 3430 "CameraTable.c"
+#line 3478 "CameraTable.c"
}
}
}
@@ -3488,7 +3536,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 3490 "CameraTable.c"
+#line 3538 "CameraTable.c"
} else {
#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3524,7 +3572,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 3526 "CameraTable.c"
+#line 3574 "CameraTable.c"
}
}
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3553,11 +3601,11 @@ 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 3555 "CameraTable.c"
- gint _tmp168_ = 0;
- const gchar* _tmp169_ = NULL;
- gchar* _tmp170_ = NULL;
- gchar* _tmp171_ = NULL;
+#line 3603 "CameraTable.c"
+ gint _tmp168_;
+ const gchar* _tmp169_;
+ gchar* _tmp170_;
+ gchar* _tmp171_;
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp168_ = index;
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3606,7 +3654,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 3608 "CameraTable.c"
+#line 3656 "CameraTable.c"
} else {
#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3642,7 +3690,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 3644 "CameraTable.c"
+#line 3692 "CameraTable.c"
}
}
}
@@ -3704,7 +3752,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 3706 "CameraTable.c"
+#line 3754 "CameraTable.c"
} else {
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
@@ -3742,7 +3790,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 3744 "CameraTable.c"
+#line 3792 "CameraTable.c"
}
}
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3801,7 +3849,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 3803 "CameraTable.c"
+#line 3851 "CameraTable.c"
} else {
#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -3841,7 +3889,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 3843 "CameraTable.c"
+#line 3891 "CameraTable.c"
}
}
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3900,7 +3948,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 3902 "CameraTable.c"
+#line 3950 "CameraTable.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -3940,7 +3988,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 3942 "CameraTable.c"
+#line 3990 "CameraTable.c"
}
}
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4001,7 +4049,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 4003 "CameraTable.c"
+#line 4051 "CameraTable.c"
} else {
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4041,7 +4089,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 4043 "CameraTable.c"
+#line 4091 "CameraTable.c"
}
}
#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4073,7 +4121,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp207_ = camera;
#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_signal_emit_by_name (self, "camera-added", _tmp207_);
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp207_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4096,11 +4144,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 4098 "CameraTable.c"
+#line 4146 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 4102 "CameraTable.c"
+#line 4150 "CameraTable.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4112,15 +4160,15 @@ 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 4114 "CameraTable.c"
+#line 4162 "CameraTable.c"
}
static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device) {
- const gchar* _tmp0_ = NULL;
- GUdevDevice* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- OneShotScheduler* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ GUdevDevice* _tmp1_;
+ const gchar* _tmp2_;
+ OneShotScheduler* _tmp3_;
#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4139,12 +4187,12 @@ 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 4141 "CameraTable.c"
+#line 4189 "CameraTable.c"
}
void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
- OneShotScheduler* _tmp0_ = NULL;
+ OneShotScheduler* _tmp0_;
#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4153,7 +4201,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 4155 "CameraTable.c"
+#line 4203 "CameraTable.c"
}
@@ -4161,10 +4209,10 @@ 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 4163 "CameraTable.c"
+#line 4211 "CameraTable.c"
{
- CameraTable* _tmp0_ = NULL;
- CameraTable* _tmp1_ = NULL;
+ CameraTable* _tmp0_;
+ CameraTable* _tmp1_;
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = camera_table_get_instance ();
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4177,8 +4225,8 @@ 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 4179 "CameraTable.c"
- goto __catch60_gphoto_error;
+#line 4227 "CameraTable.c"
+ goto __catch61_gphoto_error;
}
#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4186,15 +4234,15 @@ 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 4188 "CameraTable.c"
+#line 4236 "CameraTable.c"
}
}
- goto __finally60;
- __catch60_gphoto_error:
+ goto __finally61;
+ __catch61_gphoto_error:
{
GError* err = NULL;
- GError* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GError* _tmp2_;
+ const gchar* _tmp3_;
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
err = _inner_error_;
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4207,9 +4255,9 @@ 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 4209 "CameraTable.c"
+#line 4257 "CameraTable.c"
}
- __finally60:
+ __finally61:
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4218,7 +4266,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 4220 "CameraTable.c"
+#line 4268 "CameraTable.c"
}
}
@@ -4238,26 +4286,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 4240 "CameraTable.c"
+#line 4288 "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 4246 "CameraTable.c"
+#line 4294 "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 4252 "CameraTable.c"
+#line 4300 "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 4259 "CameraTable.c"
+#line 4307 "CameraTable.c"
}
@@ -4266,7 +4314,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 4268 "CameraTable.c"
+#line 4316 "CameraTable.c"
}
}
@@ -4276,11 +4324,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 4278 "CameraTable.c"
+#line 4326 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4282 "CameraTable.c"
+#line 4330 "CameraTable.c"
}
}
@@ -4288,66 +4336,66 @@ 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 4290 "CameraTable.c"
+#line 4338 "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 4297 "CameraTable.c"
- CameraTable* object;
+#line 4345 "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 4304 "CameraTable.c"
+#line 4352 "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 4308 "CameraTable.c"
+#line 4356 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = camera_table_ref (object);
-#line 4312 "CameraTable.c"
+#line 4360 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4316 "CameraTable.c"
+#line 4364 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4320 "CameraTable.c"
+#line 4368 "CameraTable.c"
}
static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- CameraTable** object_p;
+ CameraTable ** object_p;
object_p = collect_values[0].v_pointer;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 4331 "CameraTable.c"
+#line 4379 "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 4337 "CameraTable.c"
+#line 4385 "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 4341 "CameraTable.c"
+#line 4389 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4345 "CameraTable.c"
+#line 4393 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4349 "CameraTable.c"
+#line 4397 "CameraTable.c"
}
@@ -4361,7 +4409,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 4363 "CameraTable.c"
+#line 4411 "CameraTable.c"
}
@@ -4370,12 +4418,12 @@ 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 4372 "CameraTable.c"
+#line 4420 "CameraTable.c"
}
void value_set_camera_table (GValue* value, gpointer v_object) {
- CameraTable* old;
+ CameraTable * old;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE));
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4390,23 +4438,23 @@ 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 4392 "CameraTable.c"
+#line 4440 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4396 "CameraTable.c"
+#line 4444 "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 4402 "CameraTable.c"
+#line 4450 "CameraTable.c"
}
}
void value_take_camera_table (GValue* value, gpointer v_object) {
- CameraTable* old;
+ CameraTable * old;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE));
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4419,17 +4467,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 4421 "CameraTable.c"
+#line 4469 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4425 "CameraTable.c"
+#line 4473 "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 4431 "CameraTable.c"
+#line 4479 "CameraTable.c"
}
}
@@ -4442,17 +4490,17 @@ static void camera_table_class_init (CameraTableClass * klass) {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_type_class_add_private (klass, sizeof (CameraTablePrivate));
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- 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);
+ camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- 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 4447 "CameraTable.c"
+ camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
+#line 4495 "CameraTable.c"
}
static void camera_table_instance_init (CameraTable * self) {
- GUdevClient* _tmp0_ = NULL;
- GPContext* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
+ GUdevClient* _tmp0_;
+ GPContext* _tmp1_;
+ GeeHashMap* _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->priv = CAMERA_TABLE_GET_PRIVATE (self);
#line 29 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4471,11 +4519,11 @@ static void camera_table_instance_init (CameraTable * self) {
self->priv->camera_map = _tmp2_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 4473 "CameraTable.c"
+#line 4521 "CameraTable.c"
}
-static void camera_table_finalize (CameraTable* obj) {
+static void camera_table_finalize (CameraTable * obj) {
CameraTable * self;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_TABLE, CameraTable);
@@ -4493,7 +4541,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 4495 "CameraTable.c"
+#line 4543 "CameraTable.c"
}
@@ -4512,18 +4560,18 @@ GType camera_table_get_type (void) {
gpointer camera_table_ref (gpointer instance) {
- CameraTable* self;
+ CameraTable * self;
self = instance;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_atomic_int_inc (&self->ref_count);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return instance;
-#line 4520 "CameraTable.c"
+#line 4568 "CameraTable.c"
}
void camera_table_unref (gpointer instance) {
- CameraTable* self;
+ CameraTable * self;
self = instance;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -4531,7 +4579,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 4533 "CameraTable.c"
+#line 4581 "CameraTable.c"
}
}
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index 89722c6..6deedf6 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.34.7, the Vala compiler
+/* GPhoto.c generated by valac 0.36.6, the Vala compiler
* generated from GPhoto.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -26,7 +26,6 @@
#include <fcntl.h>
#include <sys/types.h>
#include <errno.h>
-#include <unistd.h>
#include <gobject/gvaluecollector.h>
@@ -87,8 +86,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
typedef struct _PhotoPreview PhotoPreview;
typedef struct _PhotoPreviewClass PhotoPreviewClass;
#define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL)))
-
-#define JPEG_TYPE_MARKER (jpeg_marker_get_type ())
#define _gp_file_unref0(var) ((var == NULL) ? NULL : (var = (gp_file_unref (var), NULL)))
typedef enum {
@@ -127,14 +124,6 @@ struct _GPSpinIdleWrapperClass {
GPContextWrapperClass parent_class;
};
-typedef enum {
- JPEG_MARKER_INVALID = 0x00,
- JPEG_MARKER_SOI = 0xD8,
- JPEG_MARKER_EOI = 0xD9,
- JPEG_MARKER_APP0 = 0xE0,
- JPEG_MARKER_APP1 = 0xE1
-} JpegMarker;
-
static gpointer gp_context_wrapper_parent_class = NULL;
static gpointer gp_spin_idle_wrapper_parent_class = NULL;
@@ -180,7 +169,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, gfloat current, void* data);
void gp_context_wrapper_progress_stop (GPContextWrapper* self);
static void gp_context_wrapper_real_progress_stop (GPContextWrapper* self);
-static void gp_context_wrapper_finalize (GPContextWrapper* obj);
+static void gp_context_wrapper_finalize (GPContextWrapper * obj);
GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST;
enum {
GP_SPIN_IDLE_WRAPPER_DUMMY_PROPERTY
@@ -217,8 +206,6 @@ gpointer value_get_photo_preview (const GValue* value);
GType photo_preview_get_type (void) G_GNUC_CONST;
PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-#define JPEG_MARKER_PREFIX ((guint8) 0xFF)
-GType jpeg_marker_get_type (void) G_GNUC_CONST;
static guint8* _vala_array_dup23 (guint8* self, int length);
#define IMPORT_PREVIEW_MAX_SCALE 128
GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
@@ -240,28 +227,28 @@ GQuark gphoto_error_quark (void) {
static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) {
#line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_idle ((GPContextWrapper*) self, context);
-#line 244 "GPhoto.c"
+#line 231 "GPhoto.c"
}
static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) {
#line 19 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_error ((GPContextWrapper*) self, context, text);
-#line 251 "GPhoto.c"
+#line 238 "GPhoto.c"
}
static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) {
#line 20 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_status ((GPContextWrapper*) self, context, text);
-#line 258 "GPhoto.c"
+#line 245 "GPhoto.c"
}
static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) {
#line 21 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_message ((GPContextWrapper*) self, context, text);
-#line 265 "GPhoto.c"
+#line 252 "GPhoto.c"
}
@@ -270,31 +257,31 @@ static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_fun
result = gp_context_wrapper_on_progress_start ((GPContextWrapper*) self, context, target, text);
#line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 274 "GPhoto.c"
+#line 261 "GPhoto.c"
}
static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) {
#line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_progress_update ((GPContextWrapper*) self, context, id, current);
-#line 281 "GPhoto.c"
+#line 268 "GPhoto.c"
}
static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) {
#line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_on_progress_stop ((GPContextWrapper*) self, context, id);
-#line 288 "GPhoto.c"
+#line 275 "GPhoto.c"
}
GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
GPContextWrapper* self = NULL;
- GPContext* _tmp0_ = NULL;
- GPContext* _tmp1_ = NULL;
- GPContext* _tmp2_ = NULL;
- GPContext* _tmp3_ = NULL;
- GPContext* _tmp4_ = NULL;
+ GPContext* _tmp0_;
+ GPContext* _tmp1_;
+ GPContext* _tmp2_;
+ GPContext* _tmp3_;
+ GPContext* _tmp4_;
#line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self = (GPContextWrapper*) g_type_create_instance (object_type);
#line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -319,14 +306,14 @@ GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
gp_context_set_progress_funcs (_tmp4_, _gp_context_wrapper_on_progress_start_gp_context_progress_start_func, _gp_context_wrapper_on_progress_update_gp_context_progress_update_func, _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func, self);
#line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return self;
-#line 323 "GPhoto.c"
+#line 310 "GPhoto.c"
}
GPContextWrapper* gp_context_wrapper_new (void) {
#line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return gp_context_wrapper_construct (GP_TYPE_CONTEXT_WRAPPER);
-#line 330 "GPhoto.c"
+#line 317 "GPhoto.c"
}
@@ -339,14 +326,14 @@ void gp_context_wrapper_idle (GPContextWrapper* self) {
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->idle (self);
-#line 343 "GPhoto.c"
+#line 330 "GPhoto.c"
}
static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) {
#line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 350 "GPhoto.c"
+#line 337 "GPhoto.c"
}
@@ -355,14 +342,14 @@ void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void*
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->error (self, text, data);
-#line 359 "GPhoto.c"
+#line 346 "GPhoto.c"
}
static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) {
#line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 366 "GPhoto.c"
+#line 353 "GPhoto.c"
}
@@ -371,14 +358,14 @@ void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void*
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->status (self, text, data);
-#line 375 "GPhoto.c"
+#line 362 "GPhoto.c"
}
static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) {
#line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 382 "GPhoto.c"
+#line 369 "GPhoto.c"
}
@@ -387,14 +374,14 @@ void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->message (self, text, data);
-#line 391 "GPhoto.c"
+#line 378 "GPhoto.c"
}
static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
#line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
-#line 398 "GPhoto.c"
+#line 385 "GPhoto.c"
}
@@ -403,7 +390,7 @@ void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current,
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_start (self, current, text, data);
-#line 407 "GPhoto.c"
+#line 394 "GPhoto.c"
}
@@ -416,7 +403,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_update (self, current, data);
-#line 420 "GPhoto.c"
+#line 407 "GPhoto.c"
}
@@ -429,7 +416,7 @@ void gp_context_wrapper_progress_stop (GPContextWrapper* self) {
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_stop (self);
-#line 433 "GPhoto.c"
+#line 420 "GPhoto.c"
}
@@ -440,12 +427,12 @@ static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* conte
g_return_if_fail (context != NULL);
#line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_idle (self);
-#line 444 "GPhoto.c"
+#line 431 "GPhoto.c"
}
static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* context, const gchar* text) {
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -456,12 +443,12 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont
_tmp0_ = text;
#line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_error (self, _tmp0_, NULL);
-#line 460 "GPhoto.c"
+#line 447 "GPhoto.c"
}
static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* context, const gchar* text) {
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -472,12 +459,12 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con
_tmp0_ = text;
#line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_status (self, _tmp0_, NULL);
-#line 476 "GPhoto.c"
+#line 463 "GPhoto.c"
}
static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* context, const gchar* text) {
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -488,14 +475,14 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co
_tmp0_ = text;
#line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_message (self, _tmp0_, NULL);
-#line 492 "GPhoto.c"
+#line 479 "GPhoto.c"
}
static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPContext* context, gfloat target, const gchar* text) {
guint result = 0U;
- gfloat _tmp0_ = 0.0F;
- const gchar* _tmp1_ = NULL;
+ gfloat _tmp0_;
+ const gchar* _tmp1_;
#line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (self), 0U);
#line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -512,12 +499,12 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon
result = (guint) 0;
#line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 516 "GPhoto.c"
+#line 503 "GPhoto.c"
}
static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPContext* context, guint id, gfloat current) {
- gfloat _tmp0_ = 0.0F;
+ gfloat _tmp0_;
#line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 68 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -526,7 +513,7 @@ static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPCon
_tmp0_ = current;
#line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_progress_update (self, _tmp0_, NULL);
-#line 530 "GPhoto.c"
+#line 517 "GPhoto.c"
}
@@ -537,14 +524,14 @@ static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPConte
g_return_if_fail (context != NULL);
#line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_progress_stop (self);
-#line 541 "GPhoto.c"
+#line 528 "GPhoto.c"
}
static void gp_value_context_wrapper_init (GValue* value) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 548 "GPhoto.c"
+#line 535 "GPhoto.c"
}
@@ -553,7 +540,7 @@ static void gp_value_context_wrapper_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_unref (value->data[0].v_pointer);
-#line 557 "GPhoto.c"
+#line 544 "GPhoto.c"
}
}
@@ -563,11 +550,11 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
if (src_value->data[0].v_pointer) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
dest_value->data[0].v_pointer = gp_context_wrapper_ref (src_value->data[0].v_pointer);
-#line 567 "GPhoto.c"
+#line 554 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
dest_value->data[0].v_pointer = NULL;
-#line 571 "GPhoto.c"
+#line 558 "GPhoto.c"
}
}
@@ -575,66 +562,66 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return value->data[0].v_pointer;
-#line 579 "GPhoto.c"
+#line 566 "GPhoto.c"
}
static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (collect_values[0].v_pointer) {
-#line 586 "GPhoto.c"
- GPContextWrapper* object;
+#line 573 "GPhoto.c"
+ GPContextWrapper * object;
object = collect_values[0].v_pointer;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (object->parent_instance.g_class == NULL) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 593 "GPhoto.c"
+#line 580 "GPhoto.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 597 "GPhoto.c"
+#line 584 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 601 "GPhoto.c"
+#line 588 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 605 "GPhoto.c"
+#line 592 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 609 "GPhoto.c"
+#line 596 "GPhoto.c"
}
static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
- GPContextWrapper** object_p;
+ GPContextWrapper ** object_p;
object_p = collect_values[0].v_pointer;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (!object_p) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 620 "GPhoto.c"
+#line 607 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (!value->data[0].v_pointer) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*object_p = NULL;
-#line 626 "GPhoto.c"
+#line 613 "GPhoto.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*object_p = value->data[0].v_pointer;
-#line 630 "GPhoto.c"
+#line 617 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*object_p = gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 634 "GPhoto.c"
+#line 621 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 638 "GPhoto.c"
+#line 625 "GPhoto.c"
}
@@ -648,7 +635,7 @@ GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return G_PARAM_SPEC (spec);
-#line 652 "GPhoto.c"
+#line 639 "GPhoto.c"
}
@@ -657,12 +644,12 @@ gpointer gp_value_get_context_wrapper (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER), NULL);
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return value->data[0].v_pointer;
-#line 661 "GPhoto.c"
+#line 648 "GPhoto.c"
}
void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
- GPContextWrapper* old;
+ GPContextWrapper * old;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER));
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -677,23 +664,23 @@ void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 681 "GPhoto.c"
+#line 668 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 685 "GPhoto.c"
+#line 672 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (old) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_unref (old);
-#line 691 "GPhoto.c"
+#line 678 "GPhoto.c"
}
}
void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
- GPContextWrapper* old;
+ GPContextWrapper * old;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER));
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -706,17 +693,17 @@ void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = v_object;
-#line 710 "GPhoto.c"
+#line 697 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 714 "GPhoto.c"
+#line 701 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (old) {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_unref (old);
-#line 720 "GPhoto.c"
+#line 707 "GPhoto.c"
}
}
@@ -727,36 +714,36 @@ 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 = (void (*)(GPContextWrapper*)) 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 = (void (*)(GPContextWrapper*, const gchar*, void*)) 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 = (void (*)(GPContextWrapper*, const gchar*, void*)) 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 = (void (*)(GPContextWrapper*, const gchar*, void*)) 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 = (void (*)(GPContextWrapper*, gfloat, const gchar*, void*)) 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 = (void (*)(GPContextWrapper*, gfloat, void*)) 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 = (void (*)(GPContextWrapper*)) gp_context_wrapper_real_progress_stop;
-#line 744 "GPhoto.c"
+ ((GPContextWrapperClass *) klass)->progress_stop = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_progress_stop;
+#line 731 "GPhoto.c"
}
static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
- GPContext* _tmp0_ = NULL;
+ GPContext* _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = gp_context_new ();
#line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self->context = _tmp0_;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self->ref_count = 1;
-#line 756 "GPhoto.c"
+#line 743 "GPhoto.c"
}
-static void gp_context_wrapper_finalize (GPContextWrapper* obj) {
+static void gp_context_wrapper_finalize (GPContextWrapper * obj) {
GPContextWrapper * self;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper);
@@ -764,7 +751,7 @@ static void gp_context_wrapper_finalize (GPContextWrapper* obj) {
g_signal_handlers_destroy (self);
#line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_context_unref0 (self->context);
-#line 768 "GPhoto.c"
+#line 755 "GPhoto.c"
}
@@ -783,18 +770,18 @@ GType gp_context_wrapper_get_type (void) {
gpointer gp_context_wrapper_ref (gpointer instance) {
- GPContextWrapper* self;
+ GPContextWrapper * self;
self = instance;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_atomic_int_inc (&self->ref_count);
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return instance;
-#line 793 "GPhoto.c"
+#line 780 "GPhoto.c"
}
void gp_context_wrapper_unref (gpointer instance) {
- GPContextWrapper* self;
+ GPContextWrapper * self;
self = instance;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -802,7 +789,7 @@ void gp_context_wrapper_unref (gpointer instance) {
GP_CONTEXT_WRAPPER_GET_CLASS (self)->finalize (self);
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 806 "GPhoto.c"
+#line 793 "GPhoto.c"
}
}
@@ -813,14 +800,14 @@ GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) {
self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type);
#line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return self;
-#line 817 "GPhoto.c"
+#line 804 "GPhoto.c"
}
GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) {
#line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return gp_spin_idle_wrapper_construct (GP_TYPE_SPIN_IDLE_WRAPPER);
-#line 824 "GPhoto.c"
+#line 811 "GPhoto.c"
}
@@ -832,14 +819,14 @@ static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) {
GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->idle (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper));
#line 85 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
spin_event_loop ();
-#line 836 "GPhoto.c"
+#line 823 "GPhoto.c"
}
static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, gfloat current, void* data) {
GPSpinIdleWrapper * self;
- gfloat _tmp0_ = 0.0F;
- void* _tmp1_ = NULL;
+ gfloat _tmp0_;
+ void* _tmp1_;
#line 88 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, GP_TYPE_SPIN_IDLE_WRAPPER, GPSpinIdleWrapper);
#line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -850,7 +837,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), _tmp0_, _tmp1_);
#line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
spin_event_loop ();
-#line 854 "GPhoto.c"
+#line 841 "GPhoto.c"
}
@@ -858,10 +845,10 @@ 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 = (void (*)(GPContextWrapper*)) 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 = (void (*)(GPContextWrapper*, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
-#line 865 "GPhoto.c"
+ ((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
+#line 852 "GPhoto.c"
}
@@ -885,17 +872,17 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
CameraFileInfo _vala_info = {0};
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ const gchar* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
int res = 0;
- Camera* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- GPContext* _tmp11_ = NULL;
+ Camera* _tmp8_;
+ const gchar* _tmp9_;
+ const gchar* _tmp10_;
+ GPContext* _tmp11_;
CameraFileInfo _tmp12_ = {0};
- int _tmp13_ = 0;
- int _tmp14_ = 0;
+ int _tmp13_;
+ int _tmp14_;
GError * _inner_error_ = NULL;
#line 102 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, FALSE);
@@ -915,11 +902,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) {
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = TRUE;
-#line 919 "GPhoto.c"
+#line 906 "GPhoto.c"
} else {
- const gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = filename;
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -928,11 +915,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
_tmp6_ = _tmp5_;
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH;
-#line 932 "GPhoto.c"
+#line 919 "GPhoto.c"
}
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp0_) {
-#line 936 "GPhoto.c"
+#line 923 "GPhoto.c"
CameraFileInfo _tmp7_ = {0};
#line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
@@ -944,15 +931,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
if (info) {
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*info = _vala_info;
-#line 948 "GPhoto.c"
+#line 935 "GPhoto.c"
} else {
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
-#line 952 "GPhoto.c"
+#line 939 "GPhoto.c"
}
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 956 "GPhoto.c"
+#line 943 "GPhoto.c"
}
#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = camera;
@@ -974,13 +961,13 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
_tmp14_ = res;
#line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp14_ != GP_OK) {
-#line 978 "GPhoto.c"
- int _tmp15_ = 0;
- const gchar* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- int _tmp18_ = 0;
- const gchar* _tmp19_ = NULL;
- GError* _tmp20_ = NULL;
+#line 965 "GPhoto.c"
+ int _tmp15_;
+ const gchar* _tmp16_;
+ const gchar* _tmp17_;
+ int _tmp18_;
+ const gchar* _tmp19_;
+ GError* _tmp20_;
gboolean _tmp21_ = FALSE;
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = res;
@@ -1000,7 +987,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
g_propagate_error (error, _inner_error_);
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return _tmp21_;
-#line 1004 "GPhoto.c"
+#line 991 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = TRUE;
@@ -1008,134 +995,134 @@ 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 1012 "GPhoto.c"
+#line 999 "GPhoto.c"
} else {
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
-#line 1016 "GPhoto.c"
+#line 1003 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1020 "GPhoto.c"
+#line 1007 "GPhoto.c"
}
static gchar* string_slice (const gchar* self, glong start, glong end) {
gchar* result = NULL;
glong string_length = 0L;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- glong _tmp2_ = 0L;
- glong _tmp5_ = 0L;
+ gint _tmp0_;
+ gint _tmp1_;
+ glong _tmp2_;
+ glong _tmp5_;
gboolean _tmp8_ = FALSE;
- glong _tmp9_ = 0L;
+ glong _tmp9_;
gboolean _tmp12_ = FALSE;
- glong _tmp13_ = 0L;
- glong _tmp16_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp13_;
+ glong _tmp16_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
-#line 1053 "GPhoto.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1040 "GPhoto.c"
+ glong _tmp3_;
+ glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
-#line 1062 "GPhoto.c"
+#line 1049 "GPhoto.c"
}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
-#line 1068 "GPhoto.c"
- glong _tmp6_ = 0L;
- glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1055 "GPhoto.c"
+ glong _tmp6_;
+ glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
-#line 1077 "GPhoto.c"
+#line 1064 "GPhoto.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
-#line 1083 "GPhoto.c"
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1070 "GPhoto.c"
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1092 "GPhoto.c"
+#line 1079 "GPhoto.c"
} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
-#line 1096 "GPhoto.c"
+#line 1083 "GPhoto.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
-#line 1104 "GPhoto.c"
- glong _tmp14_ = 0L;
- glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "GPhoto.c"
+ glong _tmp14_;
+ glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1113 "GPhoto.c"
+#line 1100 "GPhoto.c"
} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 1117 "GPhoto.c"
+#line 1104 "GPhoto.c"
}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 1139 "GPhoto.c"
+#line 1126 "GPhoto.c"
}
@@ -1143,21 +1130,21 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
PhotoMetadata* result = NULL;
CameraStorageInformation* sifs = NULL;
gint count = 0;
- Camera* _tmp0_ = NULL;
- GPContext* _tmp1_ = NULL;
+ Camera* _tmp0_;
+ GPContext* _tmp1_;
gint _tmp2_ = 0;
GPPortInfo port_info = {0};
- Camera* _tmp3_ = NULL;
+ Camera* _tmp3_;
GPPortInfo _tmp4_ = {0};
gchar* path = NULL;
const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ gchar* _tmp6_;
gchar* prefix = NULL;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gboolean _tmp9_;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp17_ = NULL;
+ PhotoMetadata* _tmp17_;
GError * _inner_error_ = NULL;
#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
@@ -1205,14 +1192,14 @@ 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 1209 "GPhoto.c"
- const gchar* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- const gchar* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
- gchar* _tmp16_ = NULL;
+#line 1196 "GPhoto.c"
+ const gchar* _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ const gchar* _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+ gchar* _tmp16_;
#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = path;
#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1231,7 +1218,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 1235 "GPhoto.c"
+#line 1222 "GPhoto.c"
} else {
#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
@@ -1243,26 +1230,26 @@ 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 1247 "GPhoto.c"
+#line 1234 "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 1253 "GPhoto.c"
+#line 1240 "GPhoto.c"
{
- PhotoMetadata* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- const gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- GFile* _tmp28_ = NULL;
- GFile* _tmp29_ = NULL;
+ PhotoMetadata* _tmp18_;
+ const gchar* _tmp19_;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
+ GFile* _tmp28_;
+ GFile* _tmp29_;
#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = metadata;
#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1299,12 +1286,12 @@ 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 1303 "GPhoto.c"
- goto __catch61_g_error;
+#line 1290 "GPhoto.c"
+ goto __catch62_g_error;
}
}
- goto __finally61;
- __catch61_g_error:
+ goto __finally62;
+ __catch62_g_error:
{
#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
@@ -1314,9 +1301,9 @@ 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 1318 "GPhoto.c"
+#line 1305 "GPhoto.c"
}
- __finally61:
+ __finally62:
#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1333,7 +1320,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 1337 "GPhoto.c"
+#line 1324 "GPhoto.c"
}
#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
@@ -1345,14 +1332,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 1349 "GPhoto.c"
+#line 1336 "GPhoto.c"
}
static guint8* _vala_array_dup23 (guint8* self, int length) {
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 1356 "GPhoto.c"
+#line 1343 "GPhoto.c"
}
@@ -1361,21 +1348,20 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
int _vala_raw_length1 = 0;
gsize _vala_raw_length = 0UL;
GdkPixbuf* result = NULL;
- guint8* _tmp25_ = NULL;
- gint _tmp25__length1 = 0;
- guint8* _tmp26_ = NULL;
- gint _tmp26__length1 = 0;
- gsize _tmp27_ = 0UL;
+ guint8* _tmp25_;
+ gint _tmp25__length1;
+ guint8* _tmp26_;
+ gint _tmp26__length1;
GMemoryInputStream* mins = NULL;
- guint8* _tmp42_ = NULL;
- gint _tmp42__length1 = 0;
- guint8* _tmp43_ = NULL;
- gint _tmp43__length1 = 0;
- GMemoryInputStream* _tmp44_ = NULL;
- GdkPixbuf* _tmp45_ = NULL;
- GMemoryInputStream* _tmp46_ = NULL;
- GdkPixbuf* _tmp47_ = NULL;
- GdkPixbuf* _tmp48_ = NULL;
+ guint8* _tmp27_;
+ gint _tmp27__length1;
+ guint8* _tmp28_;
+ gint _tmp28__length1;
+ GMemoryInputStream* _tmp29_;
+ GdkPixbuf* _tmp30_ = NULL;
+ GMemoryInputStream* _tmp31_;
+ GdkPixbuf* _tmp32_;
+ GdkPixbuf* _tmp33_;
GError * _inner_error_ = NULL;
#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
@@ -1393,19 +1379,19 @@ 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 1397 "GPhoto.c"
+#line 1383 "GPhoto.c"
{
guint8* _tmp0_ = NULL;
- GPContext* _tmp1_ = NULL;
- Camera* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- guint8* _tmp6_ = NULL;
- gint _tmp0__length1 = 0;
- gint __tmp0__size_ = 0;
- guint8* _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
+ GPContext* _tmp1_;
+ Camera* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ guint8* _tmp6_;
+ gint _tmp0__length1;
+ gint __tmp0__size_;
+ guint8* _tmp7_;
+ gint _tmp7__length1;
#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = context;
#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1424,8 +1410,8 @@ 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 1428 "GPhoto.c"
- goto __catch62_g_error;
+#line 1414 "GPhoto.c"
+ goto __catch63_g_error;
}
#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = _tmp0_;
@@ -1443,33 +1429,33 @@ 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 1447 "GPhoto.c"
+#line 1433 "GPhoto.c"
}
- goto __finally62;
- __catch62_g_error:
+ goto __finally63;
+ __catch63_g_error:
{
PhotoMetadata* metadata = NULL;
- Camera* _tmp8_ = NULL;
- GPContext* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- PhotoMetadata* _tmp12_ = NULL;
- PhotoMetadata* _tmp13_ = NULL;
- PhotoMetadata* _tmp14_ = NULL;
- guint _tmp15_ = 0U;
+ Camera* _tmp8_;
+ GPContext* _tmp9_;
+ const gchar* _tmp10_;
+ const gchar* _tmp11_;
+ PhotoMetadata* _tmp12_;
+ PhotoMetadata* _tmp13_;
+ PhotoMetadata* _tmp14_;
+ guint _tmp15_;
PhotoPreview* preview = NULL;
- PhotoMetadata* _tmp16_ = NULL;
- PhotoMetadata* _tmp17_ = NULL;
- guint _tmp18_ = 0U;
- PhotoPreview* _tmp19_ = NULL;
+ PhotoMetadata* _tmp16_;
+ PhotoMetadata* _tmp17_;
+ guint _tmp18_;
+ PhotoPreview* _tmp19_;
guint8* _tmp20_ = NULL;
- PhotoPreview* _tmp21_ = NULL;
- gint _tmp22_ = 0;
- guint8* _tmp23_ = NULL;
- gint _tmp20__length1 = 0;
- gint __tmp20__size_ = 0;
- guint8* _tmp24_ = NULL;
- gint _tmp24__length1 = 0;
+ PhotoPreview* _tmp21_;
+ gint _tmp22_;
+ guint8* _tmp23_;
+ gint _tmp20__length1;
+ gint __tmp20__size_;
+ guint8* _tmp24_;
+ gint _tmp24__length1;
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1498,27 +1484,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 1502 "GPhoto.c"
+#line 1488 "GPhoto.c"
} else {
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1506 "GPhoto.c"
+#line 1492 "GPhoto.c"
}
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length1) {
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length1 = _vala_raw_length1;
-#line 1512 "GPhoto.c"
+#line 1498 "GPhoto.c"
}
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length) {
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length = _vala_raw_length;
-#line 1518 "GPhoto.c"
+#line 1504 "GPhoto.c"
}
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1522 "GPhoto.c"
+#line 1508 "GPhoto.c"
}
#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = metadata;
@@ -1534,27 +1520,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 1538 "GPhoto.c"
+#line 1524 "GPhoto.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1542 "GPhoto.c"
+#line 1528 "GPhoto.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length1) {
#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length1 = _vala_raw_length1;
-#line 1548 "GPhoto.c"
+#line 1534 "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 1554 "GPhoto.c"
+#line 1540 "GPhoto.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1558 "GPhoto.c"
+#line 1544 "GPhoto.c"
}
#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = metadata;
@@ -1582,8 +1568,8 @@ 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 1586 "GPhoto.c"
- goto __finally62;
+#line 1572 "GPhoto.c"
+ goto __finally63;
}
#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp24_ = _tmp20_;
@@ -1605,16 +1591,16 @@ 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 1609 "GPhoto.c"
+#line 1595 "GPhoto.c"
}
- __finally62:
+ __finally63:
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1618 "GPhoto.c"
+#line 1604 "GPhoto.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp25_ = _vala_raw;
@@ -1630,27 +1616,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 1634 "GPhoto.c"
+#line 1620 "GPhoto.c"
} else {
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1638 "GPhoto.c"
+#line 1624 "GPhoto.c"
}
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length1) {
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length1 = _vala_raw_length1;
-#line 1644 "GPhoto.c"
+#line 1630 "GPhoto.c"
}
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length) {
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length = _vala_raw_length;
-#line 1650 "GPhoto.c"
+#line 1636 "GPhoto.c"
}
#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1654 "GPhoto.c"
+#line 1640 "GPhoto.c"
}
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26_ = _vala_raw;
@@ -1658,641 +1644,525 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_tmp26__length1 = _vala_raw_length1;
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw_length = (gsize) _tmp26__length1;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = _vala_raw_length;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp27_ > ((gsize) 32)) {
-#line 1666 "GPhoto.c"
- {
- gsize i = 0UL;
- gsize _tmp28_ = 0UL;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = _vala_raw_length;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- i = _tmp28_ - 2;
-#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 1681 "GPhoto.c"
- gsize _tmp31_ = 0UL;
- gsize _tmp32_ = 0UL;
- gboolean _tmp33_ = FALSE;
- guint8* _tmp34_ = NULL;
- gint _tmp34__length1 = 0;
- gsize _tmp35_ = 0UL;
- guint8 _tmp36_ = 0U;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (!_tmp29_) {
-#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 1697 "GPhoto.c"
- }
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = i;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = _vala_raw_length;
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (!(_tmp31_ > (_tmp32_ - 32))) {
-#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- break;
-#line 1709 "GPhoto.c"
- }
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp34_ = _vala_raw;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp34__length1 = _vala_raw_length1;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp35_ = i;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp36_ = _tmp34_[_tmp35_];
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp36_ == JPEG_MARKER_PREFIX) {
-#line 1721 "GPhoto.c"
- guint8* _tmp37_ = NULL;
- gint _tmp37__length1 = 0;
- gsize _tmp38_ = 0UL;
- guint8 _tmp39_ = 0U;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp37_ = _vala_raw;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp37__length1 = _vala_raw_length1;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp38_ = i;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp33_ = _tmp39_ == JPEG_MARKER_EOI;
-#line 1736 "GPhoto.c"
- } else {
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp33_ = FALSE;
-#line 1740 "GPhoto.c"
- }
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp33_) {
-#line 1744 "GPhoto.c"
- const gchar* _tmp40_ = NULL;
- gsize _tmp41_ = 0UL;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp40_ = filename;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- g_debug ("GPhoto.vala:179: Adjusted length of thumbnail for: %s", _tmp40_);
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp41_ = i;
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_raw_length = _tmp41_ + 2;
-#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- break;
-#line 1757 "GPhoto.c"
- }
- }
- }
- }
- }
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp42_ = _vala_raw;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp42__length1 = _vala_raw_length1;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp43_ = (_tmp42_ != NULL) ? _vala_array_dup23 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp43__length1 = _tmp42__length1;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp44_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp43_, _tmp43__length1, NULL);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- mins = _tmp44_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp46_ = mins;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp45_ = _tmp47_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp27_ = _vala_raw;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp27__length1 = _vala_raw_length1;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp28_ = (_tmp27_ != NULL) ? _vala_array_dup23 (_tmp27_, _tmp27__length1) : ((gpointer) _tmp27_);
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp28__length1 = _tmp27__length1;
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp29_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp28_, _tmp28__length1, NULL);
+#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ mins = _tmp29_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp31_ = mins;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp32_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp30_ = _tmp32_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (mins);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1789 "GPhoto.c"
+#line 1674 "GPhoto.c"
}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp48_ = _tmp45_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp45_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp48_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp45_);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp33_ = _tmp30_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp30_ = NULL;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ result = _tmp33_;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _g_object_unref0 (_tmp30_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (mins);
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw = _vala_raw;
-#line 1805 "GPhoto.c"
+#line 1690 "GPhoto.c"
} else {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_raw = (g_free (_vala_raw), NULL);
-#line 1809 "GPhoto.c"
+#line 1694 "GPhoto.c"
}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length1) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length1 = _vala_raw_length1;
-#line 1815 "GPhoto.c"
+#line 1700 "GPhoto.c"
}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (raw_length) {
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*raw_length = _vala_raw_length;
-#line 1821 "GPhoto.c"
+#line 1706 "GPhoto.c"
}
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1825 "GPhoto.c"
+#line 1710 "GPhoto.c"
}
GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
GdkPixbuf* result = NULL;
GInputStream* ins = NULL;
- GPContext* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- GInputStream* _tmp4_ = NULL;
- GInputStream* _tmp5_ = NULL;
+ GPContext* _tmp0_;
+ Camera* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ GInputStream* _tmp4_;
+ GInputStream* _tmp5_;
GdkPixbuf* _tmp6_ = NULL;
- GInputStream* _tmp7_ = NULL;
- GdkPixbuf* _tmp8_ = NULL;
- GdkPixbuf* _tmp9_ = NULL;
+ GInputStream* _tmp7_;
+ GdkPixbuf* _tmp8_;
+ GdkPixbuf* _tmp9_;
GError * _inner_error_ = NULL;
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = context;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = camera;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = folder;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = filename;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = gp_load_file_into_stream (_tmp0_, _tmp1_, _tmp2_, _tmp3_, GP_FILE_TYPE_NORMAL, &_inner_error_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
ins = _tmp4_;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1869 "GPhoto.c"
+#line 1754 "GPhoto.c"
}
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = ins;
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp5_ == NULL) {
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1881 "GPhoto.c"
+#line 1766 "GPhoto.c"
}
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = ins;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = gdk_pixbuf_new_from_stream (_tmp7_, NULL, &_inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = _tmp8_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1897 "GPhoto.c"
+#line 1782 "GPhoto.c"
}
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = _tmp6_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = _tmp9_;
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (_tmp6_);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
-#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1911 "GPhoto.c"
+#line 1796 "GPhoto.c"
}
void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error) {
gint fd = 0;
- GFile* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ GFile* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
CameraFile* camera_file = NULL;
int res = 0;
- gint _tmp12_ = 0;
+ gint _tmp12_;
CameraFile* _tmp13_ = NULL;
- int _tmp14_ = 0;
- int _tmp15_ = 0;
- Camera* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- CameraFile* _tmp24_ = NULL;
- GPContext* _tmp25_ = NULL;
- int _tmp26_ = 0;
- int _tmp27_ = 0;
- gint _tmp35_ = 0;
+ int _tmp14_;
+ int _tmp15_;
+ Camera* _tmp20_;
+ const gchar* _tmp21_;
+ const gchar* _tmp22_;
+ CameraFile* _tmp23_;
+ GPContext* _tmp24_;
+ int _tmp25_;
+ int _tmp26_;
GError * _inner_error_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (context != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (camera != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (folder != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (filename != NULL);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (G_IS_FILE (dest_file));
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = dest_file;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = creat (_tmp2_, (mode_t) 0640);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = _tmp3_;
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp2_);
-#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
fd = _tmp4_;
-#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = fd;
-#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp5_ < 0) {
-#line 1966 "GPhoto.c"
- gint _tmp6_ = 0;
- GFile* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- GError* _tmp10_ = NULL;
- GError* _tmp11_ = NULL;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1850 "GPhoto.c"
+ gint _tmp6_;
+ GFile* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ GError* _tmp10_;
+ GError* _tmp11_;
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = errno;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = dest_file;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = g_file_get_path (_tmp7_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = _tmp8_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = _tmp10_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp9_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp11_;
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1993 "GPhoto.c"
+#line 1877 "GPhoto.c"
}
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = fd;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_file = _tmp13_;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp14_;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = res;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp15_ != GP_OK) {
-#line 2009 "GPhoto.c"
- gint _tmp16_ = 0;
- int _tmp17_ = 0;
- int _tmp18_ = 0;
- const gchar* _tmp19_ = NULL;
- GError* _tmp20_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = fd;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- close (_tmp16_);
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 1893 "GPhoto.c"
+ int _tmp16_;
+ int _tmp17_;
+ const gchar* _tmp18_;
+ GError* _tmp19_;
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp16_ = res;
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = res;
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = res;
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp17_, _tmp19_);
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp20_;
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp18_ = gp_port_result_as_string (_tmp17_);
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp16_, _tmp18_);
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _inner_error_ = _tmp19_;
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 2035 "GPhoto.c"
+#line 1914 "GPhoto.c"
}
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = camera;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp22_ = folder;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = filename;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = camera_file;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = context;
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = gp_camera_file_get (_tmp21_, _tmp22_, _tmp23_, GP_FILE_TYPE_NORMAL, _tmp24_, _tmp25_);
-#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp26_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp27_ != GP_OK) {
-#line 2055 "GPhoto.c"
- gint _tmp28_ = 0;
- int _tmp29_ = 0;
- const gchar* _tmp30_ = NULL;
- const gchar* _tmp31_ = NULL;
- int _tmp32_ = 0;
- const gchar* _tmp33_ = NULL;
- GError* _tmp34_ = NULL;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = fd;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- close (_tmp28_);
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = res;
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = folder;
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = filename;
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = res;
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp33_ = gp_port_result_as_string (_tmp32_);
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp34_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp29_, _tmp30_, _tmp31_, _tmp33_);
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp34_;
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp20_ = camera;
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp21_ = folder;
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp22_ = filename;
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp23_ = camera_file;
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp24_ = context;
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp25_ = gp_camera_file_get (_tmp20_, _tmp21_, _tmp22_, GP_FILE_TYPE_NORMAL, _tmp23_, _tmp24_);
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ res = _tmp25_;
+#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp26_ = res;
+#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ if (_tmp26_ != GP_OK) {
+#line 1934 "GPhoto.c"
+ int _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
+ int _tmp30_;
+ const gchar* _tmp31_;
+ GError* _tmp32_;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp27_ = res;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp28_ = folder;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp29_ = filename;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp30_ = res;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp31_ = gp_port_result_as_string (_tmp30_);
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _tmp32_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp27_, _tmp28_, _tmp29_, _tmp31_);
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ _inner_error_ = _tmp32_;
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 2087 "GPhoto.c"
+#line 1961 "GPhoto.c"
}
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp35_ = fd;
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- close (_tmp35_);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 2095 "GPhoto.c"
+#line 1965 "GPhoto.c"
}
PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
PhotoMetadata* result = NULL;
guint8* camera_raw = NULL;
- gint camera_raw_length1 = 0;
- gint _camera_raw_size_ = 0;
+ gint camera_raw_length1;
+ gint _camera_raw_size_;
gboolean _tmp13_ = FALSE;
- guint8* _tmp14_ = NULL;
- gint _tmp14__length1 = 0;
+ guint8* _tmp14_;
+ gint _tmp14__length1;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp16_ = NULL;
- PhotoMetadata* _tmp17_ = NULL;
- guint8* _tmp18_ = NULL;
- gint _tmp18__length1 = 0;
+ PhotoMetadata* _tmp16_;
+ PhotoMetadata* _tmp17_;
+ guint8* _tmp18_;
+ gint _tmp18__length1;
GError * _inner_error_ = NULL;
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = NULL;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw_length1 = 0;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_camera_raw_size_ = camera_raw_length1;
-#line 2127 "GPhoto.c"
+#line 1997 "GPhoto.c"
{
guint8* _tmp0_ = NULL;
- GPContext* _tmp1_ = NULL;
- Camera* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- guint8* _tmp6_ = NULL;
- gint _tmp0__length1 = 0;
- gint __tmp0__size_ = 0;
- guint8* _tmp7_ = NULL;
- gint _tmp7__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ GPContext* _tmp1_;
+ Camera* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gint _tmp5_;
+ guint8* _tmp6_;
+ gint _tmp0__length1;
+ gint __tmp0__size_;
+ guint8* _tmp7_;
+ gint _tmp7__length1;
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = context;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = camera;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = folder;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = filename;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_tmp5_, &_inner_error_);
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = _tmp6_;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0__length1 = _tmp5_;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
__tmp0__size_ = _tmp0__length1;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2158 "GPhoto.c"
- goto __catch63_g_error;
+#line 2028 "GPhoto.c"
+ goto __catch64_g_error;
}
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = _tmp0_;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7__length1 = _tmp0__length1;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = NULL;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = (g_free (camera_raw), NULL);
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = _tmp7_;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw_length1 = _tmp7__length1;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_camera_raw_size_ = camera_raw_length1;
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2179 "GPhoto.c"
+#line 2049 "GPhoto.c"
}
- goto __finally63;
- __catch63_g_error:
+ goto __finally64;
+ __catch64_g_error:
{
- Camera* _tmp8_ = NULL;
- GPContext* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- PhotoMetadata* _tmp12_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ Camera* _tmp8_;
+ GPContext* _tmp9_;
+ const gchar* _tmp10_;
+ const gchar* _tmp11_;
+ PhotoMetadata* _tmp12_;
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = NULL;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = camera;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = context;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = folder;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = filename;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = _tmp12_;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = (g_free (camera_raw), NULL);
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2209 "GPhoto.c"
+#line 2079 "GPhoto.c"
}
- __finally63:
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ __finally64:
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = (g_free (camera_raw), NULL);
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2220 "GPhoto.c"
+#line 2090 "GPhoto.c"
}
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = camera_raw;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14__length1 = camera_raw_length1;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp14_ == NULL) {
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = TRUE;
-#line 2230 "GPhoto.c"
+#line 2100 "GPhoto.c"
} else {
- guint8* _tmp15_ = NULL;
- gint _tmp15__length1 = 0;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ guint8* _tmp15_;
+ gint _tmp15__length1;
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = camera_raw;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15__length1 = camera_raw_length1;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = _tmp15__length1 == 0;
-#line 2240 "GPhoto.c"
+#line 2110 "GPhoto.c"
}
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp13_) {
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = (g_free (camera_raw), NULL);
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2250 "GPhoto.c"
+#line 2120 "GPhoto.c"
}
-#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = photo_metadata_new ();
-#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
metadata = _tmp16_;
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = metadata;
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = camera_raw;
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18__length1 = camera_raw_length1;
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
photo_metadata_read_from_app1_segment (_tmp17_, _tmp18_, _tmp18__length1, 0, &_inner_error_);
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = (g_free (camera_raw), NULL);
-#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2274 "GPhoto.c"
+#line 2144 "GPhoto.c"
}
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = (g_free (camera_raw), NULL);
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2282 "GPhoto.c"
+#line 2152 "GPhoto.c"
}
static guint8* _vala_array_dup24 (guint8* self, int length) {
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 2289 "GPhoto.c"
+#line 2159 "GPhoto.c"
}
static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_on_mins_destroyed (data);
-#line 2296 "GPhoto.c"
+#line 2166 "GPhoto.c"
}
@@ -2301,312 +2171,312 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
CameraFile* camera_file = NULL;
int res = 0;
CameraFile* _tmp0_ = NULL;
- int _tmp1_ = 0;
- int _tmp2_ = 0;
- Camera* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- CameraFileType _tmp10_ = 0;
- GPContext* _tmp11_ = NULL;
- int _tmp12_ = 0;
- int _tmp13_ = 0;
+ int _tmp1_;
+ int _tmp2_;
+ Camera* _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ CameraFileType _tmp10_;
+ GPContext* _tmp11_;
+ int _tmp12_;
+ int _tmp13_;
guint8* data = NULL;
gulong data_len = 0UL;
guint8* _tmp20_ = NULL;
gulong _tmp21_ = 0UL;
- int _tmp22_ = 0;
- int _tmp23_ = 0;
+ int _tmp22_;
+ int _tmp23_;
GFile* temp = NULL;
- GFile* _tmp32_ = NULL;
- GFile* _tmp33_ = NULL;
- GFile* _tmp34_ = NULL;
- GFile* _tmp35_ = NULL;
- GFile* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- int _tmp39_ = 0;
- int _tmp40_ = 0;
+ GFile* _tmp32_;
+ GFile* _tmp33_;
+ GFile* _tmp34_;
+ GFile* _tmp35_;
+ GFile* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ int _tmp39_;
+ int _tmp40_;
GFileInputStream* _tmp51_ = NULL;
- GFile* _tmp52_ = NULL;
- GFileInputStream* _tmp53_ = NULL;
- GFileInputStream* _tmp54_ = NULL;
+ GFile* _tmp52_;
+ GFileInputStream* _tmp53_;
+ GFileInputStream* _tmp54_;
GError * _inner_error_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = gp_file_new (&_tmp0_);
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_file = _tmp0_;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp1_;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = res;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2355 "GPhoto.c"
- int _tmp3_ = 0;
- int _tmp4_ = 0;
- const gchar* _tmp5_ = NULL;
- GError* _tmp6_ = NULL;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2225 "GPhoto.c"
+ int _tmp3_;
+ int _tmp4_;
+ const gchar* _tmp5_;
+ GError* _tmp6_;
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = res;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = res;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp6_;
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2376 "GPhoto.c"
+#line 2246 "GPhoto.c"
}
-#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = camera;
-#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = folder;
-#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = filename;
-#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = filetype;
-#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = context;
-#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp12_;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = res;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp13_ != GP_OK) {
-#line 2396 "GPhoto.c"
- int _tmp14_ = 0;
- const gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- int _tmp17_ = 0;
- const gchar* _tmp18_ = NULL;
- GError* _tmp19_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2266 "GPhoto.c"
+ int _tmp14_;
+ const gchar* _tmp15_;
+ const gchar* _tmp16_;
+ int _tmp17_;
+ const gchar* _tmp18_;
+ GError* _tmp19_;
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = res;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = folder;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = filename;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = res;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp19_;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2423 "GPhoto.c"
+#line 2293 "GPhoto.c"
}
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
data = _tmp20_;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
data_len = _tmp21_;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp22_;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp23_ = res;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp23_ == GP_OK) {
-#line 2437 "GPhoto.c"
+#line 2307 "GPhoto.c"
guint8* buffer = NULL;
- gulong _tmp24_ = 0UL;
- guint8* _tmp25_ = NULL;
- gint buffer_length1 = 0;
- gint _buffer_size_ = 0;
- guint8* _tmp26_ = NULL;
- gint _tmp26__length1 = 0;
- guint8* _tmp27_ = NULL;
- guint8* _tmp28_ = NULL;
- gint _tmp28__length1 = 0;
- guint8* _tmp29_ = NULL;
- gint _tmp29__length1 = 0;
- guint8* _tmp30_ = NULL;
- gint _tmp30__length1 = 0;
- GMemoryInputStream* _tmp31_ = NULL;
-#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ gulong _tmp24_;
+ guint8* _tmp25_;
+ gint buffer_length1;
+ gint _buffer_size_;
+ guint8* _tmp26_;
+ gint _tmp26__length1;
+ guint8* _tmp27_;
+ guint8* _tmp28_;
+ gint _tmp28__length1;
+ guint8* _tmp29_;
+ gint _tmp29__length1;
+ guint8* _tmp30_;
+ gint _tmp30__length1;
+ GMemoryInputStream* _tmp31_;
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp24_ = data_len;
-#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp25_ = g_new0 (guint8, _tmp24_);
-#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
buffer = _tmp25_;
-#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
buffer_length1 = _tmp24_;
-#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_buffer_size_ = buffer_length1;
-#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26_ = buffer;
-#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26__length1 = buffer_length1;
-#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp27_ = data;
-#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp28_ = buffer;
-#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp28__length1 = buffer_length1;
-#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
memcpy (_tmp26_, _tmp27_, (gsize) _tmp28__length1);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29_ = buffer;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29__length1 = buffer_length1;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp30_ = (_tmp29_ != NULL) ? _vala_array_dup24 (_tmp29_, _tmp29__length1) : ((gpointer) _tmp29_);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp30__length1 = _tmp29__length1;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
buffer = (g_free (buffer), NULL);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2493 "GPhoto.c"
+#line 2363 "GPhoto.c"
}
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp32_ = app_dirs_get_temp_dir ();
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp33_ = _tmp32_;
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp34_ = g_file_get_child (_tmp33_, "import.tmp");
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp35_ = _tmp34_;
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (_tmp33_);
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
temp = _tmp35_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp36_ = temp;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp37_ = g_file_get_path (_tmp36_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp38_ = _tmp37_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp39_ = gp_file_save (camera_file, _tmp38_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp39_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp38_);
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp40_ = res;
-#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp40_ != GP_OK) {
-#line 2523 "GPhoto.c"
- int _tmp41_ = 0;
- const gchar* _tmp42_ = NULL;
- const gchar* _tmp43_ = NULL;
- GFile* _tmp44_ = NULL;
- gchar* _tmp45_ = NULL;
- gchar* _tmp46_ = NULL;
- int _tmp47_ = 0;
- const gchar* _tmp48_ = NULL;
- GError* _tmp49_ = NULL;
- GError* _tmp50_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2393 "GPhoto.c"
+ int _tmp41_;
+ const gchar* _tmp42_;
+ const gchar* _tmp43_;
+ GFile* _tmp44_;
+ gchar* _tmp45_;
+ gchar* _tmp46_;
+ int _tmp47_;
+ const gchar* _tmp48_;
+ GError* _tmp49_;
+ GError* _tmp50_;
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp41_ = res;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp42_ = folder;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp43_ = filename;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp44_ = temp;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp45_ = g_file_get_path (_tmp44_);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp46_ = _tmp45_;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp47_ = res;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp48_ = gp_port_result_as_string (_tmp47_);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp49_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp41_, _tmp42_, _tmp43_, _tmp46_, _tmp48_);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp50_ = _tmp49_;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_tmp46_);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp50_;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (temp);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2566 "GPhoto.c"
+#line 2436 "GPhoto.c"
}
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp52_ = temp;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp53_ = g_file_read (_tmp52_, NULL, &_inner_error_);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp51_ = _tmp53_;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (temp);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2584 "GPhoto.c"
+#line 2454 "GPhoto.c"
}
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp54_ = _tmp51_;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp51_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (_tmp51_);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (temp);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2600 "GPhoto.c"
+#line 2470 "GPhoto.c"
}
void gp_on_mins_destroyed (void* data) {
- void* _tmp0_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+ void* _tmp0_;
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = data;
-#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_free (_tmp0_);
-#line 2610 "GPhoto.c"
+#line 2480 "GPhoto.c"
}
@@ -2615,202 +2485,202 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
CameraFile* camera_file = NULL;
int res = 0;
CameraFile* _tmp0_ = NULL;
- int _tmp1_ = 0;
- int _tmp2_ = 0;
- Camera* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- CameraFileType _tmp10_ = 0;
- CameraFile* _tmp11_ = NULL;
- GPContext* _tmp12_ = NULL;
- int _tmp13_ = 0;
- int _tmp14_ = 0;
+ int _tmp1_;
+ int _tmp2_;
+ Camera* _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ CameraFileType _tmp10_;
+ CameraFile* _tmp11_;
+ GPContext* _tmp12_;
+ int _tmp13_;
+ int _tmp14_;
guint8* data = NULL;
gulong data_len = 0UL;
- CameraFile* _tmp21_ = NULL;
+ CameraFile* _tmp21_;
guint8* _tmp22_ = NULL;
gulong _tmp23_ = 0UL;
- int _tmp24_ = 0;
- int _tmp25_ = 0;
+ int _tmp24_;
+ int _tmp25_;
guint8* buffer = NULL;
- gulong _tmp27_ = 0UL;
- guint8* _tmp28_ = NULL;
- gint buffer_length1 = 0;
- gint _buffer_size_ = 0;
- guint8* _tmp29_ = NULL;
- gint _tmp29__length1 = 0;
- guint8* _tmp30_ = NULL;
- guint8* _tmp31_ = NULL;
- gint _tmp31__length1 = 0;
- guint8* _tmp32_ = NULL;
- gint _tmp32__length1 = 0;
+ gulong _tmp27_;
+ guint8* _tmp28_;
+ gint buffer_length1;
+ gint _buffer_size_;
+ guint8* _tmp29_;
+ gint _tmp29__length1;
+ guint8* _tmp30_;
+ guint8* _tmp31_;
+ gint _tmp31__length1;
+ guint8* _tmp32_;
+ gint _tmp32__length1;
GError * _inner_error_ = NULL;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (folder != NULL, NULL);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp1_ = gp_file_new (&_tmp0_);
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_file = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp1_;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp2_ = res;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2669 "GPhoto.c"
- int _tmp3_ = 0;
- int _tmp4_ = 0;
- const gchar* _tmp5_ = NULL;
- GError* _tmp6_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2539 "GPhoto.c"
+ int _tmp3_;
+ int _tmp4_;
+ const gchar* _tmp5_;
+ GError* _tmp6_;
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp3_ = res;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp4_ = res;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp6_;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2690 "GPhoto.c"
+#line 2560 "GPhoto.c"
}
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp7_ = camera;
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp8_ = folder;
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp9_ = filename;
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp10_ = filetype;
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp11_ = camera_file;
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp12_ = context;
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp13_;
-#line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp14_ = res;
-#line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp14_ != GP_OK) {
-#line 2712 "GPhoto.c"
- int _tmp15_ = 0;
- const gchar* _tmp16_ = NULL;
- const gchar* _tmp17_ = NULL;
- int _tmp18_ = 0;
- const gchar* _tmp19_ = NULL;
- GError* _tmp20_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2582 "GPhoto.c"
+ int _tmp15_;
+ const gchar* _tmp16_;
+ const gchar* _tmp17_;
+ int _tmp18_;
+ const gchar* _tmp19_;
+ GError* _tmp20_;
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp15_ = res;
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp16_ = folder;
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp17_ = filename;
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp18_ = res;
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = _tmp20_;
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2739 "GPhoto.c"
+#line 2609 "GPhoto.c"
}
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp21_ = camera_file;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp24_ = gp_file_get_data_and_size (_tmp21_, &_tmp22_, &_tmp23_);
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
data = _tmp22_;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
data_len = _tmp23_;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
res = _tmp24_;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp25_ = res;
-#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp25_ != GP_OK) {
-#line 2755 "GPhoto.c"
- guint8* _tmp26_ = NULL;
- gint _tmp26__length1 = 0;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 2625 "GPhoto.c"
+ guint8* _tmp26_;
+ gint _tmp26__length1;
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26_ = NULL;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp26__length1 = 0;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (result_length1) {
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*result_length1 = _tmp26__length1;
-#line 2766 "GPhoto.c"
+#line 2636 "GPhoto.c"
}
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = _tmp26_;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2774 "GPhoto.c"
+#line 2644 "GPhoto.c"
}
-#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp27_ = data_len;
-#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp28_ = g_new0 (guint8, _tmp27_);
-#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
buffer = _tmp28_;
-#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
buffer_length1 = _tmp27_;
-#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_buffer_size_ = buffer_length1;
-#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29_ = buffer;
-#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp29__length1 = buffer_length1;
-#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp30_ = data;
-#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp31_ = buffer;
-#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp31__length1 = buffer_length1;
-#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
memcpy (_tmp29_, _tmp30_, (gsize) _tmp31__length1);
-#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp32_ = buffer;
-#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp32__length1 = buffer_length1;
-#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (result_length1) {
-#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*result_length1 = _tmp32__length1;
-#line 2806 "GPhoto.c"
+#line 2676 "GPhoto.c"
}
-#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = _tmp32_;
-#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2814 "GPhoto.c"
+#line 2684 "GPhoto.c"
}
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 5acc4a3..8dab941 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -169,20 +169,6 @@ namespace GPhoto {
raw_length = raw.length;
- // Try to make sure last two bytes are JPEG footer.
- // This is necessary because GPhoto sometimes includes a few extra bytes. See
- // Yorba bug #2905 and the following GPhoto bug:
- // http://sourceforge.net/tracker/?func=detail&aid=3141521&group_id=8874&atid=108874
- if (raw_length > 32) {
- for (size_t i = raw_length - 2; i > raw_length - 32; i--) {
- if (raw[i] == Jpeg.MARKER_PREFIX && raw[i + 1] == Jpeg.Marker.EOI) {
- debug("Adjusted length of thumbnail for: %s", filename);
- raw_length = i + 2;
- break;
- }
- }
- }
-
MemoryInputStream mins = new MemoryInputStream.from_data(raw, null);
return new Gdk.Pixbuf.from_stream_at_scale(mins, ImportPreview.MAX_SCALE, ImportPreview.MAX_SCALE, true, null);
}
@@ -205,18 +191,14 @@ namespace GPhoto {
GPhoto.CameraFile camera_file;
GPhoto.Result res = GPhoto.CameraFile.create_from_fd(out camera_file, fd);
if (res != Result.OK) {
- Posix.close(fd);
throw new GPhotoError.LIBRARY("[%d] Error allocating camera file: %s", (int) res, res.as_string());
}
res = camera.get_file(folder, filename, GPhoto.CameraFileType.NORMAL, camera_file, context);
if (res != Result.OK) {
- Posix.close(fd);
throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s",
(int) res, folder, filename, res.as_string());
}
-
- Posix.close(fd);
}
public PhotoMetadata? load_metadata(Context context, Camera camera, string folder, string filename)
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index e049511..2f5582f 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.34.7, the Vala compiler
+/* ImportPage.c generated by valac 0.36.6, the Vala compiler
* generated from ImportPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1393,8 +1393,8 @@ struct _BatchImportJobClass {
gchar* (*get_path) (BatchImportJob* self);
DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
- gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile** file_or_dir);
- gboolean (*prepare) (BatchImportJob* self, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+ gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
+ gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
time_t (*get_exposure_time_override) (BatchImportJob* self);
};
@@ -1507,7 +1507,7 @@ struct _ImportPageHideImportedViewFilterClass {
static gpointer import_source_collection_parent_class = NULL;
static gpointer import_source_parent_class = NULL;
extern GPSpinIdleWrapper* import_page_spin_idle_context;
-static IndexableIface* import_source_indexable_parent_iface = NULL;
+static IndexableIface * import_source_indexable_parent_iface = NULL;
static gpointer video_import_source_parent_class = NULL;
static gpointer photo_import_source_parent_class = NULL;
static gpointer import_preview_parent_class = NULL;
@@ -1517,7 +1517,7 @@ extern LibraryPhotoSourceCollection* library_photo_global;
extern VideoSourceCollection* video_global;
static gpointer camera_view_tracker_parent_class = NULL;
static gpointer camera_accumulator_parent_class = NULL;
-static CoreTrackerAccumulatorIface* camera_accumulator_core_tracker_accumulator_parent_iface = NULL;
+static CoreTrackerAccumulatorIface * camera_accumulator_core_tracker_accumulator_parent_iface = NULL;
static gpointer import_page_parent_class = NULL;
extern GPContextWrapper* import_page_null_context;
GPContextWrapper* import_page_null_context = NULL;
@@ -1613,7 +1613,7 @@ gpointer gp_value_get_context_wrapper (const GValue* value);
GType gp_context_wrapper_get_type (void) G_GNUC_CONST;
GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST;
static const gchar* import_source_real_get_indexable_keywords (Indexable* base);
-static void import_source_finalize (GObject* obj);
+static void import_source_finalize (GObject * obj);
GType video_import_source_get_type (void) G_GNUC_CONST;
enum {
VIDEO_IMPORT_SOURCE_DUMMY_PROPERTY
@@ -1676,7 +1676,7 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self);
void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated);
PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self);
static gboolean photo_import_source_real_internal_delete_backing (DataSource* base, GError** error);
-static void photo_import_source_finalize (GObject* obj);
+static void photo_import_source_finalize (GObject * obj);
GType data_view_get_type (void) G_GNUC_CONST;
GType thumbnail_view_get_type (void) G_GNUC_CONST;
GType checkerboard_item_get_type (void) G_GNUC_CONST;
@@ -1733,7 +1733,7 @@ DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id);
void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result);
DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self);
DataSource* data_view_get_source (DataView* self);
-static void import_preview_finalize (GObject* obj);
+static void import_preview_finalize (GObject * obj);
gpointer core_tracker_ref (gpointer instance);
void core_tracker_unref (gpointer instance);
GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1756,14 +1756,14 @@ CoreViewTracker* core_view_tracker_new (ViewCollection* collection);
CoreViewTracker* core_view_tracker_construct (GType object_type, ViewCollection* collection);
GType core_tracker_accumulator_get_type (void) G_GNUC_CONST;
void core_view_tracker_start (CoreViewTracker* self, CoreTrackerAccumulator* all, CoreTrackerAccumulator* visible, CoreTrackerAccumulator* selected);
-static void camera_view_tracker_finalize (CoreTracker* obj);
+static void camera_view_tracker_finalize (CoreTracker * obj);
#define CAMERA_ACCUMULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CAMERA_ACCUMULATOR, CameraAccumulatorPrivate))
enum {
CAMERA_ACCUMULATOR_DUMMY_PROPERTY,
- CAMERA_ACCUMULATOR_TOTAL,
- CAMERA_ACCUMULATOR_PHOTOS,
- CAMERA_ACCUMULATOR_VIDEOS,
- CAMERA_ACCUMULATOR_RAW
+ CAMERA_ACCUMULATOR_TOTAL_PROPERTY,
+ CAMERA_ACCUMULATOR_PHOTOS_PROPERTY,
+ CAMERA_ACCUMULATOR_VIDEOS_PROPERTY,
+ CAMERA_ACCUMULATOR_RAW_PROPERTY
};
static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object);
gint camera_accumulator_get_total (CameraAccumulator* self);
@@ -1777,7 +1777,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value);
static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object);
static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration);
gchar* camera_accumulator_to_string (CameraAccumulator* self);
-static void camera_accumulator_finalize (GObject* obj);
+static void camera_accumulator_finalize (GObject * obj);
static void _vala_camera_accumulator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
static void _vala_camera_accumulator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
GType page_get_type (void) G_GNUC_CONST;
@@ -1947,7 +1947,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename);
PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type);
PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename);
void spin_event_loop (void);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
gchar* md5_binary (guint8* buffer, gsize length);
@@ -2032,7 +2032,7 @@ enum {
};
ViewManager* view_manager_construct (GType object_type);
static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source);
-static void import_page_import_view_manager_finalize (ViewManager* obj);
+static void import_page_import_view_manager_finalize (ViewManager * obj);
gpointer backing_photo_row_ref (gpointer instance);
void backing_photo_row_unref (gpointer instance);
GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -2053,8 +2053,8 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base);
static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated);
static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* base);
-static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file);
-static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error);
+static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
+static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata* metadata, time_t ts, gboolean* collision, GError** error);
void library_monitor_blacklist_file (GFile* file, const gchar* reason);
void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error);
@@ -2069,7 +2069,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error);
void photo_set_raw_developer (Photo* self, RawDeveloper d);
RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
-static void import_page_camera_import_job_finalize (BatchImportJob* obj);
+static void import_page_camera_import_job_finalize (BatchImportJob * obj);
enum {
IMPORT_PAGE_IMPORT_PAGE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
};
@@ -2089,13 +2089,13 @@ enum {
};
static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, DataView* view);
ViewFilter* view_filter_construct (GType object_type);
-static void import_page_finalize (GObject* obj);
+static void import_page_finalize (GObject * obj);
static const GActionEntry IMPORT_PAGE_entries[3] = {{"ImportSelected", _import_page_on_import_selected_gsimple_action_activate_callback}, {"ImportAll", _import_page_on_import_all_gsimple_action_activate_callback}, {"ViewTitle", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _import_page_on_display_titles_gsimple_action_change_state_callback}};
ImportSourceCollection* import_source_collection_construct (GType object_type, const gchar* name) {
ImportSourceCollection* self = NULL;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 9 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2118,7 +2118,7 @@ ImportSourceCollection* import_source_collection_new (const gchar* name) {
static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
ImportSourceCollection * self;
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 12 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE_COLLECTION, ImportSourceCollection);
#line 12 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -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 = (gboolean (*)(SourceCollection*, DataSource*)) 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"
}
@@ -2167,19 +2167,19 @@ static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
ImportSource* import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
ImportSource * self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- Camera* _tmp2_ = NULL;
- Camera* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gulong _tmp9_ = 0UL;
- time_t _tmp10_ = 0;
- const gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ Camera* _tmp2_;
+ Camera* _tmp3_;
+ gint _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
+ gulong _tmp9_;
+ time_t _tmp10_;
+ const gchar* _tmp11_;
+ gchar* _tmp12_;
#line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera_name != NULL, NULL);
#line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2256,8 +2256,8 @@ static gpointer _g_object_ref0 (gpointer self) {
void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) {
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
#line 40 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_SOURCE (self));
#line 40 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2276,8 +2276,8 @@ void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) {
gchar* import_source_get_camera_name (ImportSource* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 44 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
#line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2294,8 +2294,8 @@ gchar* import_source_get_camera_name (ImportSource* self) {
Camera* import_source_get_camera (ImportSource* self) {
Camera* result = NULL;
- Camera* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
+ Camera* _tmp0_;
+ Camera* _tmp1_;
#line 48 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
#line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2312,7 +2312,7 @@ Camera* import_source_get_camera (ImportSource* self) {
gint import_source_get_fsid (ImportSource* self) {
gint result = 0;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 52 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0);
#line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2327,8 +2327,8 @@ gint import_source_get_fsid (ImportSource* self) {
gchar* import_source_get_folder (ImportSource* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 56 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
#line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2345,8 +2345,8 @@ gchar* import_source_get_folder (ImportSource* self) {
gchar* import_source_get_filename (ImportSource* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 60 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
#line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2363,7 +2363,7 @@ gchar* import_source_get_filename (ImportSource* self) {
gulong import_source_get_filesize (ImportSource* self) {
gulong result = 0UL;
- gulong _tmp0_ = 0UL;
+ gulong _tmp0_;
#line 64 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0UL);
#line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2378,7 +2378,7 @@ gulong import_source_get_filesize (ImportSource* self) {
time_t import_source_get_modification_time (ImportSource* self) {
time_t result = 0;
- time_t _tmp0_ = 0;
+ time_t _tmp0_;
#line 68 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0);
#line 69 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2393,8 +2393,8 @@ time_t import_source_get_modification_time (ImportSource* self) {
static GdkPixbuf* import_source_real_get_preview (ImportSource* self) {
GdkPixbuf* result = NULL;
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
#line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->preview;
#line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2418,7 +2418,7 @@ GdkPixbuf* import_source_get_preview (ImportSource* self) {
static time_t import_source_real_get_exposure_time (ImportSource* self) {
time_t result = 0;
- time_t _tmp0_ = 0;
+ time_t _tmp0_;
#line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = import_source_get_modification_time (self);
#line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2440,15 +2440,15 @@ time_t import_source_get_exposure_time (ImportSource* self) {
gchar* import_source_get_fulldir (ImportSource* self) {
gchar* result = NULL;
- Camera* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ Camera* _tmp0_;
+ Camera* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 80 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2486,14 +2486,14 @@ gchar* import_source_get_fulldir (ImportSource* self) {
static gchar* import_source_real_to_string (DataObject* base) {
ImportSource * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 84 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource);
#line 85 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2528,8 +2528,8 @@ static gchar* import_source_real_to_string (DataObject* base) {
static gchar* gp_result_to_full_string (int self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
_tmp0_ = gp_port_result_as_string (self);
#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
@@ -2545,26 +2545,26 @@ static gchar* gp_result_to_full_string (int self) {
static gboolean import_source_real_internal_delete_backing (DataSource* base, GError** error) {
ImportSource * self;
gboolean result = FALSE;
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
gchar* fulldir = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
int _result_ = 0;
- Camera* _tmp11_ = NULL;
- Camera* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- GPSpinIdleWrapper* _tmp16_ = NULL;
- GPContext* _tmp17_ = NULL;
- int _tmp18_ = 0;
- int _tmp19_ = 0;
- int _tmp20_ = 0;
+ Camera* _tmp11_;
+ Camera* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ GPSpinIdleWrapper* _tmp16_;
+ GPContext* _tmp17_;
+ int _tmp18_;
+ int _tmp19_;
+ int _tmp20_;
gboolean _tmp27_ = FALSE;
gboolean _tmp28_ = FALSE;
- gboolean _tmp29_ = FALSE;
+ gboolean _tmp29_;
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);
@@ -2587,11 +2587,11 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
#line 92 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ == NULL) {
#line 2589 "ImportPage.c"
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ const gchar* _tmp7_;
gboolean _tmp8_ = FALSE;
- gboolean _tmp9_ = FALSE;
+ gboolean _tmp9_;
#line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2655,12 +2655,12 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
#line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp20_ != GP_OK) {
#line 2657 "ImportPage.c"
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- int _tmp24_ = 0;
- gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ const gchar* _tmp23_;
+ int _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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"
@@ -2700,7 +2700,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp28_) {
#line 2702 "ImportPage.c"
- int _tmp31_ = 0;
+ int _tmp31_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp31_ = _result_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2724,7 +2724,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
static const gchar* import_source_real_get_indexable_keywords (Indexable* base) {
ImportSource * self;
const gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource);
#line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2743,13 +2743,13 @@ 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 = (GdkPixbuf* (*)(ImportSource*)) 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 = (time_t (*)(ImportSource*)) 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 = (gchar* (*)(DataObject*)) 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 = (gboolean (*)(DataSource*, GError**)) 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 2755 "ImportPage.c"
@@ -2760,7 +2760,7 @@ static void import_source_indexable_interface_init (IndexableIface * iface) {
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
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;
+ iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) import_source_real_get_indexable_keywords;
#line 2764 "ImportPage.c"
}
@@ -2776,7 +2776,7 @@ static void import_source_instance_init (ImportSource * self) {
}
-static void import_source_finalize (GObject* obj) {
+static void import_source_finalize (GObject * obj) {
ImportSource * self;
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_SOURCE, ImportSource);
@@ -2814,13 +2814,13 @@ GType import_source_get_type (void) {
VideoImportSource* video_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
VideoImportSource * self = NULL;
- const gchar* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gulong _tmp5_ = 0UL;
- time_t _tmp6_ = 0;
+ const gchar* _tmp0_;
+ Camera* _tmp1_;
+ gint _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gulong _tmp5_;
+ time_t _tmp6_;
#line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera_name != NULL, NULL);
#line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2862,9 +2862,9 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
VideoImportSource * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
+ gint _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
GError * _inner_error_ = NULL;
#line 117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
@@ -2899,11 +2899,11 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
VideoImportSource * self;
GdkPixbuf* result = NULL;
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ gboolean _tmp2_;
GdkPixbuf* _tmp3_ = NULL;
- gint _tmp4_ = 0;
+ gint _tmp4_;
#line 121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
#line 122 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2927,10 +2927,10 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ > 0) {
#line 2929 "ImportPage.c"
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- GdkPixbuf* _tmp8_ = NULL;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ gint _tmp7_;
+ GdkPixbuf* _tmp8_;
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2947,7 +2947,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
_g_object_unref0 (_tmp6_);
#line 2948 "ImportPage.c"
} else {
- GdkPixbuf* _tmp9_ = NULL;
+ GdkPixbuf* _tmp9_;
#line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2967,7 +2967,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
static gchar* video_import_source_real_get_typename (DataSource* base) {
VideoImportSource * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
#line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2983,7 +2983,7 @@ static gchar* video_import_source_real_get_typename (DataSource* base) {
static gint64 video_import_source_real_get_instance_id (DataSource* base) {
VideoImportSource * self;
gint64 result = 0LL;
- gint64 _tmp0_ = 0LL;
+ gint64 _tmp0_;
#line 135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
#line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2999,7 +2999,7 @@ static gint64 video_import_source_real_get_instance_id (DataSource* base) {
static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) {
VideoImportSource * self;
PhotoFileFormat result = 0;
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
#line 139 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
#line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3015,7 +3015,7 @@ static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (
static gchar* video_import_source_real_get_name (DataObject* base) {
VideoImportSource * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource);
#line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3030,7 +3030,7 @@ static gchar* video_import_source_real_get_name (DataObject* base) {
void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp1_;
#line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_VIDEO_IMPORT_SOURCE (self));
#line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3040,8 +3040,8 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_ != NULL) {
#line 3042 "ImportPage.c"
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = preview;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3052,7 +3052,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
_tmp0_ = _tmp3_;
#line 3053 "ImportPage.c"
} else {
- GdkPixbuf* _tmp4_ = NULL;
+ GdkPixbuf* _tmp4_;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = resources_get_noninterpretable_badge_pixbuf ();
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3073,17 +3073,17 @@ 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 = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) 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 = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) 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 = (gchar* (*)(DataSource*)) 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 = (gint64 (*)(DataSource*)) 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 = (PhotoFileFormat (*)(ThumbnailSource*)) 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 = (gchar* (*)(DataObject*)) video_import_source_real_get_name;
+ ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) video_import_source_real_get_name;
#line 3087 "ImportPage.c"
}
@@ -3106,14 +3106,14 @@ GType video_import_source_get_type (void) {
PhotoImportSource* photo_import_source_construct (GType object_type, const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) {
PhotoImportSource * self = NULL;
- const gchar* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gulong _tmp5_ = 0UL;
- time_t _tmp6_ = 0;
- PhotoFileFormat _tmp7_ = 0;
+ const gchar* _tmp0_;
+ Camera* _tmp1_;
+ gint _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gulong _tmp5_;
+ time_t _tmp6_;
+ PhotoFileFormat _tmp7_;
#line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera_name != NULL, NULL);
#line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3159,10 +3159,10 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
PhotoImportSource * self;
gchar* result = NULL;
gchar* title = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ const gchar* _tmp2_;
+ gboolean _tmp3_;
#line 167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 168 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3176,8 +3176,8 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp3_) {
#line 3178 "ImportPage.c"
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = title;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3188,7 +3188,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
_tmp1_ = _tmp5_;
#line 3189 "ImportPage.c"
} else {
- gchar* _tmp6_ = NULL;
+ gchar* _tmp6_;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3210,7 +3210,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
static gchar* photo_import_source_real_get_typename (DataSource* base) {
PhotoImportSource * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3226,7 +3226,7 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) {
static gint64 photo_import_source_real_get_instance_id (DataSource* base) {
PhotoImportSource * self;
gint64 result = 0LL;
- gint64 _tmp0_ = 0LL;
+ gint64 _tmp0_;
#line 177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3243,8 +3243,8 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
PhotoImportSource * self;
PhotoFileFormat result = 0;
PhotoFileFormat _tmp0_ = 0;
- PhotoFileFormat _tmp1_ = 0;
- gboolean _tmp2_ = FALSE;
+ PhotoFileFormat _tmp1_;
+ gboolean _tmp2_;
#line 181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3254,14 +3254,14 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
#line 3256 "ImportPage.c"
- PhotoFileFormat _tmp3_ = 0;
+ PhotoFileFormat _tmp3_;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->file_format;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp3_;
#line 3262 "ImportPage.c"
} else {
- PhotoFileFormat _tmp4_ = 0;
+ PhotoFileFormat _tmp4_;
#line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = photo_file_format_get_system_default_format ();
#line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3279,11 +3279,11 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
PhotoImportSource * self;
GdkPixbuf* result = NULL;
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ gboolean _tmp2_;
GdkPixbuf* _tmp3_ = NULL;
- gint _tmp4_ = 0;
+ gint _tmp4_;
#line 186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3307,10 +3307,10 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ > 0) {
#line 3309 "ImportPage.c"
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- GdkPixbuf* _tmp8_ = NULL;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ gint _tmp7_;
+ GdkPixbuf* _tmp8_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3327,7 +3327,7 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
_g_object_unref0 (_tmp6_);
#line 3328 "ImportPage.c"
} else {
- GdkPixbuf* _tmp9_ = NULL;
+ GdkPixbuf* _tmp9_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3352,13 +3352,13 @@ static gpointer _media_metadata_ref0 (gpointer self) {
void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, const gchar* preview_md5, PhotoMetadata* metadata, const gchar* exif_md5) {
- GdkPixbuf* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
- PhotoMetadata* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ GdkPixbuf* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ PhotoMetadata* _tmp3_;
+ PhotoMetadata* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
#line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_PHOTO_IMPORT_SOURCE (self));
#line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3400,12 +3400,12 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co
static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
PhotoImportSource * self;
time_t result = 0;
- PhotoMetadata* _tmp0_ = NULL;
+ PhotoMetadata* _tmp0_;
MetadataDateTime* date_time = NULL;
- PhotoMetadata* _tmp2_ = NULL;
- MetadataDateTime* _tmp3_ = NULL;
+ PhotoMetadata* _tmp2_;
+ MetadataDateTime* _tmp3_;
time_t _tmp4_ = 0;
- MetadataDateTime* _tmp5_ = NULL;
+ MetadataDateTime* _tmp5_;
#line 203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3413,7 +3413,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
#line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ == NULL) {
#line 3415 "ImportPage.c"
- time_t _tmp1_ = 0;
+ time_t _tmp1_;
#line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3433,8 +3433,8 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_ != NULL) {
#line 3435 "ImportPage.c"
- MetadataDateTime* _tmp6_ = NULL;
- time_t _tmp7_ = 0;
+ MetadataDateTime* _tmp6_;
+ time_t _tmp7_;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = date_time;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3443,7 +3443,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
_tmp4_ = _tmp7_;
#line 3444 "ImportPage.c"
} else {
- time_t _tmp8_ = 0;
+ time_t _tmp8_;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3463,7 +3463,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
gchar* photo_import_source_get_title (PhotoImportSource* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- PhotoMetadata* _tmp1_ = NULL;
+ PhotoMetadata* _tmp1_;
#line 212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3471,8 +3471,8 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_ != NULL) {
#line 3473 "ImportPage.c"
- PhotoMetadata* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ PhotoMetadata* _tmp2_;
+ gchar* _tmp3_;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->metadata;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3499,9 +3499,9 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
PhotoMetadata* result = NULL;
- PhotoImportSource* _tmp0_ = NULL;
- PhotoMetadata* _tmp3_ = NULL;
- PhotoMetadata* _tmp4_ = NULL;
+ PhotoImportSource* _tmp0_;
+ PhotoMetadata* _tmp3_;
+ PhotoMetadata* _tmp4_;
#line 216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
#line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3509,8 +3509,8 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
#line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
#line 3511 "ImportPage.c"
- PhotoImportSource* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
+ PhotoImportSource* _tmp1_;
+ PhotoMetadata* _tmp2_;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->associated;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3536,10 +3536,10 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
PhotoImportSource * self;
GdkPixbuf* result = NULL;
- PhotoImportSource* _tmp0_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ PhotoImportSource* _tmp0_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ gboolean _tmp5_;
#line 223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3547,8 +3547,8 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
#line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
#line 3549 "ImportPage.c"
- PhotoImportSource* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
+ PhotoImportSource* _tmp1_;
+ GdkPixbuf* _tmp2_;
#line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->associated;
#line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3570,7 +3570,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
#line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
#line 3572 "ImportPage.c"
- GdkPixbuf* _tmp6_ = NULL;
+ GdkPixbuf* _tmp6_;
#line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3590,11 +3590,11 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
PhotoImportSource * self;
GdkPixbuf* result = NULL;
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ gboolean _tmp2_;
GdkPixbuf* _tmp3_ = NULL;
- gint _tmp4_ = 0;
+ gint _tmp4_;
#line 233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
#line 234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3618,10 +3618,10 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ > 0) {
#line 3620 "ImportPage.c"
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- GdkPixbuf* _tmp8_ = NULL;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ gint _tmp7_;
+ GdkPixbuf* _tmp8_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3638,7 +3638,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
_g_object_unref0 (_tmp6_);
#line 3639 "ImportPage.c"
} else {
- GdkPixbuf* _tmp9_ = NULL;
+ GdkPixbuf* _tmp9_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3657,7 +3657,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
PhotoFileFormat result = 0;
- PhotoFileFormat _tmp0_ = 0;
+ PhotoFileFormat _tmp0_;
#line 240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), 0);
#line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3672,8 +3672,8 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 244 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
#line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3689,8 +3689,8 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated) {
- PhotoImportSource* _tmp0_ = NULL;
- PhotoImportSource* _tmp1_ = NULL;
+ PhotoImportSource* _tmp0_;
+ PhotoImportSource* _tmp1_;
#line 248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_PHOTO_IMPORT_SOURCE (self));
#line 248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3709,8 +3709,8 @@ void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSou
PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self) {
PhotoImportSource* result = NULL;
- PhotoImportSource* _tmp0_ = NULL;
- PhotoImportSource* _tmp1_ = NULL;
+ PhotoImportSource* _tmp0_;
+ PhotoImportSource* _tmp1_;
#line 252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_PHOTO_IMPORT_SOURCE (self), NULL);
#line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3729,8 +3729,8 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
PhotoImportSource * self;
gboolean result = FALSE;
gboolean ret = FALSE;
- gboolean _tmp0_ = FALSE;
- PhotoImportSource* _tmp2_ = NULL;
+ gboolean _tmp0_;
+ PhotoImportSource* _tmp2_;
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);
@@ -3754,9 +3754,9 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
if (_tmp2_ != NULL) {
#line 3755 "ImportPage.c"
gboolean _tmp3_ = FALSE;
- PhotoImportSource* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp7_ = FALSE;
+ PhotoImportSource* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp7_;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->associated;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3793,23 +3793,23 @@ 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 = (gchar* (*)(DataObject*)) 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 = (gchar* (*)(DataSource*)) 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 = (gint64 (*)(DataSource*)) 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 = (PhotoFileFormat (*)(ThumbnailSource*)) 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 = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) 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 = (time_t (*)(ImportSource*)) 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 = (GdkPixbuf* (*)(ImportSource*)) 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 = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) 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 = (gboolean (*)(DataSource*, GError**)) 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 3815 "ImportPage.c"
@@ -3831,7 +3831,7 @@ static void photo_import_source_instance_init (PhotoImportSource * self) {
}
-static void photo_import_source_finalize (GObject* obj) {
+static void photo_import_source_finalize (GObject * obj) {
PhotoImportSource * self;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource);
@@ -3863,21 +3863,21 @@ GType photo_import_source_get_type (void) {
ImportPreview* import_preview_construct (GType object_type, ImportSource* source) {
ImportPreview * self = NULL;
- ImportSource* _tmp0_ = NULL;
+ ImportSource* _tmp0_;
Dimensions _tmp1_ = {0};
- ImportSource* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- ImportSource* _tmp5_ = NULL;
+ ImportSource* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ ImportSource* _tmp5_;
GdkPixbuf* pixbuf = NULL;
gboolean using_placeholder = FALSE;
- GdkPixbuf* _tmp14_ = NULL;
- GdkPixbuf* _tmp15_ = NULL;
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
gboolean _tmp22_ = FALSE;
- GdkPixbuf* _tmp23_ = NULL;
- gint _tmp24_ = 0;
- ImportSource* _tmp29_ = NULL;
- GdkPixbuf* _tmp50_ = NULL;
+ GdkPixbuf* _tmp23_;
+ gint _tmp24_;
+ ImportSource* _tmp29_;
+ GdkPixbuf* _tmp49_;
GError * _inner_error_ = NULL;
#line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (source), NULL);
@@ -3912,9 +3912,9 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
#line 3912 "ImportPage.c"
{
GdkPixbuf* _tmp6_ = NULL;
- ImportSource* _tmp7_ = NULL;
- GdkPixbuf* _tmp8_ = NULL;
- GdkPixbuf* _tmp9_ = NULL;
+ ImportSource* _tmp7_;
+ GdkPixbuf* _tmp8_;
+ GdkPixbuf* _tmp9_;
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = source;
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3924,7 +3924,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3926 "ImportPage.c"
- goto __catch64_g_error;
+ goto __catch65_g_error;
}
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp6_;
@@ -3938,14 +3938,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_object_unref0 (_tmp6_);
#line 3939 "ImportPage.c"
}
- goto __finally64;
- __catch64_g_error:
+ goto __finally65;
+ __catch65_g_error:
{
GError* err = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- GError* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ GError* _tmp12_;
+ const gchar* _tmp13_;
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3966,7 +3966,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_g_error_free0 (err);
#line 3967 "ImportPage.c"
}
- __finally64:
+ __finally65:
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3988,17 +3988,17 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
#line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp15_ == NULL) {
#line 3990 "ImportPage.c"
- GdkPixbuf* _tmp16_ = NULL;
- GdkPixbuf* _tmp20_ = NULL;
- GdkPixbuf* _tmp21_ = NULL;
+ GdkPixbuf* _tmp16_;
+ GdkPixbuf* _tmp20_;
+ GdkPixbuf* _tmp21_;
#line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = import_preview_placeholder_preview;
#line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp16_ == NULL) {
#line 3998 "ImportPage.c"
- GdkPixbuf* _tmp17_ = NULL;
- GdkPixbuf* _tmp18_ = NULL;
- GdkPixbuf* _tmp19_ = NULL;
+ GdkPixbuf* _tmp17_;
+ GdkPixbuf* _tmp18_;
+ GdkPixbuf* _tmp19_;
#line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = get_placeholder_pixbuf ();
#line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4035,8 +4035,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
_tmp22_ = TRUE;
#line 4036 "ImportPage.c"
} else {
- GdkPixbuf* _tmp25_ = NULL;
- gint _tmp26_ = 0;
+ GdkPixbuf* _tmp25_;
+ gint _tmp26_;
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = pixbuf;
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4048,8 +4048,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp22_) {
#line 4050 "ImportPage.c"
- GdkPixbuf* _tmp27_ = NULL;
- GdkPixbuf* _tmp28_ = NULL;
+ GdkPixbuf* _tmp27_;
+ GdkPixbuf* _tmp28_;
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = pixbuf;
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4066,14 +4066,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) {
#line 4067 "ImportPage.c"
PhotoImportSource* photo_import_source = NULL;
- ImportSource* _tmp30_ = NULL;
- PhotoImportSource* _tmp31_ = NULL;
+ ImportSource* _tmp30_;
+ PhotoImportSource* _tmp31_;
gboolean _tmp32_ = FALSE;
- gboolean _tmp33_ = FALSE;
- PhotoImportSource* _tmp43_ = NULL;
- PhotoImportSource* _tmp44_ = NULL;
- PhotoImportSource* _tmp45_ = NULL;
- gboolean _tmp46_ = FALSE;
+ gboolean _tmp33_;
+ PhotoImportSource* _tmp43_;
+ PhotoImportSource* _tmp44_;
+ PhotoImportSource* _tmp45_;
+ gboolean _tmp46_;
#line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = source;
#line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4085,9 +4085,9 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp33_) {
#line 4087 "ImportPage.c"
- PhotoImportSource* _tmp34_ = NULL;
- PhotoMetadata* _tmp35_ = NULL;
- PhotoMetadata* _tmp36_ = NULL;
+ PhotoImportSource* _tmp34_;
+ PhotoMetadata* _tmp35_;
+ PhotoMetadata* _tmp36_;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = photo_import_source;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4107,12 +4107,12 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp32_) {
#line 4109 "ImportPage.c"
- PhotoImportSource* _tmp37_ = NULL;
- PhotoMetadata* _tmp38_ = NULL;
- PhotoMetadata* _tmp39_ = NULL;
- Orientation _tmp40_ = 0;
- GdkPixbuf* _tmp41_ = NULL;
- GdkPixbuf* _tmp42_ = NULL;
+ PhotoImportSource* _tmp37_;
+ PhotoMetadata* _tmp38_;
+ PhotoMetadata* _tmp39_;
+ Orientation _tmp40_;
+ GdkPixbuf* _tmp41_;
+ GdkPixbuf* _tmp42_;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp37_ = photo_import_source;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4146,54 +4146,51 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp46_) {
#line 4148 "ImportPage.c"
- const gchar* _tmp47_ = NULL;
- gchar* _tmp48_ = NULL;
- gchar* _tmp49_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = _ ("RAW+JPEG");
+ gchar* _tmp47_;
+ gchar* _tmp48_;
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = g_strdup_printf ("<small>%s</small>", _tmp47_);
+ _tmp47_ = g_strdup_printf ("<small>%s</small>", _ ("RAW+JPEG"));
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = _tmp48_;
+ _tmp48_ = _tmp47_;
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_, TRUE, PANGO_ALIGN_LEFT);
+ checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp48_, TRUE, PANGO_ALIGN_LEFT);
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp49_);
-#line 4162 "ImportPage.c"
+ _g_free0 (_tmp48_);
+#line 4159 "ImportPage.c"
}
#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo_import_source);
-#line 4166 "ImportPage.c"
+#line 4163 "ImportPage.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = pixbuf;
+ _tmp49_ = pixbuf;
#line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp50_);
+ checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_);
#line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (pixbuf);
#line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 4176 "ImportPage.c"
+#line 4173 "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 4183 "ImportPage.c"
+#line 4180 "ImportPage.c"
}
gboolean import_preview_is_already_imported (ImportPreview* self) {
gboolean result = FALSE;
PhotoImportSource* photo_import_source = NULL;
- ImportSource* _tmp0_ = NULL;
- PhotoImportSource* _tmp1_ = NULL;
- PhotoImportSource* _tmp2_ = NULL;
+ ImportSource* _tmp0_;
+ PhotoImportSource* _tmp1_;
+ PhotoImportSource* _tmp2_;
VideoImportSource* video_import_source = NULL;
- ImportSource* _tmp49_ = NULL;
- VideoImportSource* _tmp50_ = NULL;
- VideoImportSource* _tmp51_ = NULL;
+ ImportSource* _tmp49_;
+ VideoImportSource* _tmp50_;
+ VideoImportSource* _tmp51_;
#line 318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PREVIEW (self), FALSE);
#line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4204,7 +4201,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 4207 "ImportPage.c"
+#line 4204 "ImportPage.c"
}
#line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source = _tmp1_;
@@ -4212,17 +4209,17 @@ 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 4215 "ImportPage.c"
+#line 4212 "ImportPage.c"
gchar* preview_md5 = NULL;
- PhotoImportSource* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ PhotoImportSource* _tmp3_;
+ gchar* _tmp4_;
PhotoFileFormat file_format = 0;
- PhotoImportSource* _tmp5_ = NULL;
- PhotoFileFormat _tmp6_ = 0;
+ PhotoImportSource* _tmp5_;
+ PhotoFileFormat _tmp6_;
gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
- PhotoFileFormat _tmp17_ = 0;
+ const gchar* _tmp8_;
+ gboolean _tmp9_;
+ PhotoFileFormat _tmp17_;
#line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = photo_import_source;
#line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4241,10 +4238,10 @@ 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 4244 "ImportPage.c"
- const gchar* _tmp10_ = NULL;
- PhotoFileFormat _tmp11_ = 0;
- gboolean _tmp12_ = FALSE;
+#line 4241 "ImportPage.c"
+ const gchar* _tmp10_;
+ PhotoFileFormat _tmp11_;
+ gboolean _tmp12_;
#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = preview_md5;
#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4253,19 +4250,19 @@ 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 4256 "ImportPage.c"
+#line 4253 "ImportPage.c"
} else {
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = FALSE;
-#line 4260 "ImportPage.c"
+#line 4257 "ImportPage.c"
}
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp7_) {
-#line 4264 "ImportPage.c"
- const gchar* _tmp13_ = NULL;
- PhotoFileFormat _tmp14_ = 0;
+#line 4261 "ImportPage.c"
+ const gchar* _tmp13_;
+ PhotoFileFormat _tmp14_;
PhotoID _tmp15_ = {0};
- DuplicatedFile* _tmp16_ = NULL;
+ DuplicatedFile* _tmp16_;
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = preview_md5;
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4286,19 +4283,19 @@ 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 4289 "ImportPage.c"
+#line 4286 "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 4295 "ImportPage.c"
+#line 4292 "ImportPage.c"
guint64 filesize = 0ULL;
- ImportSource* _tmp18_ = NULL;
- ImportSource* _tmp19_ = NULL;
- gulong _tmp20_ = 0UL;
- guint64 _tmp21_ = 0ULL;
- guint64 _tmp22_ = 0ULL;
+ ImportSource* _tmp18_;
+ ImportSource* _tmp19_;
+ gulong _tmp20_;
+ guint64 _tmp21_;
+ guint64 _tmp22_;
#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = import_preview_get_import_source (self);
#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4315,17 +4312,17 @@ 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 4318 "ImportPage.c"
+#line 4315 "ImportPage.c"
PhotoID duplicated_photo_id = {0};
- LibraryPhotoSourceCollection* _tmp23_ = NULL;
- ImportSource* _tmp24_ = NULL;
- ImportSource* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- guint64 _tmp28_ = 0ULL;
+ LibraryPhotoSourceCollection* _tmp23_;
+ ImportSource* _tmp24_;
+ ImportSource* _tmp25_;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
+ guint64 _tmp28_;
PhotoID _tmp29_ = {0};
- PhotoID _tmp30_ = {0};
- gboolean _tmp31_ = FALSE;
+ PhotoID _tmp30_;
+ gboolean _tmp31_;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp23_ = library_photo_global;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4352,19 +4349,19 @@ 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 4355 "ImportPage.c"
+#line 4352 "ImportPage.c"
LibraryPhoto* duplicated_photo = NULL;
- LibraryPhotoSourceCollection* _tmp32_ = NULL;
- PhotoID _tmp33_ = {0};
- LibraryPhoto* _tmp34_ = NULL;
+ LibraryPhotoSourceCollection* _tmp32_;
+ PhotoID _tmp33_;
+ LibraryPhoto* _tmp34_;
time_t photo_exposure_time = 0;
- PhotoImportSource* _tmp35_ = NULL;
- time_t _tmp36_ = 0;
+ PhotoImportSource* _tmp35_;
+ time_t _tmp36_;
time_t duplicated_photo_exposure_time = 0;
- LibraryPhoto* _tmp37_ = NULL;
- time_t _tmp38_ = 0;
- time_t _tmp39_ = 0;
- time_t _tmp40_ = 0;
+ LibraryPhoto* _tmp37_;
+ time_t _tmp38_;
+ time_t _tmp39_;
+ time_t _tmp40_;
#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = library_photo_global;
#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4391,15 +4388,15 @@ 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 4394 "ImportPage.c"
- LibraryPhotoSourceCollection* _tmp41_ = NULL;
- ImportSource* _tmp42_ = NULL;
- ImportSource* _tmp43_ = NULL;
- gchar* _tmp44_ = NULL;
- gchar* _tmp45_ = NULL;
- guint64 _tmp46_ = 0ULL;
+#line 4391 "ImportPage.c"
+ LibraryPhotoSourceCollection* _tmp41_;
+ ImportSource* _tmp42_;
+ ImportSource* _tmp43_;
+ gchar* _tmp44_;
+ gchar* _tmp45_;
+ guint64 _tmp46_;
PhotoID _tmp47_ = {0};
- DuplicatedFile* _tmp48_ = NULL;
+ DuplicatedFile* _tmp48_;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = library_photo_global;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4434,11 +4431,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 4437 "ImportPage.c"
+#line 4434 "ImportPage.c"
}
#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (duplicated_photo);
-#line 4441 "ImportPage.c"
+#line 4438 "ImportPage.c"
}
}
}
@@ -4450,7 +4447,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 4453 "ImportPage.c"
+#line 4450 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = import_preview_get_import_source (self);
@@ -4460,7 +4457,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 4463 "ImportPage.c"
+#line 4460 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
video_import_source = _tmp50_;
@@ -4468,15 +4465,15 @@ 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 4471 "ImportPage.c"
- VideoSourceCollection* _tmp52_ = NULL;
- VideoImportSource* _tmp53_ = NULL;
- gchar* _tmp54_ = NULL;
- gchar* _tmp55_ = NULL;
- VideoImportSource* _tmp56_ = NULL;
- gulong _tmp57_ = 0UL;
- gboolean _tmp58_ = FALSE;
- gboolean _tmp59_ = FALSE;
+#line 4468 "ImportPage.c"
+ VideoSourceCollection* _tmp52_;
+ VideoImportSource* _tmp53_;
+ gchar* _tmp54_;
+ gchar* _tmp55_;
+ VideoImportSource* _tmp56_;
+ gulong _tmp57_;
+ gboolean _tmp58_;
+ gboolean _tmp59_;
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = video_global;
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4497,15 +4494,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
_g_free0 (_tmp55_);
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp59_) {
-#line 4500 "ImportPage.c"
- VideoSourceCollection* _tmp60_ = NULL;
- VideoImportSource* _tmp61_ = NULL;
- gchar* _tmp62_ = NULL;
- gchar* _tmp63_ = NULL;
- VideoImportSource* _tmp64_ = NULL;
- gulong _tmp65_ = 0UL;
+#line 4497 "ImportPage.c"
+ VideoSourceCollection* _tmp60_;
+ VideoImportSource* _tmp61_;
+ gchar* _tmp62_;
+ gchar* _tmp63_;
+ VideoImportSource* _tmp64_;
+ gulong _tmp65_;
VideoID _tmp66_ = {0};
- DuplicatedFile* _tmp67_ = NULL;
+ DuplicatedFile* _tmp67_;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp60_ = video_global;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4536,7 +4533,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 4539 "ImportPage.c"
+#line 4536 "ImportPage.c"
}
#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4546,7 +4543,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 4549 "ImportPage.c"
+#line 4546 "ImportPage.c"
}
#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4556,15 +4553,15 @@ 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 4559 "ImportPage.c"
+#line 4556 "ImportPage.c"
}
DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
DuplicatedFile* result = NULL;
- gboolean _tmp0_ = FALSE;
- DuplicatedFile* _tmp1_ = NULL;
- DuplicatedFile* _tmp2_ = NULL;
+ gboolean _tmp0_;
+ DuplicatedFile* _tmp1_;
+ DuplicatedFile* _tmp2_;
#line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL);
#line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4575,7 +4572,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
result = NULL;
#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4578 "ImportPage.c"
+#line 4575 "ImportPage.c"
}
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->duplicated_file;
@@ -4585,13 +4582,13 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
result = _tmp2_;
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4588 "ImportPage.c"
+#line 4585 "ImportPage.c"
}
ImportSource* import_preview_get_import_source (ImportPreview* self) {
ImportSource* result = NULL;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PREVIEW (self), NULL);
#line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4600,7 +4597,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 4603 "ImportPage.c"
+#line 4600 "ImportPage.c"
}
@@ -4611,18 +4608,18 @@ 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 4614 "ImportPage.c"
+#line 4611 "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 4621 "ImportPage.c"
+#line 4618 "ImportPage.c"
}
-static void import_preview_finalize (GObject* obj) {
+static void import_preview_finalize (GObject * obj) {
ImportPreview * self;
#line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PREVIEW, ImportPreview);
@@ -4630,7 +4627,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 4633 "ImportPage.c"
+#line 4630 "ImportPage.c"
}
@@ -4648,10 +4645,10 @@ GType import_preview_get_type (void) {
CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollection* collection) {
CameraViewTracker* self = NULL;
- ViewCollection* _tmp0_ = NULL;
- CameraAccumulator* _tmp1_ = NULL;
- CameraAccumulator* _tmp2_ = NULL;
- CameraAccumulator* _tmp3_ = NULL;
+ ViewCollection* _tmp0_;
+ CameraAccumulator* _tmp1_;
+ CameraAccumulator* _tmp2_;
+ CameraAccumulator* _tmp3_;
#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (collection), NULL);
#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4668,14 +4665,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 4671 "ImportPage.c"
+#line 4668 "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 4678 "ImportPage.c"
+#line 4675 "ImportPage.c"
}
@@ -4684,14 +4681,14 @@ 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 4687 "ImportPage.c"
+#line 4684 "ImportPage.c"
}
static void camera_view_tracker_instance_init (CameraViewTracker * self) {
- CameraAccumulator* _tmp0_ = NULL;
- CameraAccumulator* _tmp1_ = NULL;
- CameraAccumulator* _tmp2_ = NULL;
+ CameraAccumulator* _tmp0_;
+ CameraAccumulator* _tmp1_;
+ CameraAccumulator* _tmp2_;
#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = camera_accumulator_new ();
#line 400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4704,11 +4701,11 @@ 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 4707 "ImportPage.c"
+#line 4704 "ImportPage.c"
}
-static void camera_view_tracker_finalize (CoreTracker* obj) {
+static void camera_view_tracker_finalize (CoreTracker * obj) {
CameraViewTracker * self;
#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker);
@@ -4720,7 +4717,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 4723 "ImportPage.c"
+#line 4720 "ImportPage.c"
}
@@ -4740,14 +4737,14 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
CameraAccumulator * self;
gboolean result = FALSE;
ImportSource* source = NULL;
- DataObject* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ DataObject* _tmp0_;
+ DataSource* _tmp1_;
+ gint _tmp2_;
PhotoImportSource* photo = NULL;
- ImportSource* _tmp3_ = NULL;
- PhotoImportSource* _tmp4_ = NULL;
+ ImportSource* _tmp3_;
+ PhotoImportSource* _tmp4_;
gboolean _tmp5_ = FALSE;
- PhotoImportSource* _tmp6_ = NULL;
+ PhotoImportSource* _tmp6_;
#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
#line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4772,74 +4769,74 @@ 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 4775 "ImportPage.c"
- PhotoImportSource* _tmp7_ = NULL;
- PhotoFileFormat _tmp8_ = 0;
+#line 4772 "ImportPage.c"
+ PhotoImportSource* _tmp7_;
+ PhotoFileFormat _tmp8_;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = photo;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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 4784 "ImportPage.c"
+#line 4781 "ImportPage.c"
} else {
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = FALSE;
-#line 4788 "ImportPage.c"
+#line 4785 "ImportPage.c"
}
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 4792 "ImportPage.c"
- gint _tmp9_ = 0;
+#line 4789 "ImportPage.c"
+ gint _tmp9_;
#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = self->priv->_photos;
#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_photos (self, _tmp9_ + 1);
-#line 4798 "ImportPage.c"
+#line 4795 "ImportPage.c"
} else {
gboolean _tmp10_ = FALSE;
- PhotoImportSource* _tmp11_ = NULL;
+ PhotoImportSource* _tmp11_;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = photo;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_ != NULL) {
-#line 4806 "ImportPage.c"
- PhotoImportSource* _tmp12_ = NULL;
- PhotoFileFormat _tmp13_ = 0;
+#line 4803 "ImportPage.c"
+ PhotoImportSource* _tmp12_;
+ PhotoFileFormat _tmp13_;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = photo;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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 4815 "ImportPage.c"
+#line 4812 "ImportPage.c"
} else {
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = FALSE;
-#line 4819 "ImportPage.c"
+#line 4816 "ImportPage.c"
}
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp10_) {
-#line 4823 "ImportPage.c"
- gint _tmp14_ = 0;
+#line 4820 "ImportPage.c"
+ gint _tmp14_;
#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = self->priv->_raw;
#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_raw (self, _tmp14_ + 1);
-#line 4829 "ImportPage.c"
+#line 4826 "ImportPage.c"
} else {
- ImportSource* _tmp15_ = NULL;
+ ImportSource* _tmp15_;
#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = source;
#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4836 "ImportPage.c"
- gint _tmp16_ = 0;
+#line 4833 "ImportPage.c"
+ gint _tmp16_;
#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = self->priv->_videos;
#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_videos (self, _tmp16_ + 1);
-#line 4842 "ImportPage.c"
+#line 4839 "ImportPage.c"
}
}
}
@@ -4851,7 +4848,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 4854 "ImportPage.c"
+#line 4851 "ImportPage.c"
}
@@ -4859,14 +4856,14 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
CameraAccumulator * self;
gboolean result = FALSE;
ImportSource* source = NULL;
- DataObject* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- gint _tmp2_ = 0;
+ DataObject* _tmp0_;
+ DataSource* _tmp1_;
+ gint _tmp2_;
PhotoImportSource* photo = NULL;
- ImportSource* _tmp3_ = NULL;
- PhotoImportSource* _tmp4_ = NULL;
+ ImportSource* _tmp3_;
+ PhotoImportSource* _tmp4_;
gboolean _tmp5_ = FALSE;
- PhotoImportSource* _tmp6_ = NULL;
+ PhotoImportSource* _tmp6_;
#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
#line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4891,26 +4888,26 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
_tmp6_ = photo;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp6_ != NULL) {
-#line 4894 "ImportPage.c"
- PhotoImportSource* _tmp7_ = NULL;
- PhotoFileFormat _tmp8_ = 0;
+#line 4891 "ImportPage.c"
+ PhotoImportSource* _tmp7_;
+ PhotoFileFormat _tmp8_;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = photo;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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 4903 "ImportPage.c"
+#line 4900 "ImportPage.c"
} else {
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = FALSE;
-#line 4907 "ImportPage.c"
+#line 4904 "ImportPage.c"
}
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 4911 "ImportPage.c"
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
+#line 4908 "ImportPage.c"
+ gint _tmp9_;
+ gint _tmp10_;
#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = self->priv->_photos;
#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4919,34 +4916,34 @@ 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 4922 "ImportPage.c"
+#line 4919 "ImportPage.c"
} else {
gboolean _tmp11_ = FALSE;
- PhotoImportSource* _tmp12_ = NULL;
+ PhotoImportSource* _tmp12_;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = photo;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp12_ != NULL) {
-#line 4930 "ImportPage.c"
- PhotoImportSource* _tmp13_ = NULL;
- PhotoFileFormat _tmp14_ = 0;
+#line 4927 "ImportPage.c"
+ PhotoImportSource* _tmp13_;
+ PhotoFileFormat _tmp14_;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = photo;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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 4939 "ImportPage.c"
+#line 4936 "ImportPage.c"
} else {
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = FALSE;
-#line 4943 "ImportPage.c"
+#line 4940 "ImportPage.c"
}
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_) {
-#line 4947 "ImportPage.c"
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
+#line 4944 "ImportPage.c"
+ gint _tmp15_;
+ gint _tmp16_;
#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = self->priv->_raw;
#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4955,16 +4952,16 @@ 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 4958 "ImportPage.c"
+#line 4955 "ImportPage.c"
} else {
- ImportSource* _tmp17_ = NULL;
+ ImportSource* _tmp17_;
#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = source;
#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4965 "ImportPage.c"
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
+#line 4962 "ImportPage.c"
+ gint _tmp18_;
+ gint _tmp19_;
#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = self->priv->_videos;
#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4973,7 +4970,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 4976 "ImportPage.c"
+#line 4973 "ImportPage.c"
}
}
}
@@ -4985,7 +4982,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 4988 "ImportPage.c"
+#line 4985 "ImportPage.c"
}
@@ -5002,17 +4999,17 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D
result = FALSE;
#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5005 "ImportPage.c"
+#line 5002 "ImportPage.c"
}
gchar* camera_accumulator_to_string (CameraAccumulator* self) {
gchar* result = NULL;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- gchar* _tmp4_ = NULL;
+ gint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ gchar* _tmp4_;
#line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), NULL);
#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5029,7 +5026,7 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
result = _tmp4_;
#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5032 "ImportPage.c"
+#line 5029 "ImportPage.c"
}
@@ -5039,20 +5036,20 @@ 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 5042 "ImportPage.c"
+#line 5039 "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 5049 "ImportPage.c"
+#line 5046 "ImportPage.c"
}
gint camera_accumulator_get_total (CameraAccumulator* self) {
gint result;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5061,27 +5058,31 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
result = _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5064 "ImportPage.c"
+#line 5061 "ImportPage.c"
}
static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
- gint _tmp0_ = 0;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
+ if (camera_accumulator_get_total (self) != value) {
+#line 5070 "ImportPage.c"
+ gint _tmp0_;
+#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp0_ = value;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_total = _tmp0_;
+ self->priv->_total = _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "total");
+ g_object_notify ((GObject *) self, "total");
#line 5078 "ImportPage.c"
+ }
}
gint camera_accumulator_get_photos (CameraAccumulator* self) {
gint result;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5090,27 +5091,31 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
result = _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5093 "ImportPage.c"
+#line 5094 "ImportPage.c"
}
static void camera_accumulator_set_photos (CameraAccumulator* self, gint value) {
- gint _tmp0_ = 0;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
+ if (camera_accumulator_get_photos (self) != value) {
+#line 5103 "ImportPage.c"
+ gint _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_photos = _tmp0_;
+ _tmp0_ = value;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "photos");
-#line 5107 "ImportPage.c"
+ self->priv->_photos = _tmp0_;
+#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_object_notify ((GObject *) self, "photos");
+#line 5111 "ImportPage.c"
+ }
}
gint camera_accumulator_get_videos (CameraAccumulator* self) {
gint result;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5119,27 +5124,31 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
result = _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5122 "ImportPage.c"
+#line 5127 "ImportPage.c"
}
static void camera_accumulator_set_videos (CameraAccumulator* self, gint value) {
- gint _tmp0_ = 0;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
+ if (camera_accumulator_get_videos (self) != value) {
+#line 5136 "ImportPage.c"
+ gint _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_videos = _tmp0_;
+ _tmp0_ = value;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "videos");
-#line 5136 "ImportPage.c"
+ self->priv->_videos = _tmp0_;
+#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ g_object_notify ((GObject *) self, "videos");
+#line 5144 "ImportPage.c"
+ }
}
gint camera_accumulator_get_raw (CameraAccumulator* self) {
gint result;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_CAMERA_ACCUMULATOR (self), 0);
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5148,21 +5157,25 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
result = _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5151 "ImportPage.c"
+#line 5160 "ImportPage.c"
}
static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
- gint _tmp0_ = 0;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
+ if (camera_accumulator_get_raw (self) != value) {
+#line 5169 "ImportPage.c"
+ gint _tmp0_;
+#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _tmp0_ = value;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_raw = _tmp0_;
+ self->priv->_raw = _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "raw");
-#line 5165 "ImportPage.c"
+ g_object_notify ((GObject *) self, "raw");
+#line 5177 "ImportPage.c"
+ }
}
@@ -5178,14 +5191,14 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = camera_accumulator_finalize;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL, g_param_spec_int ("total", "total", "total", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL_PROPERTY, g_param_spec_int ("total", "total", "total", 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_PHOTOS, g_param_spec_int ("photos", "photos", "photos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS_PROPERTY, g_param_spec_int ("photos", "photos", "photos", 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_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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW, 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 5188 "ImportPage.c"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 5201 "ImportPage.c"
}
@@ -5193,12 +5206,12 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_core_tracker_accumulator_parent_iface = g_type_interface_peek_parent (iface);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- iface->include = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_include;
+ iface->include = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) camera_accumulator_real_include;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_uninclude;
+ 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 5201 "ImportPage.c"
+ iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) camera_accumulator_real_altered;
+#line 5214 "ImportPage.c"
}
@@ -5213,17 +5226,17 @@ 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 5216 "ImportPage.c"
+#line 5229 "ImportPage.c"
}
-static void camera_accumulator_finalize (GObject* obj) {
+static void camera_accumulator_finalize (GObject * obj) {
CameraAccumulator * self;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
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 5226 "ImportPage.c"
+#line 5239 "ImportPage.c"
}
@@ -5247,36 +5260,36 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
switch (property_id) {
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_TOTAL:
+ case CAMERA_ACCUMULATOR_TOTAL_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_value_set_int (value, camera_accumulator_get_total (self));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_PHOTOS:
+ case CAMERA_ACCUMULATOR_PHOTOS_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_value_set_int (value, camera_accumulator_get_photos (self));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_VIDEOS:
+ case CAMERA_ACCUMULATOR_VIDEOS_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_value_set_int (value, camera_accumulator_get_videos (self));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_RAW:
+ case CAMERA_ACCUMULATOR_RAW_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_value_set_int (value, camera_accumulator_get_raw (self));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5273 "ImportPage.c"
+#line 5286 "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 5279 "ImportPage.c"
+#line 5292 "ImportPage.c"
}
}
@@ -5287,36 +5300,36 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
switch (property_id) {
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_TOTAL:
+ case CAMERA_ACCUMULATOR_TOTAL_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_total (self, g_value_get_int (value));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_PHOTOS:
+ case CAMERA_ACCUMULATOR_PHOTOS_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_photos (self, g_value_get_int (value));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_VIDEOS:
+ case CAMERA_ACCUMULATOR_VIDEOS_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_videos (self, g_value_get_int (value));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- case CAMERA_ACCUMULATOR_RAW:
+ case CAMERA_ACCUMULATOR_RAW_PROPERTY:
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_set_raw (self, g_value_get_int (value));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5313 "ImportPage.c"
+#line 5326 "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 5319 "ImportPage.c"
+#line 5332 "ImportPage.c"
}
}
@@ -5324,7 +5337,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 5327 "ImportPage.c"
+#line 5340 "ImportPage.c"
}
@@ -5343,28 +5356,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 5346 "ImportPage.c"
+#line 5359 "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 5353 "ImportPage.c"
+#line 5366 "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 5360 "ImportPage.c"
+#line 5373 "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 5367 "ImportPage.c"
+#line 5380 "ImportPage.c"
}
@@ -5373,7 +5386,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 5376 "ImportPage.c"
+#line 5389 "ImportPage.c"
}
@@ -5382,418 +5395,408 @@ 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 5385 "ImportPage.c"
+#line 5398 "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 5392 "ImportPage.c"
+#line 5405 "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 5399 "ImportPage.c"
+#line 5412 "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 5406 "ImportPage.c"
+#line 5419 "ImportPage.c"
}
ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
ImportPage * self = NULL;
- const gchar* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
- Camera* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- ImportSourceCollection* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- ViewCollection* _tmp11_ = NULL;
- ViewCollection* _tmp12_ = NULL;
- CameraViewTracker* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- GtkLabel* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- GVolumeMonitor* _tmp29_ = NULL;
- GPContextWrapper* _tmp30_ = NULL;
- GPSpinIdleWrapper* _tmp32_ = NULL;
- ViewCollection* _tmp34_ = NULL;
- ViewCollection* _tmp35_ = NULL;
- SourceCollection* _tmp36_ = NULL;
- ImportPageImportViewManager* _tmp37_ = NULL;
- ImportPageImportViewManager* _tmp38_ = NULL;
- ViewCollectionMonitor* _tmp39_ = NULL;
- ViewCollectionMonitor* _tmp40_ = NULL;
- ViewCollection* _tmp41_ = NULL;
- ViewCollection* _tmp42_ = NULL;
- ViewCollection* _tmp43_ = NULL;
- ViewCollection* _tmp44_ = NULL;
- ViewCollection* _tmp45_ = NULL;
- ViewCollection* _tmp46_ = NULL;
- ViewCollection* _tmp47_ = NULL;
- ViewCollection* _tmp48_ = NULL;
- ViewCollection* _tmp49_ = NULL;
- ViewCollection* _tmp50_ = NULL;
- GValue _tmp51_ = {0};
- LibraryPhotoSourceCollection* _tmp52_ = NULL;
- VideoSourceCollection* _tmp53_ = NULL;
+ Camera* _tmp0_;
+ Camera* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ ImportSourceCollection* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ ViewCollection* _tmp10_;
+ ViewCollection* _tmp11_;
+ CameraViewTracker* _tmp12_;
+ const gchar* _tmp13_;
+ GtkLabel* _tmp24_;
+ const gchar* _tmp25_;
+ const gchar* _tmp26_;
+ GVolumeMonitor* _tmp27_;
+ GPContextWrapper* _tmp28_;
+ GPSpinIdleWrapper* _tmp30_;
+ ViewCollection* _tmp32_;
+ ViewCollection* _tmp33_;
+ SourceCollection* _tmp34_;
+ ImportPageImportViewManager* _tmp35_;
+ ImportPageImportViewManager* _tmp36_;
+ ViewCollectionMonitor* _tmp37_;
+ ViewCollectionMonitor* _tmp38_;
+ ViewCollection* _tmp39_;
+ ViewCollection* _tmp40_;
+ ViewCollection* _tmp41_;
+ ViewCollection* _tmp42_;
+ ViewCollection* _tmp43_;
+ ViewCollection* _tmp44_;
+ ViewCollection* _tmp45_;
+ ViewCollection* _tmp46_;
+ ViewCollection* _tmp47_;
+ ViewCollection* _tmp48_;
+ GValue _tmp49_ = {0};
+ LibraryPhotoSourceCollection* _tmp50_;
+ VideoSourceCollection* _tmp51_;
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (uri != NULL, NULL);
#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _ ("Camera");
-#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self = (ImportPage*) checkerboard_page_construct (object_type, _tmp0_);
+ self = (ImportPage*) checkerboard_page_construct (object_type, _ ("Camera"));
#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = camera;
+ _tmp0_ = camera;
#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _GPHOTO_REF_CAMERA0 (_tmp1_);
+ _tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_camera_unref0 (self->priv->camera);
#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera = _tmp2_;
+ self->priv->camera = _tmp1_;
#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = uri;
+ _tmp2_ = uri;
#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = g_strdup (_tmp3_);
+ _tmp3_ = g_strdup (_tmp2_);
#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->uri);
#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->uri = _tmp4_;
+ self->priv->uri = _tmp3_;
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = uri;
+ _tmp4_ = uri;
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = g_strdup_printf ("ImportSources for %s", _tmp5_);
+ _tmp5_ = g_strdup_printf ("ImportSources for %s", _tmp4_);
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = import_source_collection_new (_tmp7_);
+ _tmp7_ = import_source_collection_new (_tmp6_);
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (self->priv->import_sources);
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection);
+ self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection);
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = icon;
+ _tmp8_ = icon;
#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = g_strdup (_tmp9_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->icon);
#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->icon = _tmp10_;
+ self->priv->icon = _tmp9_;
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = camera_view_tracker_new (_tmp12_);
+ _tmp12_ = camera_view_tracker_new (_tmp11_);
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_core_tracker_unref0 (self->priv->tracker);
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->tracker = _tmp13_;
+ self->priv->tracker = _tmp12_;
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp12_);
+ _data_collection_unref0 (_tmp11_);
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = display_name;
+ _tmp13_ = display_name;
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (NULL != _tmp14_) {
-#line 5515 "ImportPage.c"
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+ if (NULL != _tmp13_) {
+#line 5525 "ImportPage.c"
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = display_name;
+ _tmp14_ = display_name;
#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = g_strdup (_tmp15_);
+ _tmp15_ = g_strdup (_tmp14_);
#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera_name = _tmp16_;
-#line 5526 "ImportPage.c"
+ self->priv->camera_name = _tmp15_;
+#line 5536 "ImportPage.c"
} else {
CameraAbilities abilities = {0};
int res = 0;
- Camera* _tmp17_ = NULL;
- CameraAbilities _tmp18_ = {0};
- int _tmp19_ = 0;
- int _tmp20_ = 0;
+ Camera* _tmp16_;
+ CameraAbilities _tmp17_ = {0};
+ int _tmp18_;
+ int _tmp19_;
#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = camera;
+ _tmp16_ = camera;
#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = gp_camera_get_abilities (_tmp17_, &_tmp18_);
+ _tmp18_ = gp_camera_get_abilities (_tmp16_, &_tmp17_);
#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(abilities);
#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- abilities = _tmp18_;
+ abilities = _tmp17_;
#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp19_;
+ res = _tmp18_;
#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = res;
+ _tmp19_ = res;
#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp20_ != GP_OK) {
-#line 5548 "ImportPage.c"
- int _tmp21_ = 0;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
+ if (_tmp19_ != GP_OK) {
+#line 5558 "ImportPage.c"
+ int _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = res;
+ _tmp20_ = res;
#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = gp_result_to_full_string (_tmp21_);
+ _tmp21_ = gp_result_to_full_string (_tmp20_);
#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = _tmp22_;
+ _tmp22_ = _tmp21_;
#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp23_);
+ g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp22_);
#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp23_);
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = _ ("Camera");
+ _g_free0 (_tmp22_);
#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = g_strdup (_tmp24_);
+ _tmp23_ = g_strdup (_ ("Camera"));
#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera_name = _tmp25_;
-#line 5572 "ImportPage.c"
+ self->priv->camera_name = _tmp23_;
+#line 5579 "ImportPage.c"
}
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(abilities);
-#line 5576 "ImportPage.c"
+#line 5583 "ImportPage.c"
}
#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = self->priv->camera_label;
+ _tmp24_ = self->priv->camera_label;
#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = self->priv->camera_name;
+ _tmp25_ = self->priv->camera_name;
#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_label_set_text (_tmp26_, _tmp27_);
+ gtk_label_set_text (_tmp24_, _tmp25_);
#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = self->priv->camera_name;
+ _tmp26_ = self->priv->camera_name;
#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp28_);
+ page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp26_);
#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = g_volume_monitor_get ();
+ _tmp27_ = g_volume_monitor_get ();
#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->volume_monitor);
#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->volume_monitor = _tmp29_;
+ self->priv->volume_monitor = _tmp27_;
#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = import_page_null_context;
+ _tmp28_ = import_page_null_context;
#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp30_ == NULL) {
-#line 5598 "ImportPage.c"
- GPContextWrapper* _tmp31_ = NULL;
+ if (_tmp28_ == NULL) {
+#line 5605 "ImportPage.c"
+ GPContextWrapper* _tmp29_;
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = gp_context_wrapper_new ();
+ _tmp29_ = gp_context_wrapper_new ();
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_context_wrapper_unref0 (import_page_null_context);
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_null_context = _tmp31_;
-#line 5606 "ImportPage.c"
+ import_page_null_context = _tmp29_;
+#line 5613 "ImportPage.c"
}
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = import_page_spin_idle_context;
+ _tmp30_ = import_page_spin_idle_context;
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp32_ == NULL) {
-#line 5612 "ImportPage.c"
- GPSpinIdleWrapper* _tmp33_ = NULL;
+ if (_tmp30_ == NULL) {
+#line 5619 "ImportPage.c"
+ GPSpinIdleWrapper* _tmp31_;
#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = gp_spin_idle_wrapper_new ();
+ _tmp31_ = gp_spin_idle_wrapper_new ();
#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_context_wrapper_unref0 (import_page_spin_idle_context);
#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_spin_idle_context = _tmp33_;
-#line 5620 "ImportPage.c"
+ import_page_spin_idle_context = _tmp31_;
+#line 5627 "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));
+ _tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = _tmp34_;
+ _tmp33_ = _tmp32_;
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = self->priv->import_sources;
+ _tmp34_ = self->priv->import_sources;
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = import_page_import_view_manager_new (self);
+ _tmp35_ = import_page_import_view_manager_new (self);
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = _tmp37_;
+ _tmp36_ = _tmp35_;
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = view_collection_monitor_source_collection (_tmp35_, _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
+ _tmp37_ = view_collection_monitor_source_collection (_tmp33_, _tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = _tmp39_;
+ _tmp38_ = _tmp37_;
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _view_collection_monitor_unref0 (_tmp40_);
+ _view_collection_monitor_unref0 (_tmp38_);
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _view_manager_unref0 (_tmp38_);
+ _view_manager_unref0 (_tmp36_);
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp35_);
+ _data_collection_unref0 (_tmp33_);
#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp39_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = _tmp41_;
+ _tmp40_ = _tmp39_;
#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
+ data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp42_);
+ _data_collection_unref0 (_tmp40_);
#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = _tmp43_;
+ _tmp42_ = _tmp41_;
#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp44_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
+ g_signal_connect_object (_tmp42_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp44_);
+ _data_collection_unref0 (_tmp42_);
#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = _tmp45_;
+ _tmp44_ = _tmp43_;
#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp46_);
+ _data_collection_unref0 (_tmp44_);
#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = _tmp47_;
+ _tmp46_ = _tmp45_;
#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp48_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
+ g_signal_connect_object (_tmp46_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp48_);
+ _data_collection_unref0 (_tmp46_);
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = _tmp49_;
+ _tmp48_ = _tmp47_;
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_value_init (&_tmp51_, G_TYPE_BOOLEAN);
+ g_value_init (&_tmp49_, G_TYPE_BOOLEAN);
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_value_set_boolean (&_tmp51_, TRUE);
+ g_value_set_boolean (&_tmp49_, TRUE);
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp51_, NULL, NULL);
+ data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp49_, NULL, NULL);
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
+ G_IS_VALUE (&_tmp49_) ? (g_value_unset (&_tmp49_), NULL) : NULL;
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp50_);
+ _data_collection_unref0 (_tmp48_);
#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = library_photo_global;
+ _tmp50_ = library_photo_global;
#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = video_global;
+ _tmp51_ = video_global;
#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
#line 769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
#line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
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 5702 "ImportPage.c"
+#line 5709 "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 5709 "ImportPage.c"
+#line 5716 "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 5716 "ImportPage.c"
+#line 5723 "ImportPage.c"
}
static GtkToolbar* import_page_real_get_toolbar (Page* base) {
ImportPage * self;
GtkToolbar* result = NULL;
- GtkToolbar* _tmp0_ = NULL;
- GtkToolbar* _tmp59_ = NULL;
- GtkToolbar* _tmp60_ = NULL;
+ GtkToolbar* _tmp0_;
+ GtkToolbar* _tmp55_;
+ GtkToolbar* _tmp56_;
#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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 5732 "ImportPage.c"
- GtkToolbar* _tmp1_ = NULL;
- GtkToolbar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- GtkCheckButton* _tmp4_ = NULL;
- GtkCheckButton* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- GtkCheckButton* _tmp7_ = NULL;
- GtkCheckButton* _tmp8_ = NULL;
- GtkCheckButton* _tmp9_ = NULL;
- ConfigFacade* _tmp10_ = NULL;
- ConfigFacade* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 5739 "ImportPage.c"
+ GtkToolbar* _tmp1_;
+ GtkToolbar* _tmp2_;
+ GtkCheckButton* _tmp3_;
+ GtkCheckButton* _tmp4_;
+ GtkCheckButton* _tmp5_;
+ GtkCheckButton* _tmp6_;
+ GtkCheckButton* _tmp7_;
+ ConfigFacade* _tmp8_;
+ ConfigFacade* _tmp9_;
+ gboolean _tmp10_;
GtkToolItem* hide_item = NULL;
- GtkToolItem* _tmp13_ = NULL;
- GtkToolItem* _tmp14_ = NULL;
- GtkToolItem* _tmp15_ = NULL;
- GtkCheckButton* _tmp16_ = NULL;
- GtkToolbar* _tmp17_ = NULL;
- GtkToolItem* _tmp18_ = NULL;
+ GtkToolItem* _tmp11_;
+ GtkToolItem* _tmp12_;
+ GtkToolItem* _tmp13_;
+ GtkCheckButton* _tmp14_;
+ GtkToolbar* _tmp15_;
+ GtkToolItem* _tmp16_;
GtkSeparatorToolItem* separator = NULL;
- GtkSeparatorToolItem* _tmp19_ = NULL;
- GtkSeparatorToolItem* _tmp20_ = NULL;
- GtkToolbar* _tmp21_ = NULL;
- GtkSeparatorToolItem* _tmp22_ = NULL;
- GtkProgressBar* _tmp23_ = NULL;
- GtkProgressBar* _tmp24_ = NULL;
+ GtkSeparatorToolItem* _tmp17_;
+ GtkSeparatorToolItem* _tmp18_;
+ GtkToolbar* _tmp19_;
+ GtkSeparatorToolItem* _tmp20_;
+ GtkProgressBar* _tmp21_;
+ GtkProgressBar* _tmp22_;
GtkToolItem* progress_item = NULL;
- GtkToolItem* _tmp25_ = NULL;
- GtkToolItem* _tmp26_ = NULL;
- GtkToolItem* _tmp27_ = NULL;
- GtkProgressBar* _tmp28_ = NULL;
- GtkProgressBar* _tmp29_ = NULL;
- GtkToolbar* _tmp30_ = NULL;
- GtkToolItem* _tmp31_ = NULL;
+ GtkToolItem* _tmp23_;
+ GtkToolItem* _tmp24_;
+ GtkToolItem* _tmp25_;
+ GtkProgressBar* _tmp26_;
+ GtkProgressBar* _tmp27_;
+ GtkToolbar* _tmp28_;
+ GtkToolItem* _tmp29_;
GtkToggleToolButton* find_button = NULL;
- GtkToggleToolButton* _tmp32_ = NULL;
- GtkToggleToolButton* _tmp33_ = NULL;
- GtkToggleToolButton* _tmp34_ = NULL;
- GtkToolbar* _tmp35_ = NULL;
- GtkToggleToolButton* _tmp36_ = NULL;
- GtkToolbar* _tmp37_ = NULL;
- GtkSeparatorToolItem* _tmp38_ = NULL;
- GtkSeparatorToolItem* _tmp39_ = NULL;
+ GtkToggleToolButton* _tmp30_;
+ GtkToggleToolButton* _tmp31_;
+ GtkToggleToolButton* _tmp32_;
+ GtkToolbar* _tmp33_;
+ GtkToggleToolButton* _tmp34_;
+ GtkToolbar* _tmp35_;
+ GtkSeparatorToolItem* _tmp36_;
+ GtkSeparatorToolItem* _tmp37_;
GtkToolButton* import_selected_button = NULL;
- GtkToolButton* _tmp40_ = NULL;
- GtkToolButton* _tmp41_ = NULL;
- GtkToolButton* _tmp42_ = NULL;
- const gchar* _tmp43_ = NULL;
- GtkToolButton* _tmp44_ = NULL;
- GtkToolButton* _tmp45_ = NULL;
- GtkToolButton* _tmp46_ = NULL;
- GtkToolbar* _tmp47_ = NULL;
- GtkToolButton* _tmp48_ = NULL;
+ GtkToolButton* _tmp38_;
+ GtkToolButton* _tmp39_;
+ GtkToolButton* _tmp40_;
+ GtkToolButton* _tmp41_;
+ GtkToolButton* _tmp42_;
+ GtkToolButton* _tmp43_;
+ GtkToolbar* _tmp44_;
+ GtkToolButton* _tmp45_;
GtkToolButton* import_all_button = NULL;
- GtkToolButton* _tmp49_ = NULL;
- GtkToolButton* _tmp50_ = NULL;
- GtkToolButton* _tmp51_ = NULL;
- const gchar* _tmp52_ = NULL;
- GtkToolButton* _tmp53_ = NULL;
- GtkToolButton* _tmp54_ = NULL;
- GtkToolButton* _tmp55_ = NULL;
- GtkToolbar* _tmp56_ = NULL;
- GtkToolButton* _tmp57_ = NULL;
- GtkProgressBar* _tmp58_ = NULL;
+ GtkToolButton* _tmp46_;
+ GtkToolButton* _tmp47_;
+ GtkToolButton* _tmp48_;
+ GtkToolButton* _tmp49_;
+ GtkToolButton* _tmp50_;
+ GtkToolButton* _tmp51_;
+ GtkToolbar* _tmp52_;
+ GtkToolButton* _tmp53_;
+ GtkProgressBar* _tmp54_;
#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = PAGE_CLASS (import_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5801,217 +5804,209 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp2_);
#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _ ("Hide photos already imported");
+ _tmp3_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Hide photos already imported"));
#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp3_);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp4_);
+ g_object_ref_sink (_tmp3_);
#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->hide_imported);
#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->hide_imported = _tmp4_;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = self->priv->hide_imported;
+ self->priv->hide_imported = _tmp3_;
#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _ ("Only display photos that have not been imported");
+ _tmp4_ = self->priv->hide_imported;
#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_);
+ gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _ ("Only display photos that have not been imported"));
#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = self->priv->hide_imported;
+ _tmp5_ = self->priv->hide_imported;
#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0);
#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = self->priv->hide_imported;
+ _tmp6_ = self->priv->hide_imported;
#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = self->priv->hide_imported;
+ _tmp7_ = self->priv->hide_imported;
#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = config_facade_get_instance ();
+ _tmp8_ = config_facade_get_instance ();
#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp9_ = _tmp8_;
#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp10_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp12_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp10_);
#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp9_);
#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = gtk_tool_item_new ();
+ _tmp11_ = gtk_tool_item_new ();
#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp13_);
+ g_object_ref_sink (_tmp11_);
#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- hide_item = _tmp13_;
+ hide_item = _tmp11_;
#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = hide_item;
+ _tmp12_ = hide_item;
#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_is_important (_tmp14_, TRUE);
+ gtk_tool_item_set_is_important (_tmp12_, TRUE);
#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = hide_item;
+ _tmp13_ = hide_item;
#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = self->priv->hide_imported;
+ _tmp14_ = self->priv->hide_imported;
#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = hide_item;
+ _tmp16_ = hide_item;
#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp17_, _tmp18_, -1);
+ gtk_toolbar_insert (_tmp15_, _tmp16_, -1);
#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+ _tmp17_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp19_);
+ g_object_ref_sink (_tmp17_);
#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- separator = _tmp19_;
+ separator = _tmp17_;
#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = separator;
+ _tmp18_ = separator;
#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_separator_tool_item_set_draw (_tmp20_, FALSE);
+ gtk_separator_tool_item_set_draw (_tmp18_, FALSE);
#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = separator;
+ _tmp20_ = separator;
#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = self->priv->progress_bar;
+ _tmp21_ = self->priv->progress_bar;
#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
+ gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = self->priv->progress_bar;
+ _tmp22_ = self->priv->progress_bar;
#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = gtk_tool_item_new ();
+ _tmp23_ = gtk_tool_item_new ();
#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp25_);
+ g_object_ref_sink (_tmp23_);
#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- progress_item = _tmp25_;
+ progress_item = _tmp23_;
#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = progress_item;
+ _tmp24_ = progress_item;
#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_expand (_tmp26_, TRUE);
+ gtk_tool_item_set_expand (_tmp24_, TRUE);
#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = progress_item;
+ _tmp25_ = progress_item;
#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = self->priv->progress_bar;
+ _tmp26_ = self->priv->progress_bar;
#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = self->priv->progress_bar;
+ _tmp27_ = self->priv->progress_bar;
#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_show_text (_tmp29_, TRUE);
+ gtk_progress_bar_set_show_text (_tmp27_, TRUE);
#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = progress_item;
+ _tmp29_ = progress_item;
#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp30_, _tmp31_, -1);
+ gtk_toolbar_insert (_tmp28_, _tmp29_, -1);
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+ _tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp32_);
+ g_object_ref_sink (_tmp30_);
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- find_button = _tmp32_;
+ find_button = _tmp30_;
#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = find_button;
+ _tmp31_ = find_button;
#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
+ gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
#line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = find_button;
+ _tmp32_ = find_button;
#line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = find_button;
+ _tmp34_ = find_button;
#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+ _tmp36_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp38_);
+ g_object_ref_sink (_tmp36_);
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = _tmp38_;
+ _tmp37_ = _tmp36_;
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp39_);
+ _g_object_unref0 (_tmp37_);
#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+ _tmp38_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp40_);
+ g_object_ref_sink (_tmp38_);
#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_selected_button = _tmp40_;
+ import_selected_button = _tmp38_;
#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = import_selected_button;
+ _tmp39_ = import_selected_button;
#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_icon_name (_tmp41_, "import");
+ gtk_tool_button_set_icon_name (_tmp39_, "import");
#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_selected_button;
+ _tmp40_ = import_selected_button;
#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = _ ("Import _Selected");
-#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_label (_tmp42_, _tmp43_);
+ gtk_tool_button_set_label (_tmp40_, _ ("Import _Selected"));
#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = import_selected_button;
+ _tmp41_ = import_selected_button;
#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+ gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = import_selected_button;
+ _tmp42_ = import_selected_button;
#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_use_underline (_tmp45_, TRUE);
+ gtk_tool_button_set_use_underline (_tmp42_, TRUE);
#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = import_selected_button;
+ _tmp43_ = import_selected_button;
#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = import_selected_button;
+ _tmp45_ = import_selected_button;
#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+ _tmp46_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp49_);
+ g_object_ref_sink (_tmp46_);
#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_all_button = _tmp49_;
+ import_all_button = _tmp46_;
#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_all_button;
+ _tmp47_ = import_all_button;
#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_icon_name (_tmp50_, "import-all");
-#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = import_all_button;
+ gtk_tool_button_set_icon_name (_tmp47_, "import-all");
#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = _ ("Import _All");
+ _tmp48_ = import_all_button;
#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_label (_tmp51_, _tmp52_);
+ gtk_tool_button_set_label (_tmp48_, _ ("Import _All"));
#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = import_all_button;
+ _tmp49_ = import_all_button;
#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+ gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = import_all_button;
+ _tmp50_ = import_all_button;
#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_use_underline (_tmp54_, TRUE);
+ gtk_tool_button_set_use_underline (_tmp50_, TRUE);
#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = import_all_button;
+ _tmp51_ = import_all_button;
#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = import_all_button;
+ _tmp53_ = import_all_button;
#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = self->priv->progress_bar;
+ _tmp54_ = self->priv->progress_bar;
#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 844 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_toolbar_state (self);
#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6028,32 +6023,32 @@ 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 6031 "ImportPage.c"
+#line 6026 "ImportPage.c"
}
#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = _g_object_ref0 (_tmp59_);
+ _tmp56_ = _g_object_ref0 (_tmp55_);
#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp60_;
+ result = _tmp56_;
#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6041 "ImportPage.c"
+#line 6036 "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 6048 "ImportPage.c"
+#line 6043 "ImportPage.c"
}
static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base) {
ImportPage * self;
CoreViewTracker* result = NULL;
- CameraViewTracker* _tmp0_ = NULL;
- CoreViewTracker* _tmp1_ = NULL;
+ CameraViewTracker* _tmp0_;
+ CoreViewTracker* _tmp1_;
#line 852 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6064,59 +6059,53 @@ 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 6067 "ImportPage.c"
+#line 6062 "ImportPage.c"
}
static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
ImportPage * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ gchar* _tmp0_;
#line 856 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _ ("The camera seems to be empty. No photos/videos found to import");
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (_ ("The camera seems to be empty. No photos/videos found to import"));
#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6086 "ImportPage.c"
+#line 6078 "ImportPage.c"
}
static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* base) {
ImportPage * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ gchar* _tmp0_;
#line 860 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _ ("No new photos/videos found on camera");
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (_ ("No new photos/videos found on camera"));
#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6105 "ImportPage.c"
+#line 6094 "ImportPage.c"
}
static gint64 import_page_preview_comparator (void* a, void* b) {
gint64 result = 0LL;
- void* _tmp0_ = NULL;
- ImportSource* _tmp1_ = NULL;
- ImportSource* _tmp2_ = NULL;
- time_t _tmp3_ = 0;
- void* _tmp4_ = NULL;
- ImportSource* _tmp5_ = NULL;
- ImportSource* _tmp6_ = NULL;
- time_t _tmp7_ = 0;
- gint64 _tmp8_ = 0LL;
+ void* _tmp0_;
+ ImportSource* _tmp1_;
+ ImportSource* _tmp2_;
+ time_t _tmp3_;
+ void* _tmp4_;
+ ImportSource* _tmp5_;
+ ImportSource* _tmp6_;
+ time_t _tmp7_;
+ gint64 _tmp8_;
#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = a;
#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6143,14 +6132,14 @@ 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 6146 "ImportPage.c"
+#line 6135 "ImportPage.c"
}
static gboolean import_page_preview_comparator_predicate (DataObject* object, Alteration* alteration) {
gboolean result = FALSE;
- Alteration* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ Alteration* _tmp0_;
+ gboolean _tmp1_;
#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6163,16 +6152,16 @@ 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 6166 "ImportPage.c"
+#line 6155 "ImportPage.c"
}
static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void* b) {
gint64 result = 0LL;
- void* _tmp0_ = NULL;
- time_t _tmp1_ = 0;
- void* _tmp2_ = NULL;
- time_t _tmp3_ = 0;
+ void* _tmp0_;
+ time_t _tmp1_;
+ void* _tmp2_;
+ time_t _tmp3_;
#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL);
#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6187,14 +6176,14 @@ 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 6190 "ImportPage.c"
+#line 6179 "ImportPage.c"
}
static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
ImportPage * self;
- GeeList* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ GeeList* _tmp0_;
+ GeeList* _tmp1_;
#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6207,27 +6196,27 @@ 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 6210 "ImportPage.c"
+#line 6199 "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 6217 "ImportPage.c"
+#line 6206 "ImportPage.c"
}
static void import_page_real_add_actions (Page* base, GActionMap* map) {
ImportPage * self;
- GActionMap* _tmp0_ = NULL;
- GActionMap* _tmp1_ = NULL;
- GAction* _tmp2_ = NULL;
- GAction* _tmp3_ = NULL;
- ConfigFacade* _tmp4_ = NULL;
- ConfigFacade* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
- GVariant* _tmp7_ = NULL;
+ GActionMap* _tmp0_;
+ GActionMap* _tmp1_;
+ GAction* _tmp2_;
+ GAction* _tmp3_;
+ ConfigFacade* _tmp4_;
+ ConfigFacade* _tmp5_;
+ gboolean _tmp6_;
+ GVariant* _tmp7_;
#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6260,13 +6249,13 @@ 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 6263 "ImportPage.c"
+#line 6252 "ImportPage.c"
}
static void import_page_real_remove_actions (Page* base, GActionMap* map) {
ImportPage * self;
- GActionMap* _tmp0_ = NULL;
+ GActionMap* _tmp0_;
#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6275,7 +6264,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 6278 "ImportPage.c"
+#line 6267 "ImportPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -6287,15 +6276,15 @@ 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 6290 "ImportPage.c"
+#line 6279 "ImportPage.c"
GActionEntry entry = {0};
#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
entry = entry_collection[entry_it];
-#line 6294 "ImportPage.c"
+#line 6283 "ImportPage.c"
{
- GActionMap* _tmp1_ = NULL;
- GActionEntry _tmp2_ = {0};
- const gchar* _tmp3_ = NULL;
+ GActionMap* _tmp1_;
+ GActionEntry _tmp2_;
+ const gchar* _tmp3_;
#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = map;
#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6304,7 +6293,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 6307 "ImportPage.c"
+#line 6296 "ImportPage.c"
}
}
}
@@ -6313,8 +6302,8 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
Camera* import_page_get_camera (ImportPage* self) {
Camera* result = NULL;
- Camera* _tmp0_ = NULL;
- Camera* _tmp1_ = NULL;
+ Camera* _tmp0_;
+ Camera* _tmp1_;
#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6325,14 +6314,14 @@ Camera* import_page_get_camera (ImportPage* self) {
result = _tmp1_;
#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6328 "ImportPage.c"
+#line 6317 "ImportPage.c"
}
gchar* import_page_get_uri (ImportPage* self) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6343,13 +6332,13 @@ gchar* import_page_get_uri (ImportPage* self) {
result = _tmp1_;
#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6346 "ImportPage.c"
+#line 6335 "ImportPage.c"
}
gboolean import_page_is_busy (ImportPage* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6358,14 +6347,14 @@ gboolean import_page_is_busy (ImportPage* self) {
result = _tmp0_;
#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6361 "ImportPage.c"
+#line 6350 "ImportPage.c"
}
static void import_page_real_init_actions (Page* base, gint selected_count, gint count) {
ImportPage * self;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
#line 917 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6380,44 +6369,44 @@ 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 6383 "ImportPage.c"
+#line 6372 "ImportPage.c"
}
gboolean import_page_is_refreshed (ImportPage* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->refreshed;
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6397 "ImportPage.c"
- gboolean _tmp2_ = FALSE;
+#line 6386 "ImportPage.c"
+ gboolean _tmp2_;
#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 6403 "ImportPage.c"
+#line 6392 "ImportPage.c"
} else {
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6407 "ImportPage.c"
+#line 6396 "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 6413 "ImportPage.c"
+#line 6402 "ImportPage.c"
}
gchar* import_page_get_refresh_message (ImportPage* self) {
gchar* result = NULL;
gchar* msg = NULL;
- const gchar* _tmp0_ = NULL;
+ const gchar* _tmp0_;
#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
#line 931 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6426,9 +6415,9 @@ 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 6429 "ImportPage.c"
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+#line 6418 "ImportPage.c"
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->refresh_error;
#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6437,17 +6426,17 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_g_free0 (msg);
#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp2_;
-#line 6440 "ImportPage.c"
+#line 6429 "ImportPage.c"
} else {
- int _tmp3_ = 0;
+ int _tmp3_;
#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 6447 "ImportPage.c"
+#line 6436 "ImportPage.c"
} else {
- int _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
+ int _tmp4_;
+ gchar* _tmp5_;
#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->refresh_result;
#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6456,20 +6445,20 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_g_free0 (msg);
#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp5_;
-#line 6459 "ImportPage.c"
+#line 6448 "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 6466 "ImportPage.c"
+#line 6455 "ImportPage.c"
}
static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) {
- gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6482,45 +6471,45 @@ 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 6485 "ImportPage.c"
+#line 6474 "ImportPage.c"
}
static void import_page_update_toolbar_state (ImportPage* self) {
- GtkCheckButton* _tmp0_ = NULL;
+ GtkCheckButton* _tmp0_;
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->hide_imported;
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 6497 "ImportPage.c"
+#line 6486 "ImportPage.c"
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
- GtkCheckButton* _tmp8_ = NULL;
+ gboolean _tmp3_;
+ GtkCheckButton* _tmp8_;
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->busy;
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp3_) {
-#line 6506 "ImportPage.c"
- gboolean _tmp4_ = FALSE;
+#line 6495 "ImportPage.c"
+ gboolean _tmp4_;
#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 6512 "ImportPage.c"
+#line 6501 "ImportPage.c"
} else {
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = FALSE;
-#line 6516 "ImportPage.c"
+#line 6505 "ImportPage.c"
}
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 6520 "ImportPage.c"
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- gint _tmp7_ = 0;
+#line 6509 "ImportPage.c"
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ gint _tmp7_;
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6531,17 +6520,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 6534 "ImportPage.c"
+#line 6523 "ImportPage.c"
} else {
#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6538 "ImportPage.c"
+#line 6527 "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 6544 "ImportPage.c"
+#line 6533 "ImportPage.c"
}
}
@@ -6549,36 +6538,36 @@ static void import_page_update_toolbar_state (ImportPage* self) {
static void import_page_on_view_changed (ImportPage* self) {
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
gboolean _tmp7_ = FALSE;
gboolean _tmp8_ = FALSE;
- gboolean _tmp9_ = FALSE;
+ gboolean _tmp9_;
gboolean _tmp14_ = FALSE;
- gboolean _tmp15_ = FALSE;
+ gboolean _tmp15_;
#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp2_) {
-#line 6564 "ImportPage.c"
- gboolean _tmp3_ = FALSE;
+#line 6553 "ImportPage.c"
+ gboolean _tmp3_;
#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 6570 "ImportPage.c"
+#line 6559 "ImportPage.c"
} else {
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6574 "ImportPage.c"
+#line 6563 "ImportPage.c"
}
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6578 "ImportPage.c"
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+#line 6567 "ImportPage.c"
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ gint _tmp6_;
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6589,11 +6578,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 6592 "ImportPage.c"
+#line 6581 "ImportPage.c"
} else {
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6596 "ImportPage.c"
+#line 6585 "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_);
@@ -6601,24 +6590,24 @@ 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 6604 "ImportPage.c"
- gboolean _tmp10_ = FALSE;
+#line 6593 "ImportPage.c"
+ gboolean _tmp10_;
#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 6610 "ImportPage.c"
+#line 6599 "ImportPage.c"
} else {
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = FALSE;
-#line 6614 "ImportPage.c"
+#line 6603 "ImportPage.c"
}
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp8_) {
-#line 6618 "ImportPage.c"
- ViewCollection* _tmp11_ = NULL;
- ViewCollection* _tmp12_ = NULL;
- gint _tmp13_ = 0;
+#line 6607 "ImportPage.c"
+ ViewCollection* _tmp11_;
+ ViewCollection* _tmp12_;
+ gint _tmp13_;
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6629,11 +6618,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 6632 "ImportPage.c"
+#line 6621 "ImportPage.c"
} else {
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = FALSE;
-#line 6636 "ImportPage.c"
+#line 6625 "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_);
@@ -6641,10 +6630,10 @@ 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 6644 "ImportPage.c"
- ViewCollection* _tmp16_ = NULL;
- ViewCollection* _tmp17_ = NULL;
- gint _tmp18_ = 0;
+#line 6633 "ImportPage.c"
+ ViewCollection* _tmp16_;
+ ViewCollection* _tmp17_;
+ gint _tmp18_;
#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6655,40 +6644,40 @@ 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 6658 "ImportPage.c"
+#line 6647 "ImportPage.c"
} else {
#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = FALSE;
-#line 6662 "ImportPage.c"
+#line 6651 "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 6668 "ImportPage.c"
+#line 6657 "ImportPage.c"
}
static void import_page_on_media_added_removed (ImportPage* self) {
- ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
+ ImportPageImportPageSearchViewFilter* _tmp0_;
#line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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 6680 "ImportPage.c"
+#line 6669 "ImportPage.c"
}
static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value) {
gboolean display = FALSE;
- GVariant* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- GSimpleAction* _tmp4_ = NULL;
- GVariant* _tmp5_ = NULL;
+ GVariant* _tmp0_;
+ gboolean _tmp1_;
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ GSimpleAction* _tmp4_;
+ GVariant* _tmp5_;
#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6715,15 +6704,15 @@ 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 6718 "ImportPage.c"
+#line 6707 "ImportPage.c"
}
static void import_page_real_switched_to (Page* base) {
ImportPage * self;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gboolean _tmp2_;
#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6738,13 +6727,13 @@ 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 6741 "ImportPage.c"
+#line 6730 "ImportPage.c"
}
static void import_page_real_ready (Page* base) {
ImportPage * self;
- ImportPageHideImportedViewFilter* _tmp0_ = NULL;
+ ImportPageHideImportedViewFilter* _tmp0_;
#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6753,16 +6742,16 @@ 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 6756 "ImportPage.c"
+#line 6745 "ImportPage.c"
}
static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
ImportPageRefreshResult res = 0;
- ImportPageRefreshResult _tmp3_ = 0;
- ImportPageRefreshResult _tmp4_ = 0;
+ ImportPageRefreshResult _tmp3_;
+ ImportPageRefreshResult _tmp4_;
GError * _inner_error_ = NULL;
#line 987 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -6772,20 +6761,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 6775 "ImportPage.c"
+#line 6764 "ImportPage.c"
} else {
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
#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 6782 "ImportPage.c"
+#line 6771 "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 6788 "ImportPage.c"
+#line 6777 "ImportPage.c"
}
#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = import_page_refresh_camera (self);
@@ -6799,23 +6788,23 @@ 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 6802 "ImportPage.c"
+#line 6791 "ImportPage.c"
{
#line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 6806 "ImportPage.c"
+#line 6795 "ImportPage.c"
}
#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6810 "ImportPage.c"
+#line 6799 "ImportPage.c"
{
- gboolean _tmp5_ = FALSE;
- const gchar* _tmp6_ = NULL;
+ gboolean _tmp5_;
+ const gchar* _tmp6_;
GFile* uri = NULL;
- const gchar* _tmp7_ = NULL;
- GFile* _tmp8_ = NULL;
+ const gchar* _tmp7_;
+ GFile* _tmp8_;
GMount* mount = NULL;
- GMount* _tmp13_ = NULL;
+ GMount* _tmp13_;
#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = fail_on_locked;
#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6824,7 +6813,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 6827 "ImportPage.c"
+#line 6816 "ImportPage.c"
}
#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = self->priv->uri;
@@ -6838,12 +6827,12 @@ 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 6841 "ImportPage.c"
+#line 6830 "ImportPage.c"
{
GMount* _tmp9_ = NULL;
- GFile* _tmp10_ = NULL;
- GMount* _tmp11_ = NULL;
- GMount* _tmp12_ = NULL;
+ GFile* _tmp10_;
+ GMount* _tmp11_;
+ GMount* _tmp12_;
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = uri;
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6852,8 +6841,8 @@ 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 6855 "ImportPage.c"
- goto __catch65_g_error;
+#line 6844 "ImportPage.c"
+ goto __catch66_g_error;
}
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = _tmp9_;
@@ -6865,10 +6854,10 @@ 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 6868 "ImportPage.c"
+#line 6857 "ImportPage.c"
}
- goto __finally65;
- __catch65_g_error:
+ goto __finally66;
+ __catch66_g_error:
{
GError* err = NULL;
#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6877,9 +6866,9 @@ 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 6880 "ImportPage.c"
+#line 6869 "ImportPage.c"
}
- __finally65:
+ __finally66:
#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6892,156 +6881,140 @@ 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 6895 "ImportPage.c"
+#line 6884 "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 6901 "ImportPage.c"
+#line 6890 "ImportPage.c"
gchar* mounted_message = NULL;
- const gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
+ gchar* _tmp14_;
GtkMessageDialog* dialog = NULL;
- AppWindow* _tmp16_ = NULL;
- AppWindow* _tmp17_ = NULL;
- const gchar* _tmp18_ = NULL;
- GtkMessageDialog* _tmp19_ = NULL;
- GtkMessageDialog* _tmp20_ = NULL;
- GtkMessageDialog* _tmp21_ = NULL;
- GtkMessageDialog* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
+ AppWindow* _tmp15_;
+ AppWindow* _tmp16_;
+ const gchar* _tmp17_;
+ GtkMessageDialog* _tmp18_;
+ GtkMessageDialog* _tmp19_;
+ GtkMessageDialog* _tmp20_;
+ GtkMessageDialog* _tmp21_;
gint dialog_res = 0;
- GtkMessageDialog* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- GtkMessageDialog* _tmp26_ = NULL;
- gint _tmp27_ = 0;
+ GtkMessageDialog* _tmp22_;
+ gint _tmp23_;
+ GtkMessageDialog* _tmp24_;
+ gint _tmp25_;
#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = _ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
-"ccess it. Continue?");
+ _tmp14_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
+"ccess it. Continue?"));
#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = g_strdup (_tmp14_);
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- mounted_message = _tmp15_;
+ mounted_message = _tmp14_;
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = app_window_get_instance ();
+ _tmp15_ = app_window_get_instance ();
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = _tmp16_;
+ _tmp16_ = _tmp15_;
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = mounted_message;
+ _tmp17_ = mounted_message;
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp18_);
+ _tmp18_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp17_);
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp19_);
+ g_object_ref_sink (_tmp18_);
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = _tmp19_;
+ _tmp19_ = _tmp18_;
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp17_);
+ _g_object_unref0 (_tmp16_);
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog = _tmp20_;
+ dialog = _tmp19_;
#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = dialog;
+ _tmp20_ = dialog;
#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = dialog;
-#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = _ ("_Unmount");
+ _tmp21_ = dialog;
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog), _tmp23_, (gint) GTK_RESPONSE_YES);
+ gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = dialog;
+ _tmp22_ = dialog;
#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_dialog_get_type (), GtkDialog));
+ _tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog_res = _tmp25_;
+ dialog_res = _tmp23_;
#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = dialog;
+ _tmp24_ = dialog;
#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = dialog_res;
+ _tmp25_ = dialog_res;
#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) {
-#line 6965 "ImportPage.c"
- const gchar* _tmp28_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = _ ("Please unmount the camera.");
+ if (_tmp25_ != ((gint) GTK_RESPONSE_YES)) {
#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 6971 "ImportPage.c"
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please unmount the camera."));
+#line 6950 "ImportPage.c"
} else {
- GMount* _tmp29_ = NULL;
+ GMount* _tmp26_;
#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = mount;
+ _tmp26_ = mount;
#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_unmount_camera (self, _tmp29_);
-#line 6978 "ImportPage.c"
+ import_page_unmount_camera (self, _tmp26_);
+#line 6957 "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 6984 "ImportPage.c"
+#line 6963 "ImportPage.c"
} else {
gchar* locked_message = NULL;
- const gchar* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
+ gchar* _tmp27_;
GtkMessageDialog* dialog = NULL;
- AppWindow* _tmp32_ = NULL;
- AppWindow* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
- GtkMessageDialog* _tmp35_ = NULL;
- GtkMessageDialog* _tmp36_ = NULL;
- GtkMessageDialog* _tmp37_ = NULL;
- GtkMessageDialog* _tmp38_ = NULL;
- GtkMessageDialog* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
+ AppWindow* _tmp28_;
+ AppWindow* _tmp29_;
+ const gchar* _tmp30_;
+ GtkMessageDialog* _tmp31_;
+ GtkMessageDialog* _tmp32_;
+ GtkMessageDialog* _tmp33_;
+ GtkMessageDialog* _tmp34_;
+ GtkMessageDialog* _tmp35_;
#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = _ ("The camera is locked by another application. Shotwell can only access " \
+ _tmp27_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \
"the camera when it’s unlocked. Please close any other application usin" \
-"g the camera and try again.");
-#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = g_strdup (_tmp30_);
+"g the camera and try again."));
#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- locked_message = _tmp31_;
+ locked_message = _tmp27_;
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = app_window_get_instance ();
+ _tmp28_ = app_window_get_instance ();
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = _tmp32_;
+ _tmp29_ = _tmp28_;
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = locked_message;
+ _tmp30_ = locked_message;
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp34_);
+ _tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp30_);
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp35_);
+ g_object_ref_sink (_tmp31_);
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp32_ = _tmp31_;
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp33_);
+ _g_object_unref0 (_tmp29_);
#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog = _tmp36_;
+ dialog = _tmp32_;
#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = dialog;
+ _tmp33_ = dialog;
#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = dialog;
+ _tmp34_ = dialog;
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_dialog_get_type (), GtkDialog));
+ gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_dialog_get_type (), GtkDialog));
#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = dialog;
+ _tmp35_ = dialog;
#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = _ ("Please close any other application using the camera.");
-#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp40_);
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please close any other application using the camera."));
#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dialog);
#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (locked_message);
-#line 7041 "ImportPage.c"
+#line 7014 "ImportPage.c"
}
#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
@@ -7049,45 +7022,42 @@ 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 7049 "ImportPage.c"
+#line 7022 "ImportPage.c"
}
#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7053 "ImportPage.c"
+#line 7026 "ImportPage.c"
{
- const gchar* _tmp41_ = NULL;
- gchar* _tmp42_ = NULL;
- gchar* _tmp43_ = NULL;
- gchar* _tmp44_ = NULL;
- gchar* _tmp45_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = _ ("Unable to fetch previews from the camera:\n%s");
+ gchar* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_page_get_refresh_message (self);
+ _tmp36_ = import_page_get_refresh_message (self);
#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = _tmp42_;
+ _tmp37_ = _tmp36_;
#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = g_strdup_printf (_tmp41_, _tmp43_);
+ _tmp38_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp37_);
#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = _tmp44_;
+ _tmp39_ = _tmp38_;
#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- app_window_error_message (_tmp45_, NULL);
+ app_window_error_message (_tmp39_, NULL);
#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp45_);
+ _g_free0 (_tmp39_);
#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp43_);
+ _g_free0 (_tmp37_);
#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7078 "ImportPage.c"
+#line 7048 "ImportPage.c"
}
default:
{
- ImportPageRefreshResult _tmp46_ = 0;
+ ImportPageRefreshResult _tmp40_;
#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = res;
+ _tmp40_ = res;
#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp46_);
-#line 7087 "ImportPage.c"
+ g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp40_);
+#line 7057 "ImportPage.c"
}
}
}
@@ -7096,7 +7066,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 7096 "ImportPage.c"
+#line 7066 "ImportPage.c"
}
@@ -7105,24 +7075,23 @@ 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 7105 "ImportPage.c"
+#line 7075 "ImportPage.c"
}
gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
- GtkProgressBar* _tmp1_ = NULL;
- GtkProgressBar* _tmp2_ = NULL;
- GtkProgressBar* _tmp3_ = NULL;
- GtkProgressBar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- GMount* _tmp6_ = NULL;
- GMount* _tmp7_ = NULL;
- AppWindow* _tmp8_ = NULL;
- AppWindow* _tmp9_ = NULL;
- GtkMountOperation* _tmp10_ = NULL;
- GtkMountOperation* _tmp11_ = NULL;
+ gboolean _tmp0_;
+ GtkProgressBar* _tmp1_;
+ GtkProgressBar* _tmp2_;
+ GtkProgressBar* _tmp3_;
+ GtkProgressBar* _tmp4_;
+ GMount* _tmp5_;
+ GMount* _tmp6_;
+ AppWindow* _tmp7_;
+ AppWindow* _tmp8_;
+ GtkMountOperation* _tmp9_;
+ GtkMountOperation* _tmp10_;
#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7135,7 +7104,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 7135 "ImportPage.c"
+#line 7104 "ImportPage.c"
}
#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, TRUE, FALSE);
@@ -7154,43 +7123,41 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->progress_bar;
#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _ ("Unmounting…");
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp4_, _tmp5_);
+ gtk_progress_bar_set_text (_tmp4_, _ ("Unmounting…"));
#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = mount;
+ _tmp5_ = mount;
#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp6_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
+ g_signal_connect_object (_tmp5_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_debug ("ImportPage.vala:1076: Unmounting camera…");
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = mount;
+ _tmp6_ = mount;
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = app_window_get_instance ();
+ _tmp7_ = app_window_get_instance ();
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow));
+ _tmp9_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_mount_unmount_with_operation (_tmp7_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
+ g_mount_unmount_with_operation (_tmp6_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp10_);
#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp8_);
#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7183 "ImportPage.c"
+#line 7150 "ImportPage.c"
}
static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GAsyncResult* aresult) {
GMount* mount = NULL;
- GObject* _tmp0_ = NULL;
- GMount* _tmp1_ = NULL;
+ GObject* _tmp0_;
+ GMount* _tmp1_;
GError * _inner_error_ = NULL;
#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -7206,28 +7173,28 @@ 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 7206 "ImportPage.c"
+#line 7173 "ImportPage.c"
{
- GAsyncResult* _tmp2_ = NULL;
+ GAsyncResult* _tmp2_;
#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = aresult;
#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7215 "ImportPage.c"
- goto __catch66_g_error;
+#line 7182 "ImportPage.c"
+ goto __catch67_g_error;
}
}
- goto __finally66;
- __catch66_g_error:
+ goto __finally67;
+ __catch67_g_error:
{
GError* err = NULL;
- guint _tmp3_ = 0U;
- gboolean _tmp4_ = FALSE;
- GtkProgressBar* _tmp5_ = NULL;
- GtkProgressBar* _tmp6_ = NULL;
- GtkProgressBar* _tmp7_ = NULL;
+ guint _tmp3_;
+ gboolean _tmp4_;
+ GtkProgressBar* _tmp5_;
+ GtkProgressBar* _tmp6_;
+ GtkProgressBar* _tmp7_;
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7256,9 +7223,9 @@ 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 7256 "ImportPage.c"
+#line 7223 "ImportPage.c"
}
- __finally66:
+ __finally67:
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7269,19 +7236,19 @@ 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 7269 "ImportPage.c"
+#line 7236 "ImportPage.c"
}
#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 7273 "ImportPage.c"
+#line 7240 "ImportPage.c"
}
static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
- gboolean _tmp0_ = FALSE;
- GtkProgressBar* _tmp1_ = NULL;
- GtkProgressBar* _tmp2_ = NULL;
- GtkProgressBar* _tmp3_ = NULL;
+ gboolean _tmp0_;
+ GtkProgressBar* _tmp1_;
+ GtkProgressBar* _tmp2_;
+ GtkProgressBar* _tmp3_;
#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7306,15 +7273,15 @@ 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 7306 "ImportPage.c"
+#line 7273 "ImportPage.c"
}
static void import_page_clear_all_import_sources (ImportPage* self) {
Marker* marker = NULL;
- SourceCollection* _tmp0_ = NULL;
- Marker* _tmp1_ = NULL;
- SourceCollection* _tmp2_ = NULL;
+ SourceCollection* _tmp0_;
+ Marker* _tmp1_;
+ SourceCollection* _tmp2_;
#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7331,7 +7298,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 7331 "ImportPage.c"
+#line 7298 "ImportPage.c"
}
@@ -7345,26 +7312,26 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target) {
gboolean result = FALSE;
gchar* fulldir = NULL;
- Camera* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ Camera* _tmp0_;
+ const gchar* _tmp1_;
+ gint _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
int _result_ = 0;
CameraList* folders = NULL;
CameraList* _tmp5_ = NULL;
- int _tmp6_ = 0;
- int _tmp7_ = 0;
- Camera* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- CameraList* _tmp10_ = NULL;
- GPSpinIdleWrapper* _tmp11_ = NULL;
- GPContext* _tmp12_ = NULL;
- int _tmp13_ = 0;
- int _tmp14_ = 0;
+ int _tmp6_;
+ int _tmp7_;
+ Camera* _tmp8_;
+ const gchar* _tmp9_;
+ CameraList* _tmp10_;
+ GPSpinIdleWrapper* _tmp11_;
+ GPContext* _tmp12_;
+ int _tmp13_;
+ int _tmp14_;
gint list_len = 0;
- CameraList* _tmp15_ = NULL;
- gint _tmp16_ = 0;
+ CameraList* _tmp15_;
+ gint _tmp16_;
#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7403,7 +7370,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 7403 "ImportPage.c"
+#line 7370 "ImportPage.c"
}
#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->camera;
@@ -7431,7 +7398,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 7431 "ImportPage.c"
+#line 7398 "ImportPage.c"
}
#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = folders;
@@ -7439,37 +7406,37 @@ 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 7439 "ImportPage.c"
+#line 7406 "ImportPage.c"
{
gint list_index = 0;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_index = 0;
-#line 7444 "ImportPage.c"
+#line 7411 "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 7451 "ImportPage.c"
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+#line 7418 "ImportPage.c"
+ gint _tmp19_;
+ gint _tmp20_;
gchar* tmp = NULL;
- CameraList* _tmp21_ = NULL;
- gint _tmp22_ = 0;
+ CameraList* _tmp21_;
+ gint _tmp22_;
const gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- const gchar* _tmp25_ = NULL;
- const gchar* _tmp26_ = NULL;
+ gchar* _tmp24_;
+ const gchar* _tmp25_;
+ const gchar* _tmp26_;
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp17_) {
-#line 7463 "ImportPage.c"
- gint _tmp18_ = 0;
+#line 7430 "ImportPage.c"
+ gint _tmp18_;
#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 7469 "ImportPage.c"
+#line 7436 "ImportPage.c"
}
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = FALSE;
@@ -7481,7 +7448,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 7481 "ImportPage.c"
+#line 7448 "ImportPage.c"
}
#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = folders;
@@ -7511,11 +7478,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 7511 "ImportPage.c"
+#line 7478 "ImportPage.c"
}
#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (tmp);
-#line 7515 "ImportPage.c"
+#line 7482 "ImportPage.c"
}
}
}
@@ -7527,51 +7494,49 @@ 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 7527 "ImportPage.c"
+#line 7494 "ImportPage.c"
}
static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
ImportPageRefreshResult result = 0;
- gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- Camera* _tmp3_ = NULL;
- GPSpinIdleWrapper* _tmp4_ = NULL;
- GPContext* _tmp5_ = NULL;
- int _tmp6_ = 0;
- int _tmp7_ = 0;
- gboolean _tmp13_ = FALSE;
- GtkProgressBar* _tmp14_ = NULL;
- GtkProgressBar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- GtkProgressBar* _tmp17_ = NULL;
- GtkProgressBar* _tmp18_ = NULL;
- GtkProgressBar* _tmp19_ = NULL;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
+ Camera* _tmp2_;
+ GPSpinIdleWrapper* _tmp3_;
+ GPContext* _tmp4_;
+ int _tmp5_;
+ int _tmp6_;
+ gboolean _tmp12_;
+ GtkProgressBar* _tmp13_;
+ GtkProgressBar* _tmp14_;
+ GtkProgressBar* _tmp15_;
+ GtkProgressBar* _tmp16_;
+ GtkProgressBar* _tmp17_;
GeeArrayList* import_list = NULL;
- GeeArrayList* _tmp20_ = NULL;
+ GeeArrayList* _tmp18_;
CameraStorageInformation* sifs = NULL;
gint count = 0;
- Camera* _tmp21_ = NULL;
- GPSpinIdleWrapper* _tmp22_ = NULL;
- GPContext* _tmp23_ = NULL;
- gint _tmp24_ = 0;
- int _tmp25_ = 0;
- int _tmp26_ = 0;
- GeeArrayList* _tmp75_ = NULL;
- GeeArrayList* _tmp76_ = NULL;
- GtkProgressBar* _tmp77_ = NULL;
- GtkProgressBar* _tmp78_ = NULL;
- GtkProgressBar* _tmp79_ = NULL;
- GtkProgressBar* _tmp80_ = NULL;
+ Camera* _tmp19_;
+ GPSpinIdleWrapper* _tmp20_;
+ GPContext* _tmp21_;
+ gint _tmp22_ = 0;
+ int _tmp23_;
+ int _tmp24_;
+ GeeArrayList* _tmp73_;
+ GeeArrayList* _tmp74_;
+ GtkProgressBar* _tmp75_;
+ GtkProgressBar* _tmp76_;
+ GtkProgressBar* _tmp77_;
+ GtkProgressBar* _tmp78_;
int res = 0;
- Camera* _tmp81_ = NULL;
- GPSpinIdleWrapper* _tmp82_ = NULL;
- GPContext* _tmp83_ = NULL;
- int _tmp84_ = 0;
- int _tmp85_ = 0;
- int _tmp89_ = 0;
- int _tmp94_ = 0;
+ Camera* _tmp79_;
+ GPSpinIdleWrapper* _tmp80_;
+ GPContext* _tmp81_;
+ int _tmp82_;
+ int _tmp83_;
+ int _tmp87_;
+ int _tmp92_;
#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), 0);
#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7582,390 +7547,386 @@ 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 7582 "ImportPage.c"
+#line 7547 "ImportPage.c"
}
#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _ ("Starting import, please wait…");
-#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp1_);
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Starting import, please wait…"));
#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = self->priv->busy;
+ _tmp1_ = self->priv->busy;
#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, _tmp2_, FALSE);
+ import_page_update_status (self, _tmp1_, FALSE);
#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->refresh_error);
#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_error = NULL;
#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = self->priv->camera;
+ _tmp2_ = self->priv->camera;
#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = import_page_spin_idle_context;
+ _tmp3_ = import_page_spin_idle_context;
#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = gp_camera_init (_tmp3_, _tmp5_);
+ _tmp5_ = gp_camera_init (_tmp2_, _tmp4_);
#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp6_;
+ self->priv->refresh_result = _tmp5_;
#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = self->priv->refresh_result;
+ _tmp6_ = self->priv->refresh_result;
#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp7_ != GP_OK) {
-#line 7610 "ImportPage.c"
- int _tmp8_ = 0;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- ImportPageRefreshResult _tmp11_ = 0;
- int _tmp12_ = 0;
+ if (_tmp6_ != GP_OK) {
+#line 7573 "ImportPage.c"
+ int _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ ImportPageRefreshResult _tmp10_ = 0;
+ int _tmp11_;
#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = self->priv->refresh_result;
+ _tmp7_ = self->priv->refresh_result;
#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = gp_result_to_full_string (_tmp8_);
+ _tmp8_ = gp_result_to_full_string (_tmp7_);
#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp10_);
+ g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp9_);
#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp9_);
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = self->priv->refresh_result;
+ _tmp11_ = self->priv->refresh_result;
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp12_ == GP_ERROR_IO_LOCK) {
+ if (_tmp11_ == GP_ERROR_IO_LOCK) {
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7632 "ImportPage.c"
+ _tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
+#line 7595 "ImportPage.c"
} else {
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7636 "ImportPage.c"
+ _tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
+#line 7599 "ImportPage.c"
}
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp11_;
+ result = _tmp10_;
#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7642 "ImportPage.c"
+#line 7605 "ImportPage.c"
}
#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = self->priv->refreshed;
+ _tmp12_ = self->priv->refreshed;
#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, TRUE, _tmp13_);
+ import_page_update_status (self, TRUE, _tmp12_);
#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = self->priv->progress_bar;
+ _tmp13_ = self->priv->progress_bar;
#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp14_, PANGO_ELLIPSIZE_NONE);
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = self->priv->progress_bar;
+ gtk_progress_bar_set_ellipsize (_tmp13_, PANGO_ELLIPSIZE_NONE);
#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = _ ("Fetching photo information");
+ _tmp14_ = self->priv->progress_bar;
#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp15_, _tmp16_);
+ gtk_progress_bar_set_text (_tmp14_, _ ("Fetching photo information"));
#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = self->priv->progress_bar;
+ _tmp15_ = self->priv->progress_bar;
#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp17_, 0.0);
+ gtk_progress_bar_set_fraction (_tmp15_, 0.0);
#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = self->priv->progress_bar;
+ _tmp16_ = self->priv->progress_bar;
#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_pulse_step (_tmp18_, 0.01);
+ gtk_progress_bar_set_pulse_step (_tmp16_, 0.01);
#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = self->priv->progress_bar;
+ _tmp17_ = self->priv->progress_bar;
#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);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp18_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_list = _tmp20_;
+ import_list = _tmp18_;
#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
sifs = NULL;
#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
count = 0;
#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = self->priv->camera;
+ _tmp19_ = self->priv->camera;
#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = import_page_spin_idle_context;
+ _tmp20_ = import_page_spin_idle_context;
#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = gp_camera_get_storageinfo (_tmp21_, &sifs, &_tmp24_, _tmp23_);
+ _tmp23_ = gp_camera_get_storageinfo (_tmp19_, &sifs, &_tmp22_, _tmp21_);
#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- count = _tmp24_;
+ count = _tmp22_;
#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp25_;
+ self->priv->refresh_result = _tmp23_;
#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = self->priv->refresh_result;
+ _tmp24_ = self->priv->refresh_result;
#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp26_ == GP_OK) {
-#line 7696 "ImportPage.c"
+ if (_tmp24_ == GP_OK) {
+#line 7657 "ImportPage.c"
{
gint fsid = 0;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
fsid = 0;
-#line 7701 "ImportPage.c"
+#line 7662 "ImportPage.c"
{
- gboolean _tmp27_ = FALSE;
+ gboolean _tmp25_ = FALSE;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = TRUE;
+ _tmp25_ = TRUE;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 7708 "ImportPage.c"
- gint _tmp29_ = 0;
- gint _tmp30_ = 0;
+#line 7669 "ImportPage.c"
+ gint _tmp27_;
+ gint _tmp28_;
gboolean got_well_known_dir = FALSE;
- gint _tmp31_ = 0;
- gboolean _tmp32_ = FALSE;
- gint _tmp35_ = 0;
- gboolean _tmp36_ = FALSE;
- gint _tmp39_ = 0;
- gboolean _tmp40_ = FALSE;
- gint _tmp43_ = 0;
- gboolean _tmp44_ = FALSE;
- gint _tmp47_ = 0;
- gboolean _tmp48_ = FALSE;
- gint _tmp51_ = 0;
- gboolean _tmp52_ = FALSE;
- gint _tmp55_ = 0;
- gboolean _tmp56_ = FALSE;
- gint _tmp59_ = 0;
- gboolean _tmp60_ = FALSE;
- gint _tmp63_ = 0;
- gboolean _tmp64_ = FALSE;
- gint _tmp67_ = 0;
- gboolean _tmp68_ = FALSE;
- gboolean _tmp71_ = FALSE;
+ gint _tmp29_;
+ gboolean _tmp30_;
+ gint _tmp33_;
+ gboolean _tmp34_;
+ gint _tmp37_;
+ gboolean _tmp38_;
+ gint _tmp41_;
+ gboolean _tmp42_;
+ gint _tmp45_;
+ gboolean _tmp46_;
+ gint _tmp49_;
+ gboolean _tmp50_;
+ gint _tmp53_;
+ gboolean _tmp54_;
+ gint _tmp57_;
+ gboolean _tmp58_;
+ gint _tmp61_;
+ gboolean _tmp62_;
+ gint _tmp65_;
+ gboolean _tmp66_;
+ gboolean _tmp69_;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp27_) {
-#line 7735 "ImportPage.c"
- gint _tmp28_ = 0;
+ if (!_tmp25_) {
+#line 7696 "ImportPage.c"
+ gint _tmp26_;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = fsid;
+ _tmp26_ = fsid;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- fsid = _tmp28_ + 1;
-#line 7741 "ImportPage.c"
+ fsid = _tmp26_ + 1;
+#line 7702 "ImportPage.c"
}
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = FALSE;
+ _tmp25_ = FALSE;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = fsid;
+ _tmp27_ = fsid;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = count;
+ _tmp28_ = count;
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp29_ < _tmp30_)) {
+ if (!(_tmp27_ < _tmp28_)) {
#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7753 "ImportPage.c"
+#line 7714 "ImportPage.c"
}
#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = FALSE;
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = fsid;
+ _tmp29_ = fsid;
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM");
+ _tmp30_ = import_page_check_directory_exists (self, _tmp29_, "/", "DCIM");
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp32_) {
-#line 7763 "ImportPage.c"
- gint _tmp33_ = 0;
- GeeArrayList* _tmp34_ = NULL;
+ if (_tmp30_) {
+#line 7724 "ImportPage.c"
+ gint _tmp31_;
+ GeeArrayList* _tmp32_;
#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = fsid;
+ _tmp31_ = fsid;
#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = import_list;
+ _tmp32_ = import_list;
#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
+ import_page_enumerate_files (self, _tmp31_, "/DCIM", _tmp32_);
#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7774 "ImportPage.c"
+#line 7735 "ImportPage.c"
}
#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = fsid;
+ _tmp33_ = fsid;
#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim");
+ _tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "dcim");
#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp36_) {
-#line 7782 "ImportPage.c"
- gint _tmp37_ = 0;
- GeeArrayList* _tmp38_ = NULL;
+ if (_tmp34_) {
+#line 7743 "ImportPage.c"
+ gint _tmp35_;
+ GeeArrayList* _tmp36_;
#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = fsid;
+ _tmp35_ = fsid;
#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = import_list;
+ _tmp36_ = import_list;
#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_);
+ import_page_enumerate_files (self, _tmp35_, "/dcim", _tmp36_);
#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7793 "ImportPage.c"
+#line 7754 "ImportPage.c"
}
#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = fsid;
+ _tmp37_ = fsid;
#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD");
+ _tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/PRIVATE/", "AVCHD");
#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp40_) {
-#line 7801 "ImportPage.c"
- gint _tmp41_ = 0;
- GeeArrayList* _tmp42_ = NULL;
+ if (_tmp38_) {
+#line 7762 "ImportPage.c"
+ gint _tmp39_;
+ GeeArrayList* _tmp40_;
#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = fsid;
+ _tmp39_ = fsid;
#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_list;
+ _tmp40_ = import_list;
#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_);
+ import_page_enumerate_files (self, _tmp39_, "/PRIVATE/AVCHD", _tmp40_);
#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7812 "ImportPage.c"
+#line 7773 "ImportPage.c"
}
#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = fsid;
+ _tmp41_ = fsid;
#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd");
+ _tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/private/", "avchd");
#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp44_) {
-#line 7820 "ImportPage.c"
- gint _tmp45_ = 0;
- GeeArrayList* _tmp46_ = NULL;
+ if (_tmp42_) {
+#line 7781 "ImportPage.c"
+ gint _tmp43_;
+ GeeArrayList* _tmp44_;
#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = fsid;
+ _tmp43_ = fsid;
#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = import_list;
+ _tmp44_ = import_list;
#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_);
+ import_page_enumerate_files (self, _tmp43_, "/private/avchd", _tmp44_);
#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7831 "ImportPage.c"
+#line 7792 "ImportPage.c"
}
#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = fsid;
+ _tmp45_ = fsid;
#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD");
+ _tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/", "AVCHD");
#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp48_) {
-#line 7839 "ImportPage.c"
- gint _tmp49_ = 0;
- GeeArrayList* _tmp50_ = NULL;
+ if (_tmp46_) {
+#line 7800 "ImportPage.c"
+ gint _tmp47_;
+ GeeArrayList* _tmp48_;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = fsid;
+ _tmp47_ = fsid;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_list;
+ _tmp48_ = import_list;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_);
+ import_page_enumerate_files (self, _tmp47_, "/AVCHD", _tmp48_);
#line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7850 "ImportPage.c"
+#line 7811 "ImportPage.c"
}
#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = fsid;
+ _tmp49_ = fsid;
#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd");
+ _tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "avchd");
#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp52_) {
-#line 7858 "ImportPage.c"
- gint _tmp53_ = 0;
- GeeArrayList* _tmp54_ = NULL;
+ if (_tmp50_) {
+#line 7819 "ImportPage.c"
+ gint _tmp51_;
+ GeeArrayList* _tmp52_;
#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = fsid;
+ _tmp51_ = fsid;
#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = import_list;
+ _tmp52_ = import_list;
#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_);
+ import_page_enumerate_files (self, _tmp51_, "/avchd", _tmp52_);
#line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7869 "ImportPage.c"
+#line 7830 "ImportPage.c"
}
#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = fsid;
+ _tmp53_ = fsid;
#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY");
+ _tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/PRIVATE/", "SONY");
#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp56_) {
-#line 7877 "ImportPage.c"
- gint _tmp57_ = 0;
- GeeArrayList* _tmp58_ = NULL;
+ if (_tmp54_) {
+#line 7838 "ImportPage.c"
+ gint _tmp55_;
+ GeeArrayList* _tmp56_;
#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = fsid;
+ _tmp55_ = fsid;
#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = import_list;
+ _tmp56_ = import_list;
#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_);
+ import_page_enumerate_files (self, _tmp55_, "/PRIVATE/SONY", _tmp56_);
#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7888 "ImportPage.c"
+#line 7849 "ImportPage.c"
}
#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = fsid;
+ _tmp57_ = fsid;
#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony");
+ _tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/private/", "sony");
#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp60_) {
-#line 7896 "ImportPage.c"
- gint _tmp61_ = 0;
- GeeArrayList* _tmp62_ = NULL;
+ if (_tmp58_) {
+#line 7857 "ImportPage.c"
+ gint _tmp59_;
+ GeeArrayList* _tmp60_;
#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = fsid;
+ _tmp59_ = fsid;
#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = import_list;
+ _tmp60_ = import_list;
#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_);
+ import_page_enumerate_files (self, _tmp59_, "/private/sony", _tmp60_);
#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7907 "ImportPage.c"
+#line 7868 "ImportPage.c"
}
#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = fsid;
+ _tmp61_ = fsid;
#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT");
+ _tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/", "MP_ROOT");
#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp64_) {
-#line 7915 "ImportPage.c"
- gint _tmp65_ = 0;
- GeeArrayList* _tmp66_ = NULL;
+ if (_tmp62_) {
+#line 7876 "ImportPage.c"
+ gint _tmp63_;
+ GeeArrayList* _tmp64_;
#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = fsid;
+ _tmp63_ = fsid;
#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = import_list;
+ _tmp64_ = import_list;
#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_);
+ import_page_enumerate_files (self, _tmp63_, "/MP_ROOT", _tmp64_);
#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7926 "ImportPage.c"
+#line 7887 "ImportPage.c"
}
#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = fsid;
+ _tmp65_ = fsid;
#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root");
+ _tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "mp_root");
#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp68_) {
-#line 7934 "ImportPage.c"
- gint _tmp69_ = 0;
- GeeArrayList* _tmp70_ = NULL;
+ if (_tmp66_) {
+#line 7895 "ImportPage.c"
+ gint _tmp67_;
+ GeeArrayList* _tmp68_;
#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = fsid;
+ _tmp67_ = fsid;
#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = import_list;
+ _tmp68_ = import_list;
#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_);
+ import_page_enumerate_files (self, _tmp67_, "/mp_root", _tmp68_);
#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 7945 "ImportPage.c"
+#line 7906 "ImportPage.c"
}
#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = got_well_known_dir;
+ _tmp69_ = got_well_known_dir;
#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp71_) {
-#line 7951 "ImportPage.c"
- gint _tmp72_ = 0;
- GeeArrayList* _tmp73_ = NULL;
- gboolean _tmp74_ = FALSE;
+ if (!_tmp69_) {
+#line 7912 "ImportPage.c"
+ gint _tmp70_;
+ GeeArrayList* _tmp71_;
+ gboolean _tmp72_;
#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = fsid;
+ _tmp70_ = fsid;
#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = import_list;
+ _tmp71_ = import_list;
#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = import_page_enumerate_files (self, _tmp72_, "/", _tmp73_);
+ _tmp72_ = import_page_enumerate_files (self, _tmp70_, "/", _tmp71_);
#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp74_) {
+ if (!_tmp72_) {
#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7965 "ImportPage.c"
+#line 7926 "ImportPage.c"
}
}
}
@@ -7975,104 +7936,104 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_clear_all_import_sources (self);
#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = import_list;
+ _tmp73_ = import_list;
#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_auto_match_raw_jpeg (self, _tmp75_);
+ import_page_auto_match_raw_jpeg (self, _tmp73_);
#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = import_list;
+ _tmp74_ = import_list;
#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
+ import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_LIST, GeeList));
#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = self->priv->progress_bar;
+ _tmp75_ = self->priv->progress_bar;
#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = self->priv->progress_bar;
+ _tmp76_ = self->priv->progress_bar;
#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp78_, PANGO_ELLIPSIZE_NONE);
+ gtk_progress_bar_set_ellipsize (_tmp76_, PANGO_ELLIPSIZE_NONE);
#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = self->priv->progress_bar;
+ _tmp77_ = self->priv->progress_bar;
#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp79_, "");
+ gtk_progress_bar_set_text (_tmp77_, "");
#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = self->priv->progress_bar;
+ _tmp78_ = self->priv->progress_bar;
#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp80_, 0.0);
+ gtk_progress_bar_set_fraction (_tmp78_, 0.0);
#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = self->priv->camera;
+ _tmp79_ = self->priv->camera;
#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = import_page_spin_idle_context;
+ _tmp80_ = import_page_spin_idle_context;
#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp81_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = gp_camera_exit (_tmp81_, _tmp83_);
+ _tmp82_ = gp_camera_exit (_tmp79_, _tmp81_);
#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp84_;
+ res = _tmp82_;
#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = res;
+ _tmp83_ = res;
#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp85_ != GP_OK) {
-#line 8012 "ImportPage.c"
- int _tmp86_ = 0;
- gchar* _tmp87_ = NULL;
- gchar* _tmp88_ = NULL;
+ if (_tmp83_ != GP_OK) {
+#line 7973 "ImportPage.c"
+ int _tmp84_;
+ gchar* _tmp85_;
+ gchar* _tmp86_;
#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = res;
+ _tmp84_ = res;
#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = gp_result_to_full_string (_tmp86_);
+ _tmp85_ = gp_result_to_full_string (_tmp84_);
#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = _tmp87_;
+ _tmp86_ = _tmp85_;
#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp88_);
+ g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp86_);
#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp88_);
-#line 8026 "ImportPage.c"
+ _g_free0 (_tmp86_);
+#line 7987 "ImportPage.c"
}
#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = self->priv->refresh_result;
+ _tmp87_ = self->priv->refresh_result;
#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp89_ == GP_OK) {
-#line 8032 "ImportPage.c"
- SourceCollection* _tmp90_ = NULL;
- gint _tmp91_ = 0;
+ if (_tmp87_ == GP_OK) {
+#line 7993 "ImportPage.c"
+ SourceCollection* _tmp88_;
+ gint _tmp89_;
#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = self->priv->import_sources;
+ _tmp88_ = self->priv->import_sources;
#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp89_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_DATA_COLLECTION, DataCollection));
#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp91_ == 0) {
-#line 8041 "ImportPage.c"
- gchar* _tmp92_ = NULL;
- gchar* _tmp93_ = NULL;
+ if (_tmp89_ == 0) {
+#line 8002 "ImportPage.c"
+ gchar* _tmp90_;
+ gchar* _tmp91_;
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+ _tmp90_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = _tmp92_;
+ _tmp91_ = _tmp90_;
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp93_);
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp91_);
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp93_);
-#line 8052 "ImportPage.c"
+ _g_free0 (_tmp91_);
+#line 8013 "ImportPage.c"
}
#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, TRUE);
-#line 8056 "ImportPage.c"
+#line 8017 "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 8062 "ImportPage.c"
+#line 8023 "ImportPage.c"
}
#line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = self->priv->refresh_result;
+ _tmp92_ = self->priv->refresh_result;
#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- switch (_tmp94_) {
+ switch (_tmp92_) {
#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_OK:
-#line 8072 "ImportPage.c"
+#line 8033 "ImportPage.c"
{
#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_OK;
@@ -8080,11 +8041,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 8080 "ImportPage.c"
+#line 8041 "ImportPage.c"
}
#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_ERROR_IO_LOCK:
-#line 8084 "ImportPage.c"
+#line 8045 "ImportPage.c"
{
#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
@@ -8092,7 +8053,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 8092 "ImportPage.c"
+#line 8053 "ImportPage.c"
}
default:
{
@@ -8102,159 +8063,159 @@ 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 8102 "ImportPage.c"
+#line 8063 "ImportPage.c"
}
}
#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_list);
-#line 8107 "ImportPage.c"
+#line 8068 "ImportPage.c"
}
static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
- glong _tmp0_ = 0L;
- gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp0_;
+ gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 8125 "ImportPage.c"
+#line 8086 "ImportPage.c"
}
static gchar* string_slice (const gchar* self, glong start, glong end) {
gchar* result = NULL;
glong string_length = 0L;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- glong _tmp2_ = 0L;
- glong _tmp5_ = 0L;
+ gint _tmp0_;
+ gint _tmp1_;
+ glong _tmp2_;
+ glong _tmp5_;
gboolean _tmp8_ = FALSE;
- glong _tmp9_ = 0L;
+ glong _tmp9_;
gboolean _tmp12_ = FALSE;
- glong _tmp13_ = 0L;
- glong _tmp16_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp13_;
+ glong _tmp16_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
-#line 8158 "ImportPage.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8119 "ImportPage.c"
+ glong _tmp3_;
+ glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
-#line 8167 "ImportPage.c"
+#line 8128 "ImportPage.c"
}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
-#line 8173 "ImportPage.c"
- glong _tmp6_ = 0L;
- glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8134 "ImportPage.c"
+ glong _tmp6_;
+ glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
-#line 8182 "ImportPage.c"
+#line 8143 "ImportPage.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
-#line 8188 "ImportPage.c"
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8149 "ImportPage.c"
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8197 "ImportPage.c"
+#line 8158 "ImportPage.c"
} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
-#line 8201 "ImportPage.c"
+#line 8162 "ImportPage.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
-#line 8209 "ImportPage.c"
- glong _tmp14_ = 0L;
- glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8170 "ImportPage.c"
+ glong _tmp14_;
+ glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8218 "ImportPage.c"
+#line 8179 "ImportPage.c"
} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 8222 "ImportPage.c"
+#line 8183 "ImportPage.c"
}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 8244 "ImportPage.c"
+#line 8205 "ImportPage.c"
}
static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
gchar* result = NULL;
glong offset = 0L;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gchar* _tmp12_ = NULL;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gchar* _tmp12_;
#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8267,13 +8228,13 @@ 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 8267 "ImportPage.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- const gchar* _tmp5_ = NULL;
- glong _tmp6_ = 0L;
- gchar _tmp7_ = '\0';
- gchar _tmp8_ = '\0';
+#line 8228 "ImportPage.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ const gchar* _tmp5_;
+ glong _tmp6_;
+ gchar _tmp7_;
+ gchar _tmp8_;
#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = offset;
#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8284,7 +8245,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 8284 "ImportPage.c"
+#line 8245 "ImportPage.c"
}
#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = str;
@@ -8296,10 +8257,10 @@ 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 8296 "ImportPage.c"
- const gchar* _tmp9_ = NULL;
- glong _tmp10_ = 0L;
- gchar* _tmp11_ = NULL;
+#line 8257 "ImportPage.c"
+ const gchar* _tmp9_;
+ glong _tmp10_;
+ gchar* _tmp11_;
#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = str;
#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8310,7 +8271,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 8310 "ImportPage.c"
+#line 8271 "ImportPage.c"
}
}
#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8319,15 +8280,15 @@ 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 8319 "ImportPage.c"
+#line 8280 "ImportPage.c"
}
gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (basepath != NULL, NULL);
#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8338,30 +8299,30 @@ 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 8338 "ImportPage.c"
- const gchar* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 8299 "ImportPage.c"
+ const gchar* _tmp3_;
+ gboolean _tmp4_;
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = addition;
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = g_str_has_prefix (_tmp3_, "/");
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = !_tmp4_;
-#line 8347 "ImportPage.c"
+#line 8308 "ImportPage.c"
} else {
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 8351 "ImportPage.c"
+#line 8312 "ImportPage.c"
}
#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 8355 "ImportPage.c"
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
+#line 8316 "ImportPage.c"
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = basepath;
#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8380,41 +8341,41 @@ 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 8380 "ImportPage.c"
+#line 8341 "ImportPage.c"
} else {
gboolean _tmp11_ = FALSE;
- const gchar* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+ const gchar* _tmp12_;
+ gboolean _tmp13_;
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp12_ = basepath;
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = g_str_has_suffix (_tmp12_, "/");
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp13_) {
-#line 8391 "ImportPage.c"
- const gchar* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+#line 8352 "ImportPage.c"
+ const gchar* _tmp14_;
+ gboolean _tmp15_;
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = addition;
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = g_str_has_prefix (_tmp14_, "/");
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = _tmp15_;
-#line 8400 "ImportPage.c"
+#line 8361 "ImportPage.c"
} else {
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = FALSE;
-#line 8404 "ImportPage.c"
+#line 8365 "ImportPage.c"
}
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp11_) {
-#line 8408 "ImportPage.c"
- const gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
+#line 8369 "ImportPage.c"
+ const gchar* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ const gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = basepath;
#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8433,11 +8394,11 @@ 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 8433 "ImportPage.c"
+#line 8394 "ImportPage.c"
} else {
- const gchar* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
+ const gchar* _tmp22_;
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = basepath;
#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8448,7 +8409,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 8448 "ImportPage.c"
+#line 8409 "ImportPage.c"
}
}
}
@@ -8459,21 +8420,21 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
CameraStorageInformation* sifs = NULL;
gint count = 0;
int res = 0;
- Camera* _tmp0_ = NULL;
- GPContextWrapper* _tmp1_ = NULL;
- GPContext* _tmp2_ = NULL;
+ Camera* _tmp0_;
+ GPContextWrapper* _tmp1_;
+ GPContext* _tmp2_;
gint _tmp3_ = 0;
- int _tmp4_ = 0;
- int _tmp5_ = 0;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+ int _tmp4_;
+ int _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
CameraStorageInformation* ifs = NULL;
- CameraStorageInformation* _tmp8_ = NULL;
- gint _tmp9_ = 0;
+ CameraStorageInformation* _tmp8_;
+ gint _tmp9_;
const gchar* _tmp10_ = NULL;
- CameraStorageInformation* _tmp11_ = NULL;
- CameraStorageInfoFields _tmp12_ = 0;
- gchar* _tmp15_ = NULL;
+ CameraStorageInformation* _tmp11_;
+ CameraStorageInfoFields _tmp12_;
+ gchar* _tmp15_;
#line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8500,7 +8461,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 8500 "ImportPage.c"
+#line 8461 "ImportPage.c"
}
#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = fsid;
@@ -8512,7 +8473,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 8512 "ImportPage.c"
+#line 8473 "ImportPage.c"
}
#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = sifs;
@@ -8526,20 +8487,20 @@ 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 8526 "ImportPage.c"
- CameraStorageInformation* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
+#line 8487 "ImportPage.c"
+ CameraStorageInformation* _tmp13_;
+ const gchar* _tmp14_;
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = ifs;
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = (*_tmp13_).basedir;
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = _tmp14_;
-#line 8535 "ImportPage.c"
+#line 8496 "ImportPage.c"
} else {
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = "/";
-#line 8539 "ImportPage.c"
+#line 8500 "ImportPage.c"
}
#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp15_ = g_strdup (_tmp10_);
@@ -8547,23 +8508,23 @@ 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 8547 "ImportPage.c"
+#line 8508 "ImportPage.c"
}
gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint fsid, const gchar* folder) {
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ const gchar* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
gchar* basedir = NULL;
- Camera* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- const gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ Camera* _tmp3_;
+ gint _tmp4_;
+ gchar* _tmp5_;
+ const gchar* _tmp6_;
+ const gchar* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8582,7 +8543,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 8582 "ImportPage.c"
+#line 8543 "ImportPage.c"
}
#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = camera;
@@ -8596,11 +8557,11 @@ 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 8596 "ImportPage.c"
- const gchar* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- const gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
+#line 8557 "ImportPage.c"
+ const gchar* _tmp7_;
+ gint _tmp8_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp7_ = camera_name;
#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8617,7 +8578,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 8617 "ImportPage.c"
+#line 8578 "ImportPage.c"
}
#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp11_ = basedir;
@@ -8631,41 +8592,41 @@ 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 8631 "ImportPage.c"
+#line 8592 "ImportPage.c"
}
static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list) {
gboolean result = FALSE;
gchar* fulldir = NULL;
- Camera* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ Camera* _tmp0_;
+ const gchar* _tmp1_;
+ gint _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ const gchar* _tmp5_;
CameraList* files = NULL;
CameraList* _tmp7_ = NULL;
- int _tmp8_ = 0;
- int _tmp9_ = 0;
- Camera* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- CameraList* _tmp15_ = NULL;
- GPSpinIdleWrapper* _tmp16_ = NULL;
- GPContext* _tmp17_ = NULL;
- int _tmp18_ = 0;
- int _tmp19_ = 0;
+ int _tmp8_;
+ int _tmp9_;
+ Camera* _tmp13_;
+ const gchar* _tmp14_;
+ CameraList* _tmp15_;
+ GPSpinIdleWrapper* _tmp16_;
+ GPContext* _tmp17_;
+ int _tmp18_;
+ int _tmp19_;
CameraList* folders = NULL;
CameraList* _tmp110_ = NULL;
- int _tmp111_ = 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;
+ int _tmp111_;
+ int _tmp112_;
+ Camera* _tmp116_;
+ const gchar* _tmp117_;
+ CameraList* _tmp118_;
+ GPSpinIdleWrapper* _tmp119_;
+ GPContext* _tmp120_;
+ int _tmp121_;
+ int _tmp122_;
GError * _inner_error_ = NULL;
#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
@@ -8689,8 +8650,8 @@ 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 8689 "ImportPage.c"
- const gchar* _tmp6_ = NULL;
+#line 8650 "ImportPage.c"
+ const gchar* _tmp6_;
#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = dir;
#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8701,7 +8662,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 8701 "ImportPage.c"
+#line 8662 "ImportPage.c"
}
#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = gp_list_new (&_tmp7_);
@@ -8715,10 +8676,10 @@ 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 8715 "ImportPage.c"
- int _tmp10_ = 0;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
+#line 8676 "ImportPage.c"
+ int _tmp10_;
+ gchar* _tmp11_;
+ gchar* _tmp12_;
#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp10_ = self->priv->refresh_result;
#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8737,7 +8698,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 8737 "ImportPage.c"
+#line 8698 "ImportPage.c"
}
#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = self->priv->camera;
@@ -8757,11 +8718,11 @@ 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 8757 "ImportPage.c"
- const gchar* _tmp20_ = NULL;
- int _tmp21_ = 0;
- gchar* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
+#line 8718 "ImportPage.c"
+ const gchar* _tmp20_;
+ int _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = fulldir;
#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8784,39 +8745,39 @@ 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 8784 "ImportPage.c"
+#line 8745 "ImportPage.c"
}
{
gint ctr = 0;
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 8790 "ImportPage.c"
+#line 8751 "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 8797 "ImportPage.c"
- gint _tmp26_ = 0;
- CameraList* _tmp27_ = NULL;
- gint _tmp28_ = 0;
+#line 8758 "ImportPage.c"
+ gint _tmp26_;
+ CameraList* _tmp27_;
+ gint _tmp28_;
gchar* filename = NULL;
- CameraList* _tmp29_ = NULL;
- gint _tmp30_ = 0;
+ CameraList* _tmp29_;
+ gint _tmp30_;
const gchar* _tmp31_ = NULL;
- int _tmp32_ = 0;
- gchar* _tmp33_ = NULL;
- int _tmp34_ = 0;
+ int _tmp32_;
+ gchar* _tmp33_;
+ int _tmp34_;
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp24_) {
-#line 8810 "ImportPage.c"
- gint _tmp25_ = 0;
+#line 8771 "ImportPage.c"
+ gint _tmp25_;
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp25_ = ctr;
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = _tmp25_ + 1;
-#line 8816 "ImportPage.c"
+#line 8777 "ImportPage.c"
}
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = FALSE;
@@ -8830,7 +8791,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 8830 "ImportPage.c"
+#line 8791 "ImportPage.c"
}
#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = files;
@@ -8850,12 +8811,12 @@ 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 8850 "ImportPage.c"
- gint _tmp35_ = 0;
- const gchar* _tmp36_ = NULL;
- int _tmp37_ = 0;
- gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
+#line 8811 "ImportPage.c"
+ gint _tmp35_;
+ const gchar* _tmp36_;
+ int _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp35_ = ctr;
#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8880,24 +8841,24 @@ 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 8880 "ImportPage.c"
+#line 8841 "ImportPage.c"
}
{
CameraFileInfo info = {0};
gboolean _tmp40_ = FALSE;
- GPSpinIdleWrapper* _tmp41_ = NULL;
- GPContext* _tmp42_ = NULL;
- Camera* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
- const gchar* _tmp45_ = NULL;
+ GPSpinIdleWrapper* _tmp41_;
+ GPContext* _tmp42_;
+ Camera* _tmp43_;
+ const gchar* _tmp44_;
+ const gchar* _tmp45_;
CameraFileInfo _tmp46_ = {0};
- gboolean _tmp47_ = FALSE;
- CameraFileInfo _tmp50_ = {0};
- CameraFileInfoFile _tmp51_ = {0};
- CameraFileInfoFields _tmp52_ = 0;
- const gchar* _tmp58_ = NULL;
- gboolean _tmp59_ = FALSE;
- GtkProgressBar* _tmp102_ = NULL;
+ gboolean _tmp47_;
+ CameraFileInfo _tmp50_;
+ CameraFileInfoFile _tmp51_;
+ CameraFileInfoFields _tmp52_;
+ const gchar* _tmp58_;
+ gboolean _tmp59_;
+ GtkProgressBar* _tmp102_;
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = import_page_spin_idle_context;
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8920,14 +8881,14 @@ 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 8920 "ImportPage.c"
- goto __catch67_g_error;
+#line 8881 "ImportPage.c"
+ goto __catch68_g_error;
}
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp40_) {
-#line 8925 "ImportPage.c"
- const gchar* _tmp48_ = NULL;
- const gchar* _tmp49_ = NULL;
+#line 8886 "ImportPage.c"
+ const gchar* _tmp48_;
+ const gchar* _tmp49_;
#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp48_ = fulldir;
#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8940,7 +8901,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 8940 "ImportPage.c"
+#line 8901 "ImportPage.c"
}
#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = info;
@@ -8950,12 +8911,12 @@ 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 8950 "ImportPage.c"
- const gchar* _tmp53_ = NULL;
- const gchar* _tmp54_ = NULL;
- CameraFileInfo _tmp55_ = {0};
- CameraFileInfoFile _tmp56_ = {0};
- CameraFileInfoFields _tmp57_ = 0;
+#line 8911 "ImportPage.c"
+ const gchar* _tmp53_;
+ const gchar* _tmp54_;
+ CameraFileInfo _tmp55_;
+ CameraFileInfoFile _tmp56_;
+ CameraFileInfoFields _tmp57_;
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp53_ = fulldir;
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8974,7 +8935,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 8974 "ImportPage.c"
+#line 8935 "ImportPage.c"
}
#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp58_ = filename;
@@ -8982,22 +8943,22 @@ 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 8982 "ImportPage.c"
+#line 8943 "ImportPage.c"
VideoImportSource* video_source = NULL;
- const gchar* _tmp60_ = NULL;
- Camera* _tmp61_ = NULL;
- gint _tmp62_ = 0;
- const gchar* _tmp63_ = NULL;
- const gchar* _tmp64_ = NULL;
- CameraFileInfo _tmp65_ = {0};
- CameraFileInfoFile _tmp66_ = {0};
- gulong _tmp67_ = 0UL;
- CameraFileInfo _tmp68_ = {0};
- CameraFileInfoFile _tmp69_ = {0};
- time_t _tmp70_ = 0;
- VideoImportSource* _tmp71_ = NULL;
- GeeArrayList* _tmp72_ = NULL;
- VideoImportSource* _tmp73_ = NULL;
+ const gchar* _tmp60_;
+ Camera* _tmp61_;
+ gint _tmp62_;
+ const gchar* _tmp63_;
+ const gchar* _tmp64_;
+ CameraFileInfo _tmp65_;
+ CameraFileInfoFile _tmp66_;
+ gulong _tmp67_;
+ CameraFileInfo _tmp68_;
+ CameraFileInfoFile _tmp69_;
+ time_t _tmp70_;
+ VideoImportSource* _tmp71_;
+ GeeArrayList* _tmp72_;
+ VideoImportSource* _tmp73_;
#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp60_ = self->priv->camera_name;
#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9032,29 +8993,29 @@ 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 9032 "ImportPage.c"
+#line 8993 "ImportPage.c"
} else {
PhotoFileFormat file_format = 0;
- CameraFileInfo _tmp74_ = {0};
- CameraFileInfoFile _tmp75_ = {0};
- const gchar* _tmp76_ = NULL;
- PhotoFileFormat _tmp77_ = 0;
- PhotoFileFormat _tmp78_ = 0;
- GeeArrayList* _tmp87_ = NULL;
- const gchar* _tmp88_ = NULL;
- Camera* _tmp89_ = NULL;
- gint _tmp90_ = 0;
- const gchar* _tmp91_ = NULL;
- const gchar* _tmp92_ = NULL;
- CameraFileInfo _tmp93_ = {0};
- CameraFileInfoFile _tmp94_ = {0};
- gulong _tmp95_ = 0UL;
- CameraFileInfo _tmp96_ = {0};
- CameraFileInfoFile _tmp97_ = {0};
- time_t _tmp98_ = 0;
- PhotoFileFormat _tmp99_ = 0;
- PhotoImportSource* _tmp100_ = NULL;
- PhotoImportSource* _tmp101_ = NULL;
+ CameraFileInfo _tmp74_;
+ CameraFileInfoFile _tmp75_;
+ const gchar* _tmp76_;
+ PhotoFileFormat _tmp77_;
+ PhotoFileFormat _tmp78_;
+ GeeArrayList* _tmp87_;
+ const gchar* _tmp88_;
+ Camera* _tmp89_;
+ gint _tmp90_;
+ const gchar* _tmp91_;
+ const gchar* _tmp92_;
+ CameraFileInfo _tmp93_;
+ CameraFileInfoFile _tmp94_;
+ gulong _tmp95_;
+ CameraFileInfo _tmp96_;
+ CameraFileInfoFile _tmp97_;
+ time_t _tmp98_;
+ PhotoFileFormat _tmp99_;
+ PhotoImportSource* _tmp100_;
+ PhotoImportSource* _tmp101_;
#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp74_ = info;
#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9069,10 +9030,10 @@ 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 9069 "ImportPage.c"
- const gchar* _tmp79_ = NULL;
- PhotoFileFormat _tmp80_ = 0;
- PhotoFileFormat _tmp81_ = 0;
+#line 9030 "ImportPage.c"
+ const gchar* _tmp79_;
+ PhotoFileFormat _tmp80_;
+ PhotoFileFormat _tmp81_;
#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp79_ = filename;
#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9083,12 +9044,12 @@ 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 9083 "ImportPage.c"
- const gchar* _tmp82_ = NULL;
- const gchar* _tmp83_ = NULL;
- CameraFileInfo _tmp84_ = {0};
- CameraFileInfoFile _tmp85_ = {0};
- const gchar* _tmp86_ = NULL;
+#line 9044 "ImportPage.c"
+ const gchar* _tmp82_;
+ const gchar* _tmp83_;
+ CameraFileInfo _tmp84_;
+ CameraFileInfoFile _tmp85_;
+ const gchar* _tmp86_;
#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp82_ = fulldir;
#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9108,7 +9069,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 9107 "ImportPage.c"
+#line 9068 "ImportPage.c"
}
}
#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9145,7 +9106,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 9144 "ImportPage.c"
+#line 9105 "ImportPage.c"
}
#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp102_ = self->priv->progress_bar;
@@ -9155,18 +9116,18 @@ 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 9154 "ImportPage.c"
+#line 9115 "ImportPage.c"
}
- goto __finally67;
- __catch67_g_error:
+ goto __finally68;
+ __catch68_g_error:
{
GError* err = NULL;
- const gchar* _tmp103_ = NULL;
- GError* _tmp104_ = NULL;
- const gchar* _tmp105_ = NULL;
- GError* _tmp106_ = NULL;
- const gchar* _tmp107_ = NULL;
- gchar* _tmp108_ = NULL;
+ const gchar* _tmp103_;
+ GError* _tmp104_;
+ const gchar* _tmp105_;
+ GError* _tmp106_;
+ const gchar* _tmp107_;
+ gchar* _tmp108_;
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9201,12 +9162,12 @@ 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 9200 "ImportPage.c"
+#line 9161 "ImportPage.c"
}
- __finally67:
+ __finally68:
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9205 "ImportPage.c"
+#line 9166 "ImportPage.c"
gboolean _tmp109_ = FALSE;
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
@@ -9220,11 +9181,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
g_clear_error (&_inner_error_);
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp109_;
-#line 9219 "ImportPage.c"
+#line 9180 "ImportPage.c"
}
#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 9223 "ImportPage.c"
+#line 9184 "ImportPage.c"
}
}
}
@@ -9240,10 +9201,10 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp112_ = self->priv->refresh_result;
#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp112_ != GP_OK) {
-#line 9239 "ImportPage.c"
- int _tmp113_ = 0;
- gchar* _tmp114_ = NULL;
- gchar* _tmp115_ = NULL;
+#line 9200 "ImportPage.c"
+ int _tmp113_;
+ gchar* _tmp114_;
+ gchar* _tmp115_;
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp113_ = self->priv->refresh_result;
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9264,7 +9225,7 @@ 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 9263 "ImportPage.c"
+#line 9224 "ImportPage.c"
}
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp116_ = self->priv->camera;
@@ -9284,11 +9245,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp122_ = self->priv->refresh_result;
#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp122_ != GP_OK) {
-#line 9283 "ImportPage.c"
- const gchar* _tmp123_ = NULL;
- int _tmp124_ = 0;
- gchar* _tmp125_ = NULL;
- gchar* _tmp126_ = NULL;
+#line 9244 "ImportPage.c"
+ const gchar* _tmp123_;
+ int _tmp124_;
+ gchar* _tmp125_;
+ gchar* _tmp126_;
#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp123_ = fulldir;
#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9313,47 +9274,47 @@ 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 9312 "ImportPage.c"
+#line 9273 "ImportPage.c"
}
{
gint ctr = 0;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 9318 "ImportPage.c"
+#line 9279 "ImportPage.c"
{
gboolean _tmp127_ = FALSE;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp127_ = TRUE;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9325 "ImportPage.c"
- gint _tmp129_ = 0;
- CameraList* _tmp130_ = NULL;
- gint _tmp131_ = 0;
+#line 9286 "ImportPage.c"
+ gint _tmp129_;
+ CameraList* _tmp130_;
+ gint _tmp131_;
gchar* subdir = NULL;
- CameraList* _tmp132_ = NULL;
- gint _tmp133_ = 0;
+ CameraList* _tmp132_;
+ gint _tmp133_;
const gchar* _tmp134_ = NULL;
- int _tmp135_ = 0;
- gchar* _tmp136_ = NULL;
- int _tmp137_ = 0;
- gint _tmp142_ = 0;
- const gchar* _tmp143_ = NULL;
- const gchar* _tmp144_ = NULL;
- gchar* _tmp145_ = NULL;
- gchar* _tmp146_ = NULL;
- GeeArrayList* _tmp147_ = NULL;
- gboolean _tmp148_ = FALSE;
- gboolean _tmp149_ = FALSE;
+ int _tmp135_;
+ gchar* _tmp136_;
+ int _tmp137_;
+ gint _tmp142_;
+ const gchar* _tmp143_;
+ const gchar* _tmp144_;
+ gchar* _tmp145_;
+ gchar* _tmp146_;
+ GeeArrayList* _tmp147_;
+ gboolean _tmp148_;
+ gboolean _tmp149_;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp127_) {
-#line 9346 "ImportPage.c"
- gint _tmp128_ = 0;
+#line 9307 "ImportPage.c"
+ gint _tmp128_;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp128_ = ctr;
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = _tmp128_ + 1;
-#line 9352 "ImportPage.c"
+#line 9313 "ImportPage.c"
}
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp127_ = FALSE;
@@ -9367,7 +9328,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
if (!(_tmp129_ < _tmp131_)) {
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9366 "ImportPage.c"
+#line 9327 "ImportPage.c"
}
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp132_ = folders;
@@ -9387,11 +9348,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_tmp137_ = self->priv->refresh_result;
#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp137_ != GP_OK) {
-#line 9386 "ImportPage.c"
- gint _tmp138_ = 0;
- int _tmp139_ = 0;
- gchar* _tmp140_ = NULL;
- gchar* _tmp141_ = NULL;
+#line 9347 "ImportPage.c"
+ gint _tmp138_;
+ int _tmp139_;
+ gchar* _tmp140_;
+ gchar* _tmp141_;
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp138_ = ctr;
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9416,7 +9377,7 @@ 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 9415 "ImportPage.c"
+#line 9376 "ImportPage.c"
}
#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp142_ = fsid;
@@ -9450,11 +9411,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 9449 "ImportPage.c"
+#line 9410 "ImportPage.c"
}
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
-#line 9453 "ImportPage.c"
+#line 9414 "ImportPage.c"
}
}
}
@@ -9468,7 +9429,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 9467 "ImportPage.c"
+#line 9428 "ImportPage.c"
}
@@ -9477,51 +9438,51 @@ 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 9476 "ImportPage.c"
+#line 9437 "ImportPage.c"
{
gint i = 0;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
i = 0;
-#line 9481 "ImportPage.c"
+#line 9442 "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 9488 "ImportPage.c"
- gint _tmp2_ = 0;
- GeeArrayList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+#line 9449 "ImportPage.c"
+ gint _tmp2_;
+ GeeArrayList* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
PhotoImportSource* current = NULL;
- GeeArrayList* _tmp6_ = NULL;
- gint _tmp7_ = 0;
- gpointer _tmp8_ = NULL;
- ImportSource* _tmp9_ = NULL;
- PhotoImportSource* _tmp10_ = NULL;
+ GeeArrayList* _tmp6_;
+ gint _tmp7_;
+ gpointer _tmp8_;
+ ImportSource* _tmp9_;
+ PhotoImportSource* _tmp10_;
PhotoImportSource* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- GeeArrayList* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
+ gint _tmp12_;
+ GeeArrayList* _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
PhotoImportSource* next = NULL;
- PhotoImportSource* _tmp21_ = NULL;
+ PhotoImportSource* _tmp21_;
PhotoImportSource* _tmp22_ = NULL;
- gint _tmp23_ = 0;
+ gint _tmp23_;
PhotoImportSource* prev = NULL;
- PhotoImportSource* _tmp29_ = NULL;
+ PhotoImportSource* _tmp29_;
gboolean _tmp30_ = FALSE;
- PhotoImportSource* _tmp31_ = NULL;
+ PhotoImportSource* _tmp31_;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp0_) {
-#line 9514 "ImportPage.c"
- gint _tmp1_ = 0;
+#line 9475 "ImportPage.c"
+ gint _tmp1_;
#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 9520 "ImportPage.c"
+#line 9481 "ImportPage.c"
}
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
@@ -9537,7 +9498,7 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
if (!(_tmp2_ < _tmp5_)) {
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9536 "ImportPage.c"
+#line 9497 "ImportPage.c"
}
#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = import_list;
@@ -9553,7 +9514,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 9552 "ImportPage.c"
+#line 9513 "ImportPage.c"
}
#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
current = _tmp10_;
@@ -9567,12 +9528,12 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_tmp15_ = _tmp14_;
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if ((_tmp12_ + 1) < _tmp15_) {
-#line 9566 "ImportPage.c"
- GeeArrayList* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gpointer _tmp18_ = NULL;
- ImportSource* _tmp19_ = NULL;
- PhotoImportSource* _tmp20_ = NULL;
+#line 9527 "ImportPage.c"
+ GeeArrayList* _tmp16_;
+ gint _tmp17_;
+ gpointer _tmp18_;
+ ImportSource* _tmp19_;
+ PhotoImportSource* _tmp20_;
#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = import_list;
#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9587,19 +9548,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 9586 "ImportPage.c"
+#line 9547 "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 9592 "ImportPage.c"
+#line 9553 "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 9598 "ImportPage.c"
+#line 9559 "ImportPage.c"
}
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = _g_object_ref0 (_tmp11_);
@@ -9609,12 +9570,12 @@ 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 9608 "ImportPage.c"
- GeeArrayList* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gpointer _tmp26_ = NULL;
- ImportSource* _tmp27_ = NULL;
- PhotoImportSource* _tmp28_ = NULL;
+#line 9569 "ImportPage.c"
+ GeeArrayList* _tmp24_;
+ gint _tmp25_;
+ gpointer _tmp26_;
+ ImportSource* _tmp27_;
+ PhotoImportSource* _tmp28_;
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = import_list;
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9629,19 +9590,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 9628 "ImportPage.c"
+#line 9589 "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 9634 "ImportPage.c"
+#line 9595 "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 9640 "ImportPage.c"
+#line 9601 "ImportPage.c"
}
#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -9651,37 +9612,37 @@ 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 9650 "ImportPage.c"
- PhotoImportSource* _tmp32_ = NULL;
- PhotoFileFormat _tmp33_ = 0;
+#line 9611 "ImportPage.c"
+ PhotoImportSource* _tmp32_;
+ PhotoFileFormat _tmp33_;
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp32_ = current;
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = photo_import_source_get_file_format (_tmp32_);
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9659 "ImportPage.c"
+#line 9620 "ImportPage.c"
} else {
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp30_ = FALSE;
-#line 9663 "ImportPage.c"
+#line 9624 "ImportPage.c"
}
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp30_) {
-#line 9667 "ImportPage.c"
+#line 9628 "ImportPage.c"
gchar* current_name = NULL;
gchar* ext = NULL;
- PhotoImportSource* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- gchar* _tmp36_ = NULL;
+ PhotoImportSource* _tmp34_;
+ gchar* _tmp35_;
+ gchar* _tmp36_;
gchar* _tmp37_ = NULL;
gchar* _tmp38_ = NULL;
PhotoImportSource* associated = NULL;
gboolean _tmp39_ = FALSE;
- PhotoImportSource* _tmp40_ = NULL;
+ PhotoImportSource* _tmp40_;
gboolean _tmp52_ = FALSE;
- PhotoImportSource* _tmp53_ = NULL;
- PhotoImportSource* _tmp65_ = NULL;
+ PhotoImportSource* _tmp53_;
+ PhotoImportSource* _tmp65_;
#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp34_ = current;
#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9706,32 +9667,32 @@ 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 9705 "ImportPage.c"
- PhotoImportSource* _tmp41_ = NULL;
- PhotoFileFormat _tmp42_ = 0;
+#line 9666 "ImportPage.c"
+ PhotoImportSource* _tmp41_;
+ PhotoFileFormat _tmp42_;
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp41_ = next;
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = photo_import_source_get_file_format (_tmp41_);
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9714 "ImportPage.c"
+#line 9675 "ImportPage.c"
} else {
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp39_ = FALSE;
-#line 9718 "ImportPage.c"
+#line 9679 "ImportPage.c"
}
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp39_) {
-#line 9722 "ImportPage.c"
+#line 9683 "ImportPage.c"
gchar* next_name = NULL;
- PhotoImportSource* _tmp43_ = NULL;
- gchar* _tmp44_ = NULL;
- gchar* _tmp45_ = NULL;
+ PhotoImportSource* _tmp43_;
+ gchar* _tmp44_;
+ gchar* _tmp45_;
gchar* _tmp46_ = NULL;
gchar* _tmp47_ = NULL;
- const gchar* _tmp48_ = NULL;
- const gchar* _tmp49_ = NULL;
+ const gchar* _tmp48_;
+ const gchar* _tmp49_;
#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = next;
#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9756,9 +9717,9 @@ 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 9755 "ImportPage.c"
- PhotoImportSource* _tmp50_ = NULL;
- PhotoImportSource* _tmp51_ = NULL;
+#line 9716 "ImportPage.c"
+ PhotoImportSource* _tmp50_;
+ PhotoImportSource* _tmp51_;
#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp50_ = next;
#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9767,42 +9728,42 @@ 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 9766 "ImportPage.c"
+#line 9727 "ImportPage.c"
}
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (next_name);
-#line 9770 "ImportPage.c"
+#line 9731 "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 9776 "ImportPage.c"
- PhotoImportSource* _tmp54_ = NULL;
- PhotoFileFormat _tmp55_ = 0;
+#line 9737 "ImportPage.c"
+ PhotoImportSource* _tmp54_;
+ PhotoFileFormat _tmp55_;
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp54_ = prev;
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp55_ = photo_import_source_get_file_format (_tmp54_);
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9785 "ImportPage.c"
+#line 9746 "ImportPage.c"
} else {
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp52_ = FALSE;
-#line 9789 "ImportPage.c"
+#line 9750 "ImportPage.c"
}
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp52_) {
-#line 9793 "ImportPage.c"
+#line 9754 "ImportPage.c"
gchar* prev_name = NULL;
- PhotoImportSource* _tmp56_ = NULL;
- gchar* _tmp57_ = NULL;
- gchar* _tmp58_ = NULL;
+ PhotoImportSource* _tmp56_;
+ gchar* _tmp57_;
+ gchar* _tmp58_;
gchar* _tmp59_ = NULL;
gchar* _tmp60_ = NULL;
- const gchar* _tmp61_ = NULL;
- const gchar* _tmp62_ = NULL;
+ const gchar* _tmp61_;
+ const gchar* _tmp62_;
#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp56_ = prev;
#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9827,9 +9788,9 @@ 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 9826 "ImportPage.c"
- PhotoImportSource* _tmp63_ = NULL;
- PhotoImportSource* _tmp64_ = NULL;
+#line 9787 "ImportPage.c"
+ PhotoImportSource* _tmp63_;
+ PhotoImportSource* _tmp64_;
#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp63_ = prev;
#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9838,28 +9799,28 @@ 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 9837 "ImportPage.c"
+#line 9798 "ImportPage.c"
}
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (prev_name);
-#line 9841 "ImportPage.c"
+#line 9802 "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 9847 "ImportPage.c"
- PhotoImportSource* _tmp66_ = NULL;
- gchar* _tmp67_ = NULL;
- gchar* _tmp68_ = NULL;
- PhotoImportSource* _tmp69_ = NULL;
- gchar* _tmp70_ = NULL;
- gchar* _tmp71_ = NULL;
- PhotoImportSource* _tmp72_ = NULL;
- PhotoImportSource* _tmp73_ = NULL;
- GeeArrayList* _tmp74_ = NULL;
- PhotoImportSource* _tmp75_ = NULL;
- gboolean _tmp76_ = FALSE;
+#line 9808 "ImportPage.c"
+ PhotoImportSource* _tmp66_;
+ gchar* _tmp67_;
+ gchar* _tmp68_;
+ PhotoImportSource* _tmp69_;
+ gchar* _tmp70_;
+ gchar* _tmp71_;
+ PhotoImportSource* _tmp72_;
+ PhotoImportSource* _tmp73_;
+ GeeArrayList* _tmp74_;
+ PhotoImportSource* _tmp75_;
+ gboolean _tmp76_;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp66_ = current;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9892,15 +9853,15 @@ 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 9891 "ImportPage.c"
- PhotoImportSource* _tmp77_ = NULL;
+#line 9852 "ImportPage.c"
+ PhotoImportSource* _tmp77_;
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_debug ("ImportPage.vala:1508: Unable to associate files");
#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp77_ = current;
#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source_set_associated (_tmp77_, NULL);
-#line 9899 "ImportPage.c"
+#line 9860 "ImportPage.c"
}
}
#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9909,7 +9870,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 9908 "ImportPage.c"
+#line 9869 "ImportPage.c"
}
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (prev);
@@ -9921,7 +9882,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 9920 "ImportPage.c"
+#line 9881 "ImportPage.c"
}
}
}
@@ -9937,15 +9898,15 @@ 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 9936 "ImportPage.c"
+#line 9897 "ImportPage.c"
{
GeeList* _import_source_list = NULL;
- GeeList* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ GeeList* _tmp0_;
+ GeeList* _tmp1_;
gint _import_source_size = 0;
- GeeList* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ GeeList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
gint _import_source_index = 0;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = import_list;
@@ -9965,57 +9926,56 @@ 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 9964 "ImportPage.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+#line 9925 "ImportPage.c"
+ gint _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
ImportSource* import_source = NULL;
- GeeList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gpointer _tmp10_ = NULL;
+ GeeList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
gchar* filename = NULL;
- ImportSource* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
+ ImportSource* _tmp11_;
+ gchar* _tmp12_;
gchar* fulldir = NULL;
- ImportSource* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
+ ImportSource* _tmp13_;
+ gchar* _tmp14_;
+ const gchar* _tmp15_;
PhotoImportSource* associated = NULL;
gboolean _tmp19_ = FALSE;
- ImportSource* _tmp20_ = NULL;
- GtkProgressBar* _tmp26_ = NULL;
- GtkProgressBar* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- ImportSource* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
+ ImportSource* _tmp20_;
+ GtkProgressBar* _tmp26_;
+ GtkProgressBar* _tmp27_;
+ ImportSource* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
PhotoMetadata* metadata = NULL;
- const gchar* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
+ const gchar* _tmp33_;
+ gboolean _tmp34_;
gchar* exif_only_md5 = NULL;
- PhotoMetadata* _tmp48_ = NULL;
+ PhotoMetadata* _tmp47_;
guint8* preview_raw = NULL;
- gint preview_raw_length1 = 0;
- gint _preview_raw_size_ = 0;
+ gint preview_raw_length1;
+ gint _preview_raw_size_;
gsize preview_raw_length = 0UL;
GdkPixbuf* preview = NULL;
gchar* preview_md5 = NULL;
+ gboolean _tmp83_ = FALSE;
gboolean _tmp84_ = FALSE;
- gboolean _tmp85_ = FALSE;
- GdkPixbuf* _tmp86_ = NULL;
- ImportSource* _tmp92_ = NULL;
- ImportSource* _tmp95_ = NULL;
- PhotoImportSource* _tmp101_ = NULL;
- SourceCollection* _tmp125_ = NULL;
- ImportSource* _tmp126_ = NULL;
- GtkProgressBar* _tmp127_ = NULL;
- gint _tmp128_ = 0;
- gint _tmp129_ = 0;
- GeeList* _tmp130_ = NULL;
- gint _tmp131_ = 0;
- gint _tmp132_ = 0;
+ GdkPixbuf* _tmp85_;
+ ImportSource* _tmp91_;
+ ImportSource* _tmp94_;
+ PhotoImportSource* _tmp100_;
+ SourceCollection* _tmp124_;
+ ImportSource* _tmp125_;
+ GtkProgressBar* _tmp126_;
+ gint _tmp127_;
+ gint _tmp128_;
+ GeeList* _tmp129_;
+ gint _tmp130_;
+ gint _tmp131_;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _import_source_index;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10028,7 +9988,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 10027 "ImportPage.c"
+#line 9987 "ImportPage.c"
}
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = _import_source_list;
@@ -10054,10 +10014,10 @@ 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 10053 "ImportPage.c"
- ImportSource* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
+#line 10013 "ImportPage.c"
+ ImportSource* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp16_ = import_source;
#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10077,7 +10037,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 10075 "ImportPage.c"
+#line 10035 "ImportPage.c"
}
#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = NULL;
@@ -10085,10 +10045,10 @@ 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 10083 "ImportPage.c"
- ImportSource* _tmp21_ = NULL;
- PhotoImportSource* _tmp22_ = NULL;
- PhotoImportSource* _tmp23_ = NULL;
+#line 10043 "ImportPage.c"
+ ImportSource* _tmp21_;
+ PhotoImportSource* _tmp22_;
+ PhotoImportSource* _tmp23_;
#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = import_source;
#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10099,17 +10059,17 @@ 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 10097 "ImportPage.c"
+#line 10057 "ImportPage.c"
} else {
#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = FALSE;
-#line 10101 "ImportPage.c"
+#line 10061 "ImportPage.c"
}
#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp19_) {
-#line 10105 "ImportPage.c"
- ImportSource* _tmp24_ = NULL;
- PhotoImportSource* _tmp25_ = NULL;
+#line 10065 "ImportPage.c"
+ ImportSource* _tmp24_;
+ PhotoImportSource* _tmp25_;
#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = import_source;
#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10118,7 +10078,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 10116 "ImportPage.c"
+#line 10076 "ImportPage.c"
}
#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->progress_bar;
@@ -10127,99 +10087,97 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = self->priv->progress_bar;
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = _ ("Fetching preview for %s");
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = import_source;
+ _tmp28_ = import_source;
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
+ _tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = _tmp30_;
+ _tmp30_ = _tmp29_;
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = g_strdup_printf (_tmp28_, _tmp31_);
+ _tmp31_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp30_);
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = _tmp32_;
+ _tmp32_ = _tmp31_;
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp27_, _tmp33_);
+ gtk_progress_bar_set_text (_tmp27_, _tmp32_);
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp33_);
+ _g_free0 (_tmp32_);
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp30_);
#line 1542 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
metadata = NULL;
#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = filename;
+ _tmp33_ = filename;
#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = video_reader_is_supported_video_filename (_tmp34_);
+ _tmp34_ = video_reader_is_supported_video_filename (_tmp33_);
#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp35_) {
-#line 10150 "ImportPage.c"
+ if (!_tmp34_) {
+#line 10108 "ImportPage.c"
{
- PhotoMetadata* _tmp36_ = NULL;
- GPSpinIdleWrapper* _tmp37_ = NULL;
- GPContext* _tmp38_ = NULL;
- Camera* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
- PhotoMetadata* _tmp42_ = NULL;
- PhotoMetadata* _tmp43_ = NULL;
+ PhotoMetadata* _tmp35_ = NULL;
+ GPSpinIdleWrapper* _tmp36_;
+ GPContext* _tmp37_;
+ Camera* _tmp38_;
+ const gchar* _tmp39_;
+ const gchar* _tmp40_;
+ PhotoMetadata* _tmp41_;
+ PhotoMetadata* _tmp42_;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = import_page_spin_idle_context;
+ _tmp36_ = import_page_spin_idle_context;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = self->priv->camera;
+ _tmp38_ = self->priv->camera;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = fulldir;
+ _tmp39_ = fulldir;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = filename;
+ _tmp40_ = filename;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = gp_load_metadata (_tmp38_, _tmp39_, _tmp40_, _tmp41_, &_inner_error_);
+ _tmp41_ = gp_load_metadata (_tmp37_, _tmp38_, _tmp39_, _tmp40_, &_inner_error_);
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp42_;
+ _tmp35_ = _tmp41_;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10176 "ImportPage.c"
- goto __catch68_g_error;
+#line 10134 "ImportPage.c"
+ goto __catch69_g_error;
}
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = _tmp36_;
+ _tmp42_ = _tmp35_;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = NULL;
+ _tmp35_ = NULL;
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (metadata);
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- metadata = _tmp43_;
+ metadata = _tmp42_;
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _media_metadata_unref0 (_tmp36_);
-#line 10189 "ImportPage.c"
+ _media_metadata_unref0 (_tmp35_);
+#line 10147 "ImportPage.c"
}
- goto __finally68;
- __catch68_g_error:
+ goto __finally69;
+ __catch69_g_error:
{
GError* err = NULL;
- const gchar* _tmp44_ = NULL;
- const gchar* _tmp45_ = NULL;
- GError* _tmp46_ = NULL;
- const gchar* _tmp47_ = NULL;
+ const gchar* _tmp43_;
+ const gchar* _tmp44_;
+ GError* _tmp45_;
+ const gchar* _tmp46_;
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = fulldir;
+ _tmp43_ = fulldir;
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = filename;
+ _tmp44_ = filename;
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = err;
+ _tmp45_ = err;
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = _tmp46_->message;
+ _tmp46_ = _tmp45_->message;
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
+ g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_);
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10215 "ImportPage.c"
+#line 10173 "ImportPage.c"
}
- __finally68:
+ __finally69:
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10240,83 +10198,83 @@ 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 10238 "ImportPage.c"
+#line 10196 "ImportPage.c"
}
}
#line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
exif_only_md5 = NULL;
#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = metadata;
+ _tmp47_ = metadata;
#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp48_ != NULL) {
-#line 10247 "ImportPage.c"
+ if (_tmp47_ != NULL) {
+#line 10205 "ImportPage.c"
guint8* flattened_sans_thumbnail = NULL;
- PhotoMetadata* _tmp49_ = NULL;
- gint _tmp50_ = 0;
- guint8* _tmp51_ = NULL;
- gint flattened_sans_thumbnail_length1 = 0;
- gint _flattened_sans_thumbnail_size_ = 0;
- gboolean _tmp52_ = FALSE;
- guint8* _tmp53_ = NULL;
- gint _tmp53__length1 = 0;
+ PhotoMetadata* _tmp48_;
+ gint _tmp49_;
+ guint8* _tmp50_;
+ gint flattened_sans_thumbnail_length1;
+ gint _flattened_sans_thumbnail_size_;
+ gboolean _tmp51_ = FALSE;
+ guint8* _tmp52_;
+ gint _tmp52__length1;
#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = metadata;
+ _tmp48_ = metadata;
#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = photo_metadata_flatten_exif (_tmp49_, FALSE, &_tmp50_);
+ _tmp50_ = photo_metadata_flatten_exif (_tmp48_, FALSE, &_tmp49_);
#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- flattened_sans_thumbnail = _tmp51_;
+ flattened_sans_thumbnail = _tmp50_;
#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- flattened_sans_thumbnail_length1 = _tmp50_;
+ flattened_sans_thumbnail_length1 = _tmp49_;
#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = flattened_sans_thumbnail;
+ _tmp52_ = flattened_sans_thumbnail;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53__length1 = flattened_sans_thumbnail_length1;
+ _tmp52__length1 = flattened_sans_thumbnail_length1;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp53_ != NULL) {
-#line 10273 "ImportPage.c"
- guint8* _tmp54_ = NULL;
- gint _tmp54__length1 = 0;
+ if (_tmp52_ != NULL) {
+#line 10231 "ImportPage.c"
+ guint8* _tmp53_;
+ gint _tmp53__length1;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = flattened_sans_thumbnail;
+ _tmp53_ = flattened_sans_thumbnail;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54__length1 = flattened_sans_thumbnail_length1;
+ _tmp53__length1 = flattened_sans_thumbnail_length1;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = _tmp54__length1 > 0;
-#line 10282 "ImportPage.c"
+ _tmp51_ = _tmp53__length1 > 0;
+#line 10240 "ImportPage.c"
} else {
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = FALSE;
-#line 10286 "ImportPage.c"
+ _tmp51_ = FALSE;
+#line 10244 "ImportPage.c"
}
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp52_) {
-#line 10290 "ImportPage.c"
- guint8* _tmp55_ = NULL;
- gint _tmp55__length1 = 0;
- guint8* _tmp56_ = NULL;
- gint _tmp56__length1 = 0;
- gchar* _tmp57_ = NULL;
+ if (_tmp51_) {
+#line 10248 "ImportPage.c"
+ guint8* _tmp54_;
+ gint _tmp54__length1;
+ guint8* _tmp55_;
+ gint _tmp55__length1;
+ gchar* _tmp56_;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = flattened_sans_thumbnail;
+ _tmp54_ = flattened_sans_thumbnail;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55__length1 = flattened_sans_thumbnail_length1;
+ _tmp54__length1 = flattened_sans_thumbnail_length1;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = flattened_sans_thumbnail;
+ _tmp55_ = flattened_sans_thumbnail;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56__length1 = flattened_sans_thumbnail_length1;
+ _tmp55__length1 = flattened_sans_thumbnail_length1;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1);
+ _tmp56_ = md5_binary (_tmp54_, (gsize) _tmp55__length1);
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (exif_only_md5);
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- exif_only_md5 = _tmp57_;
-#line 10310 "ImportPage.c"
+ exif_only_md5 = _tmp56_;
+#line 10268 "ImportPage.c"
}
#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10314 "ImportPage.c"
+#line 10272 "ImportPage.c"
}
#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_raw = NULL;
@@ -10328,152 +10286,152 @@ 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 10326 "ImportPage.c"
+#line 10284 "ImportPage.c"
{
gchar* preview_fulldir = NULL;
- const gchar* _tmp58_ = NULL;
- gchar* _tmp59_ = NULL;
+ const gchar* _tmp57_;
+ gchar* _tmp58_;
gchar* preview_filename = NULL;
- const gchar* _tmp60_ = NULL;
- gchar* _tmp61_ = NULL;
- PhotoImportSource* _tmp62_ = NULL;
- GdkPixbuf* _tmp67_ = NULL;
- GPSpinIdleWrapper* _tmp68_ = NULL;
- GPContext* _tmp69_ = NULL;
- Camera* _tmp70_ = NULL;
- const gchar* _tmp71_ = NULL;
- const gchar* _tmp72_ = NULL;
- guint8* _tmp73_ = NULL;
- gint _tmp74_ = 0;
- gsize _tmp75_ = 0UL;
- GdkPixbuf* _tmp76_ = NULL;
- GdkPixbuf* _tmp77_ = NULL;
+ const gchar* _tmp59_;
+ gchar* _tmp60_;
+ PhotoImportSource* _tmp61_;
+ GdkPixbuf* _tmp66_ = NULL;
+ GPSpinIdleWrapper* _tmp67_;
+ GPContext* _tmp68_;
+ Camera* _tmp69_;
+ const gchar* _tmp70_;
+ const gchar* _tmp71_;
+ guint8* _tmp72_ = NULL;
+ gint _tmp73_;
+ gsize _tmp74_ = 0UL;
+ GdkPixbuf* _tmp75_;
+ GdkPixbuf* _tmp76_;
#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = fulldir;
+ _tmp57_ = fulldir;
#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = g_strdup (_tmp58_);
+ _tmp58_ = g_strdup (_tmp57_);
#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_fulldir = _tmp59_;
+ preview_fulldir = _tmp58_;
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = filename;
+ _tmp59_ = filename;
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = g_strdup (_tmp60_);
+ _tmp60_ = g_strdup (_tmp59_);
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_filename = _tmp61_;
+ preview_filename = _tmp60_;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = associated;
+ _tmp61_ = associated;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp62_ != NULL) {
-#line 10362 "ImportPage.c"
- PhotoImportSource* _tmp63_ = NULL;
- gchar* _tmp64_ = NULL;
- PhotoImportSource* _tmp65_ = NULL;
- gchar* _tmp66_ = NULL;
+ if (_tmp61_ != NULL) {
+#line 10320 "ImportPage.c"
+ PhotoImportSource* _tmp62_;
+ gchar* _tmp63_;
+ PhotoImportSource* _tmp64_;
+ gchar* _tmp65_;
#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = associated;
+ _tmp62_ = associated;
#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp63_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_fulldir = _tmp64_;
+ preview_fulldir = _tmp63_;
#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = associated;
+ _tmp64_ = associated;
#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp65_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_filename = _tmp66_;
-#line 10383 "ImportPage.c"
+ preview_filename = _tmp65_;
+#line 10341 "ImportPage.c"
}
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = import_page_spin_idle_context;
+ _tmp67_ = import_page_spin_idle_context;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = self->priv->camera;
+ _tmp69_ = self->priv->camera;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = preview_fulldir;
+ _tmp70_ = preview_fulldir;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = preview_filename;
+ _tmp71_ = preview_filename;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = gp_load_preview (_tmp69_, _tmp70_, _tmp71_, _tmp72_, &_tmp73_, &_tmp74_, &_tmp75_, &_inner_error_);
+ _tmp75_ = gp_load_preview (_tmp68_, _tmp69_, _tmp70_, _tmp71_, &_tmp72_, &_tmp73_, &_tmp74_, &_inner_error_);
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_raw = (g_free (preview_raw), NULL);
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw = _tmp73_;
+ preview_raw = _tmp72_;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw_length1 = _tmp74_;
+ preview_raw_length1 = _tmp73_;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_preview_raw_size_ = preview_raw_length1;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_raw_length = _tmp75_;
+ preview_raw_length = _tmp74_;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = _tmp76_;
+ _tmp66_ = _tmp75_;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10415 "ImportPage.c"
- goto __catch69_g_error;
+#line 10373 "ImportPage.c"
+ goto __catch70_g_error;
}
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = _tmp67_;
+ _tmp76_ = _tmp66_;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = NULL;
+ _tmp66_ = NULL;
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview = _tmp77_;
+ preview = _tmp76_;
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp67_);
+ _g_object_unref0 (_tmp66_);
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10432 "ImportPage.c"
+#line 10390 "ImportPage.c"
}
- goto __finally69;
- __catch69_g_error:
+ goto __finally70;
+ __catch70_g_error:
{
GError* err = NULL;
- const gchar* _tmp78_ = NULL;
- gboolean _tmp79_ = FALSE;
+ const gchar* _tmp77_;
+ gboolean _tmp78_;
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = filename;
+ _tmp77_ = filename;
#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = video_reader_is_supported_video_filename (_tmp78_);
+ _tmp78_ = video_reader_is_supported_video_filename (_tmp77_);
#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp79_) {
-#line 10450 "ImportPage.c"
- const gchar* _tmp80_ = NULL;
- const gchar* _tmp81_ = NULL;
- GError* _tmp82_ = NULL;
- const gchar* _tmp83_ = NULL;
+ if (!_tmp78_) {
+#line 10408 "ImportPage.c"
+ const gchar* _tmp79_;
+ const gchar* _tmp80_;
+ GError* _tmp81_;
+ const gchar* _tmp82_;
#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = fulldir;
+ _tmp79_ = fulldir;
#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = filename;
+ _tmp80_ = filename;
#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = err;
+ _tmp81_ = err;
#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = _tmp82_->message;
+ _tmp82_ = _tmp81_->message;
#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_);
-#line 10465 "ImportPage.c"
+ g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp79_, _tmp80_, _tmp82_);
+#line 10423 "ImportPage.c"
}
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10469 "ImportPage.c"
+#line 10427 "ImportPage.c"
}
- __finally69:
+ __finally70:
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10500,215 +10458,215 @@ 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 10498 "ImportPage.c"
+#line 10456 "ImportPage.c"
}
#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_md5 = NULL;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = preview;
+ _tmp85_ = preview;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp86_ != NULL) {
-#line 10506 "ImportPage.c"
- guint8* _tmp87_ = NULL;
- gint _tmp87__length1 = 0;
+ if (_tmp85_ != NULL) {
+#line 10464 "ImportPage.c"
+ guint8* _tmp86_;
+ gint _tmp86__length1;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = preview_raw;
+ _tmp86_ = preview_raw;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87__length1 = preview_raw_length1;
+ _tmp86__length1 = preview_raw_length1;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = _tmp87_ != NULL;
-#line 10515 "ImportPage.c"
+ _tmp84_ = _tmp86_ != NULL;
+#line 10473 "ImportPage.c"
} else {
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = FALSE;
-#line 10519 "ImportPage.c"
+ _tmp84_ = FALSE;
+#line 10477 "ImportPage.c"
}
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp85_) {
-#line 10523 "ImportPage.c"
- gsize _tmp88_ = 0UL;
+ if (_tmp84_) {
+#line 10481 "ImportPage.c"
+ gsize _tmp87_;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = preview_raw_length;
+ _tmp87_ = preview_raw_length;
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = _tmp88_ > ((gsize) 0);
-#line 10529 "ImportPage.c"
+ _tmp83_ = _tmp87_ > ((gsize) 0);
+#line 10487 "ImportPage.c"
} else {
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = FALSE;
-#line 10533 "ImportPage.c"
+ _tmp83_ = FALSE;
+#line 10491 "ImportPage.c"
}
#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp84_) {
-#line 10537 "ImportPage.c"
- guint8* _tmp89_ = NULL;
- gint _tmp89__length1 = 0;
- gsize _tmp90_ = 0UL;
- gchar* _tmp91_ = NULL;
+ if (_tmp83_) {
+#line 10495 "ImportPage.c"
+ guint8* _tmp88_;
+ gint _tmp88__length1;
+ gsize _tmp89_;
+ gchar* _tmp90_;
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = preview_raw;
+ _tmp88_ = preview_raw;
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89__length1 = preview_raw_length1;
+ _tmp88__length1 = preview_raw_length1;
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = preview_raw_length;
+ _tmp89_ = preview_raw_length;
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = md5_binary (_tmp89_, _tmp90_);
+ _tmp90_ = md5_binary (_tmp88_, _tmp89_);
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_md5);
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_md5 = _tmp91_;
-#line 10554 "ImportPage.c"
+ preview_md5 = _tmp90_;
+#line 10512 "ImportPage.c"
}
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = import_source;
+ _tmp91_ = import_source;
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10560 "ImportPage.c"
- ImportSource* _tmp93_ = NULL;
- GdkPixbuf* _tmp94_ = NULL;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 10518 "ImportPage.c"
+ ImportSource* _tmp92_;
+ GdkPixbuf* _tmp93_;
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = import_source;
+ _tmp92_ = import_source;
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = preview;
+ _tmp93_ = 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 10569 "ImportPage.c"
+ video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp92_) : NULL, _tmp93_);
+#line 10527 "ImportPage.c"
}
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp95_ = import_source;
+ _tmp94_ = import_source;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10575 "ImportPage.c"
- ImportSource* _tmp96_ = NULL;
- GdkPixbuf* _tmp97_ = NULL;
- const gchar* _tmp98_ = NULL;
- PhotoMetadata* _tmp99_ = NULL;
- const gchar* _tmp100_ = NULL;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp94_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 10533 "ImportPage.c"
+ ImportSource* _tmp95_;
+ GdkPixbuf* _tmp96_;
+ const gchar* _tmp97_;
+ PhotoMetadata* _tmp98_;
+ const gchar* _tmp99_;
#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp96_ = import_source;
+ _tmp95_ = import_source;
#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp97_ = preview;
+ _tmp96_ = preview;
#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp98_ = preview_md5;
+ _tmp97_ = preview_md5;
#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp99_ = metadata;
+ _tmp98_ = metadata;
#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp100_ = exif_only_md5;
+ _tmp99_ = 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 10593 "ImportPage.c"
+ photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp95_) : NULL, _tmp96_, _tmp97_, _tmp98_, _tmp99_);
+#line 10551 "ImportPage.c"
}
#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp101_ = associated;
+ _tmp100_ = associated;
#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp101_ != NULL) {
-#line 10599 "ImportPage.c"
+ if (_tmp100_ != NULL) {
+#line 10557 "ImportPage.c"
{
PhotoMetadata* associated_metadata = NULL;
- GPSpinIdleWrapper* _tmp102_ = NULL;
- GPContext* _tmp103_ = NULL;
- Camera* _tmp104_ = NULL;
- PhotoImportSource* _tmp105_ = NULL;
- gchar* _tmp106_ = NULL;
- gchar* _tmp107_ = NULL;
- PhotoImportSource* _tmp108_ = NULL;
- gchar* _tmp109_ = NULL;
- gchar* _tmp110_ = NULL;
- PhotoMetadata* _tmp111_ = NULL;
- PhotoMetadata* _tmp112_ = NULL;
- PhotoImportSource* _tmp113_ = NULL;
- GdkPixbuf* _tmp114_ = NULL;
- const gchar* _tmp115_ = NULL;
- PhotoMetadata* _tmp116_ = NULL;
+ GPSpinIdleWrapper* _tmp101_;
+ GPContext* _tmp102_;
+ Camera* _tmp103_;
+ PhotoImportSource* _tmp104_;
+ gchar* _tmp105_;
+ gchar* _tmp106_;
+ PhotoImportSource* _tmp107_;
+ gchar* _tmp108_;
+ gchar* _tmp109_;
+ PhotoMetadata* _tmp110_;
+ PhotoMetadata* _tmp111_;
+ PhotoImportSource* _tmp112_;
+ GdkPixbuf* _tmp113_;
+ const gchar* _tmp114_;
+ PhotoMetadata* _tmp115_;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp102_ = import_page_spin_idle_context;
+ _tmp101_ = import_page_spin_idle_context;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp103_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp102_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp104_ = self->priv->camera;
+ _tmp103_ = self->priv->camera;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp105_ = associated;
+ _tmp104_ = associated;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp106_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp105_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp107_ = _tmp106_;
+ _tmp106_ = _tmp105_;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp108_ = associated;
+ _tmp107_ = associated;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp109_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp108_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp110_ = _tmp109_;
+ _tmp109_ = _tmp108_;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp111_ = gp_load_metadata (_tmp103_, _tmp104_, _tmp107_, _tmp110_, &_inner_error_);
+ _tmp110_ = gp_load_metadata (_tmp102_, _tmp103_, _tmp106_, _tmp109_, &_inner_error_);
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp112_ = _tmp111_;
+ _tmp111_ = _tmp110_;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp110_);
+ _g_free0 (_tmp109_);
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp107_);
+ _g_free0 (_tmp106_);
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- associated_metadata = _tmp112_;
+ associated_metadata = _tmp111_;
#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10647 "ImportPage.c"
- goto __catch70_g_error;
+#line 10605 "ImportPage.c"
+ goto __catch71_g_error;
}
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp113_ = associated;
+ _tmp112_ = associated;
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp114_ = preview;
+ _tmp113_ = preview;
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp115_ = preview_md5;
+ _tmp114_ = preview_md5;
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp116_ = associated_metadata;
+ _tmp115_ = associated_metadata;
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL);
+ photo_import_source_update (_tmp112_, _tmp113_, _tmp114_, _tmp115_, NULL);
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (associated_metadata);
-#line 10662 "ImportPage.c"
+#line 10620 "ImportPage.c"
}
- goto __finally70;
- __catch70_g_error:
+ goto __finally71;
+ __catch71_g_error:
{
GError* err = NULL;
- PhotoImportSource* _tmp117_ = NULL;
- gchar* _tmp118_ = NULL;
- gchar* _tmp119_ = NULL;
- PhotoImportSource* _tmp120_ = NULL;
- gchar* _tmp121_ = NULL;
- gchar* _tmp122_ = NULL;
- GError* _tmp123_ = NULL;
- const gchar* _tmp124_ = NULL;
+ PhotoImportSource* _tmp116_;
+ gchar* _tmp117_;
+ gchar* _tmp118_;
+ PhotoImportSource* _tmp119_;
+ gchar* _tmp120_;
+ gchar* _tmp121_;
+ GError* _tmp122_;
+ const gchar* _tmp123_;
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp117_ = associated;
+ _tmp116_ = associated;
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp118_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp117_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp119_ = _tmp118_;
+ _tmp118_ = _tmp117_;
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp120_ = associated;
+ _tmp119_ = associated;
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp121_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp120_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp122_ = _tmp121_;
+ _tmp121_ = _tmp120_;
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp123_ = err;
+ _tmp122_ = err;
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp124_ = _tmp123_->message;
+ _tmp123_ = _tmp122_->message;
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp119_, _tmp122_, _tmp124_);
+ g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp118_, _tmp121_, _tmp123_);
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp122_);
+ _g_free0 (_tmp121_);
#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp119_);
+ _g_free0 (_tmp118_);
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10704 "ImportPage.c"
+#line 10662 "ImportPage.c"
}
- __finally70:
+ __finally71:
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10737,31 +10695,31 @@ 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 10735 "ImportPage.c"
+#line 10693 "ImportPage.c"
}
}
#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp125_ = self->priv->import_sources;
+ _tmp124_ = self->priv->import_sources;
#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp126_ = import_source;
+ _tmp125_ = import_source;
#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, TYPE_DATA_OBJECT, DataObject));
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_OBJECT, DataObject));
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp127_ = self->priv->progress_bar;
+ _tmp126_ = self->priv->progress_bar;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp128_ = loaded_photos;
+ _tmp127_ = loaded_photos;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- loaded_photos = _tmp128_ + 1;
+ loaded_photos = _tmp127_ + 1;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp129_ = loaded_photos;
+ _tmp128_ = loaded_photos;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp130_ = import_list;
+ _tmp129_ = import_list;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp130_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp132_ = _tmp131_;
+ _tmp131_ = _tmp130_;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp127_, ((gdouble) _tmp129_) / ((gdouble) _tmp132_));
+ gtk_progress_bar_set_fraction (_tmp126_, ((gdouble) _tmp128_) / ((gdouble) _tmp131_));
#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
spin_event_loop ();
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10782,22 +10740,22 @@ 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 10780 "ImportPage.c"
+#line 10738 "ImportPage.c"
}
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_import_source_list);
-#line 10784 "ImportPage.c"
+#line 10742 "ImportPage.c"
}
}
static void import_page_on_hide_imported (ImportPage* self) {
- GtkCheckButton* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- ConfigFacade* _tmp8_ = NULL;
- ConfigFacade* _tmp9_ = NULL;
- GtkCheckButton* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
+ GtkCheckButton* _tmp0_;
+ gboolean _tmp1_;
+ ConfigFacade* _tmp8_;
+ ConfigFacade* _tmp9_;
+ GtkCheckButton* _tmp10_;
+ gboolean _tmp11_;
#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10806,10 +10764,10 @@ 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 10804 "ImportPage.c"
- ViewCollection* _tmp2_ = NULL;
- ViewCollection* _tmp3_ = NULL;
- ImportPageHideImportedViewFilter* _tmp4_ = NULL;
+#line 10762 "ImportPage.c"
+ ViewCollection* _tmp2_;
+ ViewCollection* _tmp3_;
+ ImportPageHideImportedViewFilter* _tmp4_;
#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10820,11 +10778,11 @@ 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 10818 "ImportPage.c"
+#line 10776 "ImportPage.c"
} else {
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ImportPageHideImportedViewFilter* _tmp7_ = NULL;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ ImportPageHideImportedViewFilter* _tmp7_;
#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10835,7 +10793,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 10833 "ImportPage.c"
+#line 10791 "ImportPage.c"
}
#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = config_facade_get_instance ();
@@ -10849,15 +10807,15 @@ 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 10847 "ImportPage.c"
+#line 10805 "ImportPage.c"
}
static void import_page_on_import_selected (ImportPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- GeeList* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ GeeList* _tmp2_;
+ GeeList* _tmp3_;
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10874,15 +10832,15 @@ 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 10872 "ImportPage.c"
+#line 10830 "ImportPage.c"
}
static void import_page_on_import_all (ImportPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10899,7 +10857,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 10897 "ImportPage.c"
+#line 10855 "ImportPage.c"
}
@@ -10908,51 +10866,51 @@ 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 10906 "ImportPage.c"
+#line 10864 "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 10913 "ImportPage.c"
+#line 10871 "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 10920 "ImportPage.c"
+#line 10878 "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 10927 "ImportPage.c"
+#line 10885 "ImportPage.c"
}
static void import_page_import (ImportPage* self, GeeIterable* items) {
int res = 0;
- Camera* _tmp0_ = NULL;
- GPSpinIdleWrapper* _tmp1_ = NULL;
- GPContext* _tmp2_ = NULL;
- int _tmp3_ = 0;
- int _tmp4_ = 0;
- gboolean _tmp11_ = FALSE;
- GtkProgressBar* _tmp12_ = NULL;
+ Camera* _tmp0_;
+ GPSpinIdleWrapper* _tmp1_;
+ GPContext* _tmp2_;
+ int _tmp3_;
+ int _tmp4_;
+ gboolean _tmp10_;
+ GtkProgressBar* _tmp11_;
SortedList* jobs = NULL;
- SortedList* _tmp13_ = NULL;
+ SortedList* _tmp12_;
GeeArrayList* already_imported = NULL;
- GeeArrayList* _tmp14_ = NULL;
- SortedList* _tmp55_ = NULL;
- gint _tmp56_ = 0;
- gint _tmp57_ = 0;
- const gchar* _tmp58_ = NULL;
- SortedList* _tmp59_ = NULL;
- gint _tmp60_ = 0;
- gint _tmp61_ = 0;
+ GeeArrayList* _tmp13_;
+ SortedList* _tmp54_;
+ gint _tmp55_;
+ gint _tmp56_;
+ const gchar* _tmp57_;
+ SortedList* _tmp58_;
+ gint _tmp59_;
+ gint _tmp60_;
#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10971,167 +10929,164 @@ 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 10969 "ImportPage.c"
- const gchar* _tmp5_ = NULL;
- int _tmp6_ = 0;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _ ("Unable to lock camera: %s");
+#line 10927 "ImportPage.c"
+ int _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = res;
+ _tmp5_ = res;
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = gp_result_to_full_string (_tmp6_);
+ _tmp6_ = gp_result_to_full_string (_tmp5_);
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = g_strdup_printf (_tmp5_, _tmp8_);
+ _tmp8_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp7_);
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- app_window_error_message (_tmp10_, NULL);
+ app_window_error_message (_tmp9_, NULL);
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp9_);
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp8_);
+ _g_free0 (_tmp7_);
#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10996 "ImportPage.c"
+#line 10951 "ImportPage.c"
}
#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = self->priv->refreshed;
+ _tmp10_ = self->priv->refreshed;
#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, TRUE, _tmp11_);
+ import_page_update_status (self, TRUE, _tmp10_);
#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = self->priv->progress_bar;
+ _tmp11_ = self->priv->progress_bar;
#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);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _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);
+ _tmp12_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- jobs = _tmp13_;
+ jobs = _tmp12_;
#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, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+ _tmp13_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- already_imported = _tmp14_;
-#line 11016 "ImportPage.c"
+ already_imported = _tmp13_;
+#line 10971 "ImportPage.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
+ GeeIterable* _tmp14_;
+ GeeIterator* _tmp15_;
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = items;
+ _tmp14_ = items;
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = gee_iterable_iterator (_tmp15_);
+ _tmp15_ = gee_iterable_iterator (_tmp14_);
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _object_it = _tmp16_;
+ _object_it = _tmp15_;
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 11029 "ImportPage.c"
- GeeIterator* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 10984 "ImportPage.c"
+ GeeIterator* _tmp16_;
+ gboolean _tmp17_;
DataObject* object = NULL;
- GeeIterator* _tmp19_ = NULL;
- gpointer _tmp20_ = NULL;
+ GeeIterator* _tmp18_;
+ gpointer _tmp19_;
ImportPreview* preview = NULL;
- DataObject* _tmp21_ = NULL;
- ImportPreview* _tmp22_ = NULL;
+ DataObject* _tmp20_;
+ ImportPreview* _tmp21_;
ImportSource* import_file = NULL;
- ImportPreview* _tmp23_ = NULL;
- DataSource* _tmp24_ = NULL;
- ImportPreview* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
+ ImportPreview* _tmp22_;
+ DataSource* _tmp23_;
+ ImportPreview* _tmp24_;
+ gboolean _tmp25_;
ImportPageCameraImportJob* import_job = NULL;
- GPContextWrapper* _tmp38_ = NULL;
- ImportSource* _tmp39_ = NULL;
- ImportPageCameraImportJob* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
- ImportSource* _tmp42_ = NULL;
- SortedList* _tmp53_ = NULL;
- ImportPageCameraImportJob* _tmp54_ = NULL;
+ GPContextWrapper* _tmp37_;
+ ImportSource* _tmp38_;
+ ImportPageCameraImportJob* _tmp39_;
+ gboolean _tmp40_ = FALSE;
+ ImportSource* _tmp41_;
+ SortedList* _tmp52_;
+ ImportPageCameraImportJob* _tmp53_;
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = _object_it;
+ _tmp16_ = _object_it;
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = gee_iterator_next (_tmp17_);
+ _tmp17_ = gee_iterator_next (_tmp16_);
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp18_) {
+ if (!_tmp17_) {
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11059 "ImportPage.c"
+#line 11014 "ImportPage.c"
}
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _object_it;
+ _tmp18_ = _object_it;
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = gee_iterator_get (_tmp19_);
+ _tmp19_ = gee_iterator_get (_tmp18_);
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- object = (DataObject*) _tmp20_;
+ object = (DataObject*) _tmp19_;
#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = object;
+ _tmp20_ = object;
#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_IMPORT_PREVIEW, ImportPreview));
+ _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_PREVIEW, ImportPreview));
#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview = _tmp22_;
+ preview = _tmp21_;
#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = preview;
+ _tmp22_ = preview;
#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_VIEW, DataView));
+ _tmp23_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_VIEW, DataView));
#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_IMPORT_SOURCE, ImportSource);
+ import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_IMPORT_SOURCE, ImportSource);
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = preview;
+ _tmp24_ = preview;
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = import_preview_is_already_imported (_tmp25_);
+ _tmp25_ = import_preview_is_already_imported (_tmp24_);
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp26_) {
-#line 11085 "ImportPage.c"
- ImportSource* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- GeeArrayList* _tmp30_ = NULL;
- GPContextWrapper* _tmp31_ = NULL;
- ImportSource* _tmp32_ = NULL;
- ImportPreview* _tmp33_ = NULL;
- DuplicatedFile* _tmp34_ = NULL;
- DuplicatedFile* _tmp35_ = NULL;
- ImportPageCameraImportJob* _tmp36_ = NULL;
- ImportPageCameraImportJob* _tmp37_ = NULL;
+ if (_tmp25_) {
+#line 11040 "ImportPage.c"
+ ImportSource* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ GeeArrayList* _tmp29_;
+ GPContextWrapper* _tmp30_;
+ ImportSource* _tmp31_;
+ ImportPreview* _tmp32_;
+ DuplicatedFile* _tmp33_;
+ DuplicatedFile* _tmp34_;
+ ImportPageCameraImportJob* _tmp35_;
+ ImportPageCameraImportJob* _tmp36_;
#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = import_file;
+ _tmp26_ = import_file;
#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = import_source_get_filename (_tmp27_);
+ _tmp27_ = import_source_get_filename (_tmp26_);
#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = _tmp28_;
+ _tmp28_ = _tmp27_;
#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_message ("ImportPage.vala:1669: Skipping import of %s: checksum detected in libr" \
-"ary", _tmp29_);
+"ary", _tmp28_);
#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp29_);
+ _g_free0 (_tmp28_);
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = already_imported;
+ _tmp29_ = already_imported;
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = import_page_null_context;
+ _tmp30_ = import_page_null_context;
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = import_file;
+ _tmp31_ = import_file;
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = preview;
+ _tmp32_ = preview;
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = import_preview_get_duplicated_file (_tmp33_);
+ _tmp33_ = import_preview_get_duplicated_file (_tmp32_);
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = _tmp34_;
+ _tmp34_ = _tmp33_;
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = import_page_camera_import_job_new (_tmp31_, _tmp32_, _tmp35_);
+ _tmp35_ = import_page_camera_import_job_new (_tmp30_, _tmp31_, _tmp34_);
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = _tmp36_;
+ _tmp36_ = _tmp35_;
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_import_job_unref0 (_tmp37_);
+ _batch_import_job_unref0 (_tmp36_);
#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp35_);
+ _g_object_unref0 (_tmp34_);
#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_file);
#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11140,78 +11095,78 @@ 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 11137 "ImportPage.c"
+#line 11092 "ImportPage.c"
}
#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = import_page_null_context;
+ _tmp37_ = import_page_null_context;
#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = import_file;
+ _tmp38_ = import_file;
#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = import_page_camera_import_job_new (_tmp38_, _tmp39_, NULL);
+ _tmp39_ = import_page_camera_import_job_new (_tmp37_, _tmp38_, NULL);
#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_job = _tmp40_;
+ import_job = _tmp39_;
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_file;
+ _tmp41_ = import_file;
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11151 "ImportPage.c"
- ImportSource* _tmp43_ = NULL;
- PhotoImportSource* _tmp44_ = NULL;
- PhotoImportSource* _tmp45_ = NULL;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 11106 "ImportPage.c"
+ ImportSource* _tmp42_;
+ PhotoImportSource* _tmp43_;
+ PhotoImportSource* _tmp44_;
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = import_file;
+ _tmp42_ = import_file;
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+ _tmp43_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = _tmp44_;
+ _tmp44_ = _tmp43_;
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = _tmp45_ != NULL;
+ _tmp40_ = _tmp44_ != NULL;
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp45_);
-#line 11165 "ImportPage.c"
+ _g_object_unref0 (_tmp44_);
+#line 11120 "ImportPage.c"
} else {
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = FALSE;
-#line 11169 "ImportPage.c"
+ _tmp40_ = FALSE;
+#line 11124 "ImportPage.c"
}
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp41_) {
-#line 11173 "ImportPage.c"
- ImportPageCameraImportJob* _tmp46_ = NULL;
- GPContextWrapper* _tmp47_ = NULL;
- ImportSource* _tmp48_ = NULL;
- PhotoImportSource* _tmp49_ = NULL;
- PhotoImportSource* _tmp50_ = NULL;
- ImportPageCameraImportJob* _tmp51_ = NULL;
- ImportPageCameraImportJob* _tmp52_ = NULL;
+ if (_tmp40_) {
+#line 11128 "ImportPage.c"
+ ImportPageCameraImportJob* _tmp45_;
+ GPContextWrapper* _tmp46_;
+ ImportSource* _tmp47_;
+ PhotoImportSource* _tmp48_;
+ PhotoImportSource* _tmp49_;
+ ImportPageCameraImportJob* _tmp50_;
+ ImportPageCameraImportJob* _tmp51_;
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = import_job;
+ _tmp45_ = import_job;
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = import_page_null_context;
+ _tmp46_ = import_page_null_context;
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = import_file;
+ _tmp47_ = import_file;
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+ _tmp48_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = _tmp49_;
+ _tmp49_ = _tmp48_;
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = import_page_camera_import_job_new (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
+ _tmp50_ = import_page_camera_import_job_new (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = _tmp51_;
+ _tmp51_ = _tmp50_;
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
+ batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_import_job_unref0 (_tmp52_);
+ _batch_import_job_unref0 (_tmp51_);
#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp50_);
-#line 11201 "ImportPage.c"
+ _g_object_unref0 (_tmp49_);
+#line 11156 "ImportPage.c"
}
#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = jobs;
+ _tmp52_ = jobs;
#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = import_job;
+ _tmp53_ = import_job;
#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (import_job);
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11220,138 +11175,138 @@ 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 11217 "ImportPage.c"
+#line 11172 "ImportPage.c"
}
#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_object_it);
-#line 11221 "ImportPage.c"
+#line 11176 "ImportPage.c"
}
#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = jobs;
+ _tmp54_ = jobs;
#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = _tmp56_;
+ _tmp56_ = _tmp55_;
#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = self->priv->camera_name;
+ _tmp57_ = self->priv->camera_name;
#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp57_, _tmp58_);
+ g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp56_, _tmp57_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = jobs;
+ _tmp58_ = jobs;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = _tmp60_;
+ _tmp60_ = _tmp59_;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp61_ > 0) {
-#line 11241 "ImportPage.c"
- ImportPage* _tmp62_ = NULL;
- ImportPage* _tmp63_ = NULL;
+ if (_tmp60_ > 0) {
+#line 11196 "ImportPage.c"
+ ImportPage* _tmp61_;
+ ImportPage* _tmp62_;
BatchImport* batch_import = NULL;
- SortedList* _tmp64_ = NULL;
- const gchar* _tmp65_ = NULL;
- GeeArrayList* _tmp66_ = NULL;
- BatchImport* _tmp67_ = NULL;
- BatchImport* _tmp68_ = NULL;
- BatchImport* _tmp69_ = NULL;
- LibraryWindow* _tmp70_ = NULL;
- LibraryWindow* _tmp71_ = NULL;
- BatchImport* _tmp72_ = NULL;
- LibraryWindow* _tmp73_ = NULL;
- LibraryWindow* _tmp74_ = NULL;
+ SortedList* _tmp63_;
+ const gchar* _tmp64_;
+ GeeArrayList* _tmp65_;
+ BatchImport* _tmp66_;
+ BatchImport* _tmp67_;
+ BatchImport* _tmp68_;
+ LibraryWindow* _tmp69_;
+ LibraryWindow* _tmp70_;
+ BatchImport* _tmp71_;
+ LibraryWindow* _tmp72_;
+ LibraryWindow* _tmp73_;
#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = self->priv->local_ref;
+ _tmp61_ = self->priv->local_ref;
#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _vala_assert (_tmp62_ == NULL, "local_ref == null");
+ _vala_assert (_tmp61_ == NULL, "local_ref == null");
#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = _g_object_ref0 (self);
+ _tmp62_ = _g_object_ref0 (self);
#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->local_ref);
#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->local_ref = _tmp63_;
+ self->priv->local_ref = _tmp62_;
#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = jobs;
+ _tmp63_ = jobs;
#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = self->priv->camera_name;
+ _tmp64_ = self->priv->camera_name;
#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = already_imported;
+ _tmp65_ = already_imported;
#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable), _tmp65_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp66_, NULL, NULL, NULL);
+ _tmp66_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ITERABLE, GeeIterable), _tmp64_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp65_, NULL, NULL, NULL);
#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- batch_import = _tmp67_;
+ batch_import = _tmp66_;
#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = batch_import;
+ _tmp67_ = batch_import;
#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp68_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
+ g_signal_connect_object (_tmp67_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = batch_import;
+ _tmp68_ = batch_import;
#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp69_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
+ g_signal_connect_object (_tmp68_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = library_window_get_app ();
+ _tmp69_ = library_window_get_app ();
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = _tmp70_;
+ _tmp70_ = _tmp69_;
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = batch_import;
+ _tmp71_ = batch_import;
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_window_enqueue_batch_import (_tmp71_, _tmp72_, TRUE);
+ library_window_enqueue_batch_import (_tmp70_, _tmp71_, TRUE);
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp71_);
+ _g_object_unref0 (_tmp70_);
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = library_window_get_app ();
+ _tmp72_ = library_window_get_app ();
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = _tmp73_;
+ _tmp73_ = _tmp72_;
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_window_switch_to_import_queue_page (_tmp74_);
+ library_window_switch_to_import_queue_page (_tmp73_);
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp74_);
+ _g_object_unref0 (_tmp73_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (batch_import);
-#line 11304 "ImportPage.c"
+#line 11259 "ImportPage.c"
} else {
- GeeArrayList* _tmp75_ = NULL;
- gint _tmp76_ = 0;
- gint _tmp77_ = 0;
+ GeeArrayList* _tmp74_;
+ gint _tmp75_;
+ gint _tmp76_;
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = already_imported;
+ _tmp74_ = 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_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = _tmp76_;
+ _tmp76_ = _tmp75_;
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp77_ > 0) {
-#line 11317 "ImportPage.c"
- GeeArrayList* _tmp78_ = NULL;
- ImportManifest* _tmp79_ = NULL;
- ImportManifest* _tmp80_ = NULL;
+ if (_tmp76_ > 0) {
+#line 11272 "ImportPage.c"
+ GeeArrayList* _tmp77_;
+ ImportManifest* _tmp78_;
+ ImportManifest* _tmp79_;
#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = already_imported;
+ _tmp77_ = already_imported;
#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList));
+ _tmp78_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_LIST, GeeList));
#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = _tmp79_;
+ _tmp79_ = _tmp78_;
#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_import_reporter (self, _tmp80_);
+ import_page_import_reporter (self, _tmp79_);
#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _import_manifest_unref0 (_tmp80_);
-#line 11331 "ImportPage.c"
+ _import_manifest_unref0 (_tmp79_);
+#line 11286 "ImportPage.c"
}
#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_close_import (self);
-#line 11335 "ImportPage.c"
+#line 11290 "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 11341 "ImportPage.c"
+#line 11296 "ImportPage.c"
}
static void import_page_on_import_job_failed (ImportPage* self, BatchImportResult* _result_) {
gboolean _tmp0_ = FALSE;
- BatchImportResult* _tmp1_ = NULL;
- GFile* _tmp2_ = NULL;
+ BatchImportResult* _tmp1_;
+ GFile* _tmp2_;
GError * _inner_error_ = NULL;
#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -11365,27 +11320,27 @@ 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 11362 "ImportPage.c"
+#line 11317 "ImportPage.c"
} else {
- BatchImportResult* _tmp3_ = NULL;
- ImportResult _tmp4_ = 0;
+ BatchImportResult* _tmp3_;
+ ImportResult _tmp4_;
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _result_;
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = _tmp3_->result;
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11372 "ImportPage.c"
+#line 11327 "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 11378 "ImportPage.c"
+#line 11333 "ImportPage.c"
}
{
- BatchImportResult* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
+ BatchImportResult* _tmp5_;
+ GFile* _tmp6_;
#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _result_;
#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11394,20 +11349,20 @@ 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 11391 "ImportPage.c"
- goto __catch71_g_error;
+#line 11346 "ImportPage.c"
+ goto __catch72_g_error;
}
}
- goto __finally71;
- __catch71_g_error:
+ goto __finally72;
+ __catch72_g_error:
{
GError* err = NULL;
- BatchImportResult* _tmp7_ = NULL;
- GFile* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- GError* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ BatchImportResult* _tmp7_;
+ GFile* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ GError* _tmp11_;
+ const gchar* _tmp12_;
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11430,9 +11385,9 @@ 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 11427 "ImportPage.c"
+#line 11382 "ImportPage.c"
}
- __finally71:
+ __finally72:
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11441,7 +11396,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 11438 "ImportPage.c"
+#line 11393 "ImportPage.c"
}
}
@@ -11449,7 +11404,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 11446 "ImportPage.c"
+#line 11401 "ImportPage.c"
}
@@ -11458,36 +11413,35 @@ 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 11455 "ImportPage.c"
+#line 11410 "ImportPage.c"
}
static void import_page_import_reporter (ImportPage* self, ImportManifest* manifest) {
ImportPage* local_ref = NULL;
- ImportPage* _tmp0_ = NULL;
- ImportPage* _tmp1_ = NULL;
- ImportManifest* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ ImportPage* _tmp0_;
+ ImportPage* _tmp1_;
+ ImportManifest* _tmp2_;
+ GeeList* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
Marker* marker = NULL;
- SourceCollection* _tmp60_ = NULL;
- Marker* _tmp61_ = NULL;
+ SourceCollection* _tmp55_;
+ Marker* _tmp56_;
ProgressDialog* progress = NULL;
- AppWindow* _tmp81_ = NULL;
- AppWindow* _tmp82_ = NULL;
- const gchar* _tmp83_ = NULL;
- GCancellable* _tmp84_ = NULL;
- GCancellable* _tmp85_ = NULL;
- ProgressDialog* _tmp86_ = NULL;
- ProgressDialog* _tmp87_ = NULL;
+ AppWindow* _tmp76_;
+ AppWindow* _tmp77_;
+ GCancellable* _tmp78_;
+ GCancellable* _tmp79_;
+ ProgressDialog* _tmp80_;
+ ProgressDialog* _tmp81_;
gint error_count = 0;
- SourceCollection* _tmp88_ = NULL;
- Marker* _tmp89_ = NULL;
- ProgressDialog* _tmp90_ = NULL;
- gint _tmp91_ = 0;
- gint _tmp92_ = 0;
- ProgressDialog* _tmp98_ = NULL;
+ SourceCollection* _tmp82_;
+ Marker* _tmp83_;
+ ProgressDialog* _tmp84_;
+ gint _tmp85_;
+ gint _tmp86_;
+ ProgressDialog* _tmp91_;
#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11512,66 +11466,61 @@ 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 11509 "ImportPage.c"
+#line 11463 "ImportPage.c"
gchar* photos_string = NULL;
- ImportManifest* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- const gchar* _tmp10_ = NULL;
- ImportManifest* _tmp11_ = NULL;
- GeeList* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- gchar* _tmp15_ = NULL;
+ ImportManifest* _tmp6_;
+ GeeList* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ ImportManifest* _tmp10_;
+ GeeList* _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ gchar* _tmp14_;
gchar* videos_string = NULL;
- ImportManifest* _tmp16_ = NULL;
- GeeList* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- const gchar* _tmp20_ = NULL;
- ImportManifest* _tmp21_ = NULL;
- GeeList* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
- gchar* _tmp25_ = NULL;
+ ImportManifest* _tmp15_;
+ GeeList* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ ImportManifest* _tmp19_;
+ GeeList* _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
+ gchar* _tmp23_;
gchar* both_string = NULL;
- ImportManifest* _tmp26_ = NULL;
- GeeList* _tmp27_ = NULL;
- gint _tmp28_ = 0;
- gint _tmp29_ = 0;
- const gchar* _tmp30_ = NULL;
- ImportManifest* _tmp31_ = NULL;
- GeeList* _tmp32_ = NULL;
- gint _tmp33_ = 0;
- gint _tmp34_ = 0;
- gchar* _tmp35_ = NULL;
+ ImportManifest* _tmp24_;
+ GeeList* _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
+ ImportManifest* _tmp28_;
+ GeeList* _tmp29_;
+ gint _tmp30_;
+ gint _tmp31_;
+ gchar* _tmp32_;
gchar* neither_string = NULL;
- ImportManifest* _tmp36_ = NULL;
- GeeList* _tmp37_ = NULL;
- gint _tmp38_ = 0;
- gint _tmp39_ = 0;
- const gchar* _tmp40_ = NULL;
- ImportManifest* _tmp41_ = NULL;
- GeeList* _tmp42_ = NULL;
- gint _tmp43_ = 0;
- gint _tmp44_ = 0;
- gchar* _tmp45_ = NULL;
+ ImportManifest* _tmp33_;
+ GeeList* _tmp34_;
+ gint _tmp35_;
+ gint _tmp36_;
+ ImportManifest* _tmp37_;
+ GeeList* _tmp38_;
+ gint _tmp39_;
+ gint _tmp40_;
+ gchar* _tmp41_;
gchar* question_string = NULL;
- ImportManifest* _tmp46_ = NULL;
- GeeList* _tmp47_ = NULL;
- const gchar* _tmp48_ = NULL;
- const gchar* _tmp49_ = NULL;
- const gchar* _tmp50_ = NULL;
- const gchar* _tmp51_ = NULL;
- gchar* _tmp52_ = NULL;
+ ImportManifest* _tmp42_;
+ GeeList* _tmp43_;
+ const gchar* _tmp44_;
+ const gchar* _tmp45_;
+ const gchar* _tmp46_;
+ const gchar* _tmp47_;
+ gchar* _tmp48_;
ImportUIQuestionParams* question = NULL;
- const gchar* _tmp53_ = NULL;
- const gchar* _tmp54_ = NULL;
- ImportUIQuestionParams* _tmp55_ = NULL;
- ImportManifest* _tmp56_ = NULL;
- ImportUIQuestionParams* _tmp57_ = NULL;
- gboolean _tmp58_ = FALSE;
+ const gchar* _tmp49_;
+ ImportUIQuestionParams* _tmp50_;
+ ImportManifest* _tmp51_;
+ ImportUIQuestionParams* _tmp52_;
+ gboolean _tmp53_;
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = manifest;
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11581,117 +11530,107 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp8_;
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_);
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = manifest;
+ _tmp10_ = manifest;
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = _tmp11_->success;
+ _tmp11_ = _tmp10_->success;
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = g_strdup_printf (_tmp10_, _tmp14_);
+ _tmp14_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_), _tmp13_);
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photos_string = _tmp15_;
+ photos_string = _tmp14_;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = manifest;
+ _tmp15_ = manifest;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = _tmp16_->success;
+ _tmp16_ = _tmp15_->success;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp18_ = _tmp17_;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp19_);
+ _tmp19_ = manifest;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = manifest;
+ _tmp20_ = _tmp19_->success;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = _tmp21_->success;
+ _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = _tmp23_;
+ _tmp22_ = _tmp21_;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = g_strdup_printf (_tmp20_, _tmp24_);
+ _tmp23_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp18_), _tmp22_);
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- videos_string = _tmp25_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = manifest;
+ videos_string = _tmp23_;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = _tmp26_->success;
+ _tmp24_ = manifest;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp25_ = _tmp24_->success;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = _tmp28_;
+ _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp29_);
+ _tmp27_ = _tmp26_;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = manifest;
+ _tmp28_ = manifest;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = _tmp31_->success;
+ _tmp29_ = _tmp28_->success;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = _tmp33_;
+ _tmp31_ = _tmp30_;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = g_strdup_printf (_tmp30_, _tmp34_);
+ _tmp32_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp27_), _tmp31_);
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- both_string = _tmp35_;
+ both_string = _tmp32_;
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = manifest;
+ _tmp33_ = manifest;
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = _tmp36_->success;
+ _tmp34_ = _tmp33_->success;
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = _tmp38_;
+ _tmp36_ = _tmp35_;
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp39_);
+ _tmp37_ = manifest;
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = manifest;
+ _tmp38_ = _tmp37_->success;
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = _tmp41_->success;
+ _tmp39_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp40_ = _tmp39_;
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = _tmp43_;
+ _tmp41_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp36_), _tmp40_);
#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = g_strdup_printf (_tmp40_, _tmp44_);
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- neither_string = _tmp45_;
+ neither_string = _tmp41_;
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = manifest;
+ _tmp42_ = manifest;
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = _tmp46_->success;
+ _tmp43_ = _tmp42_->success;
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = photos_string;
+ _tmp44_ = photos_string;
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = videos_string;
+ _tmp45_ = videos_string;
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = both_string;
+ _tmp46_ = both_string;
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = neither_string;
+ _tmp47_ = neither_string;
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), _tmp48_, _tmp49_, _tmp50_, _tmp51_);
+ _tmp48_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_, _tmp45_, _tmp46_, _tmp47_);
#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- question_string = _tmp52_;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = question_string;
+ question_string = _tmp48_;
#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = _ ("_Keep");
+ _tmp49_ = question_string;
#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = import_ui_question_params_new (_tmp53_, RESOURCES_DELETE_LABEL, _tmp54_);
+ _tmp50_ = import_ui_question_params_new (_tmp49_, RESOURCES_DELETE_LABEL, _ ("_Keep"));
#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- question = _tmp55_;
+ question = _tmp50_;
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = manifest;
+ _tmp51_ = manifest;
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = question;
+ _tmp52_ = question;
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = import_ui_report_manifest (_tmp56_, FALSE, _tmp57_);
+ _tmp53_ = import_ui_report_manifest (_tmp51_, FALSE, _tmp52_);
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp58_) {
+ if (!_tmp53_) {
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_ui_question_params_unref0 (question);
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11708,7 +11647,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 11705 "ImportPage.c"
+#line 11644 "ImportPage.c"
}
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_ui_question_params_unref0 (question);
@@ -11722,189 +11661,184 @@ 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 11719 "ImportPage.c"
+#line 11658 "ImportPage.c"
} else {
- ImportManifest* _tmp59_ = NULL;
+ ImportManifest* _tmp54_;
#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = manifest;
+ _tmp54_ = manifest;
#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_ui_report_manifest (_tmp59_, FALSE, NULL);
+ import_ui_report_manifest (_tmp54_, FALSE, NULL);
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11730 "ImportPage.c"
+#line 11669 "ImportPage.c"
}
#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = self->priv->import_sources;
+ _tmp55_ = self->priv->import_sources;
#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp56_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection));
#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- marker = _tmp61_;
-#line 11738 "ImportPage.c"
+ marker = _tmp56_;
+#line 11677 "ImportPage.c"
{
GeeList* _batch_result_list = NULL;
- ImportManifest* _tmp62_ = NULL;
- GeeList* _tmp63_ = NULL;
- GeeList* _tmp64_ = NULL;
+ ImportManifest* _tmp57_;
+ GeeList* _tmp58_;
+ GeeList* _tmp59_;
gint _batch_result_size = 0;
- GeeList* _tmp65_ = NULL;
- gint _tmp66_ = 0;
- gint _tmp67_ = 0;
+ GeeList* _tmp60_;
+ gint _tmp61_;
+ gint _tmp62_;
gint _batch_result_index = 0;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = manifest;
+ _tmp57_ = manifest;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = _tmp62_->success;
+ _tmp58_ = _tmp57_->success;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = _g_object_ref0 (_tmp63_);
+ _tmp59_ = _g_object_ref0 (_tmp58_);
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_result_list = _tmp64_;
+ _batch_result_list = _tmp59_;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = _batch_result_list;
+ _tmp60_ = _batch_result_list;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp61_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = _tmp66_;
+ _tmp62_ = _tmp61_;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_result_size = _tmp67_;
+ _batch_result_size = _tmp62_;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_result_index = -1;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 11769 "ImportPage.c"
- gint _tmp68_ = 0;
- gint _tmp69_ = 0;
- gint _tmp70_ = 0;
+#line 11708 "ImportPage.c"
+ gint _tmp63_;
+ gint _tmp64_;
+ gint _tmp65_;
BatchImportResult* batch_result = NULL;
- GeeList* _tmp71_ = NULL;
- gint _tmp72_ = 0;
- gpointer _tmp73_ = NULL;
+ GeeList* _tmp66_;
+ gint _tmp67_;
+ gpointer _tmp68_;
ImportPageCameraImportJob* job = NULL;
- BatchImportResult* _tmp74_ = NULL;
- BatchImportJob* _tmp75_ = NULL;
- ImportPageCameraImportJob* _tmp76_ = NULL;
- Marker* _tmp77_ = NULL;
- ImportPageCameraImportJob* _tmp78_ = NULL;
- ImportSource* _tmp79_ = NULL;
- ImportSource* _tmp80_ = NULL;
+ BatchImportResult* _tmp69_;
+ BatchImportJob* _tmp70_;
+ ImportPageCameraImportJob* _tmp71_;
+ Marker* _tmp72_;
+ ImportPageCameraImportJob* _tmp73_;
+ ImportSource* _tmp74_;
+ ImportSource* _tmp75_;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = _batch_result_index;
+ _tmp63_ = _batch_result_index;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_result_index = _tmp68_ + 1;
+ _batch_result_index = _tmp63_ + 1;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = _batch_result_index;
+ _tmp64_ = _batch_result_index;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = _batch_result_size;
+ _tmp65_ = _batch_result_size;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp69_ < _tmp70_)) {
+ if (!(_tmp64_ < _tmp65_)) {
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11797 "ImportPage.c"
+#line 11736 "ImportPage.c"
}
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = _batch_result_list;
+ _tmp66_ = _batch_result_list;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = _batch_result_index;
+ _tmp67_ = _batch_result_index;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = gee_list_get (_tmp71_, _tmp72_);
+ _tmp68_ = gee_list_get (_tmp66_, _tmp67_);
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- batch_result = (BatchImportResult*) _tmp73_;
+ batch_result = (BatchImportResult*) _tmp68_;
#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = batch_result;
+ _tmp69_ = batch_result;
#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = _tmp74_->job;
+ _tmp70_ = _tmp69_->job;
#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp75_) : NULL);
+ _tmp71_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp70_) : NULL);
#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- job = _tmp76_;
+ job = _tmp71_;
#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = marker;
+ _tmp72_ = marker;
#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = job;
+ _tmp73_ = job;
#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = import_page_camera_import_job_get_source (_tmp78_);
+ _tmp74_ = import_page_camera_import_job_get_source (_tmp73_);
#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = _tmp79_;
+ _tmp75_ = _tmp74_;
#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- marker_mark (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_DATA_OBJECT, DataObject));
+ marker_mark (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_OBJECT, DataObject));
#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp80_);
+ _g_object_unref0 (_tmp75_);
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (job);
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_result_unref0 (batch_result);
-#line 11831 "ImportPage.c"
+#line 11770 "ImportPage.c"
}
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_batch_result_list);
-#line 11835 "ImportPage.c"
+#line 11774 "ImportPage.c"
}
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = app_window_get_instance ();
+ _tmp76_ = app_window_get_instance ();
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = _tmp81_;
+ _tmp77_ = _tmp76_;
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = _ ("Removing photos/videos from camera");
+ _tmp78_ = g_cancellable_new ();
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = g_cancellable_new ();
+ _tmp79_ = _tmp78_;
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = _tmp84_;
+ _tmp80_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp79_);
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_window_get_type (), GtkWindow), _tmp83_, _tmp85_);
+ g_object_ref_sink (_tmp80_);
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp86_);
+ _tmp81_ = _tmp80_;
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = _tmp86_;
+ _g_object_unref0 (_tmp79_);
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp85_);
+ _g_object_unref0 (_tmp77_);
#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp82_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- progress = _tmp87_;
+ progress = _tmp81_;
#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = self->priv->import_sources;
+ _tmp82_ = self->priv->import_sources;
#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = marker;
+ _tmp83_ = marker;
#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = progress;
+ _tmp84_ = progress;
#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = source_collection_destroy_marked (_tmp88_, _tmp89_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp90_, NULL);
+ _tmp85_ = source_collection_destroy_marked (_tmp82_, _tmp83_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp84_, NULL);
#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- error_count = _tmp91_;
+ error_count = _tmp85_;
#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = error_count;
+ _tmp86_ = error_count;
#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp92_ > 0) {
-#line 11873 "ImportPage.c"
+ if (_tmp86_ > 0) {
+#line 11810 "ImportPage.c"
gchar* error_string = NULL;
- gint _tmp93_ = 0;
- const gchar* _tmp94_ = NULL;
- gint _tmp95_ = 0;
- gchar* _tmp96_ = NULL;
- const gchar* _tmp97_ = NULL;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = error_count;
+ gint _tmp87_;
+ gint _tmp88_;
+ gchar* _tmp89_;
+ const gchar* _tmp90_;
#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp93_);
+ _tmp87_ = error_count;
#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp95_ = error_count;
+ _tmp88_ = error_count;
#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp96_ = g_strdup_printf (_tmp94_, _tmp95_);
+ _tmp89_ = g_strdup_printf (ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp87_), _tmp88_);
#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- error_string = _tmp96_;
+ error_string = _tmp89_;
#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp97_ = error_string;
+ _tmp90_ = error_string;
#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- app_window_error_message (_tmp97_, NULL);
+ app_window_error_message (_tmp90_, NULL);
#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (error_string);
-#line 11896 "ImportPage.c"
+#line 11830 "ImportPage.c"
}
#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp98_ = progress;
+ _tmp91_ = progress;
#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- progress_dialog_close (_tmp98_);
+ progress_dialog_close (_tmp91_);
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11915,18 +11849,18 @@ 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 11912 "ImportPage.c"
+#line 11846 "ImportPage.c"
}
static void import_page_close_import (ImportPage* self) {
int res = 0;
- Camera* _tmp0_ = NULL;
- GPSpinIdleWrapper* _tmp1_ = NULL;
- GPContext* _tmp2_ = NULL;
- int _tmp3_ = 0;
- int _tmp4_ = 0;
- gboolean _tmp8_ = FALSE;
+ Camera* _tmp0_;
+ GPSpinIdleWrapper* _tmp1_;
+ GPContext* _tmp2_;
+ int _tmp3_;
+ int _tmp4_;
+ gboolean _tmp8_;
#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11943,10 +11877,10 @@ 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 11940 "ImportPage.c"
- int _tmp5_ = 0;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+#line 11874 "ImportPage.c"
+ int _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = res;
#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11957,7 +11891,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 11954 "ImportPage.c"
+#line 11888 "ImportPage.c"
}
#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = self->priv->refreshed;
@@ -11965,14 +11899,14 @@ 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 11962 "ImportPage.c"
+#line 11896 "ImportPage.c"
}
static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display) {
ImportPage * self;
- gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
#line 1800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11983,22 +11917,22 @@ 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 11980 "ImportPage.c"
+#line 11914 "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 11987 "ImportPage.c"
+#line 11921 "ImportPage.c"
}
static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPage* base) {
ImportPage * self;
SearchViewFilter* result = NULL;
- ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
- SearchViewFilter* _tmp1_ = NULL;
+ ImportPageImportPageSearchViewFilter* _tmp0_;
+ SearchViewFilter* _tmp1_;
#line 1807 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12009,14 +11943,14 @@ 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 12006 "ImportPage.c"
+#line 11940 "ImportPage.c"
}
static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type, ImportPage* owner) {
ImportPageImportViewManager* self = NULL;
- ImportPage* _tmp0_ = NULL;
- ImportPage* _tmp1_ = NULL;
+ ImportPage* _tmp0_;
+ ImportPage* _tmp1_;
#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (owner), NULL);
#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12031,22 +11965,22 @@ 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 12028 "ImportPage.c"
+#line 11962 "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 12035 "ImportPage.c"
+#line 11969 "ImportPage.c"
}
static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source) {
ImportPageImportViewManager * self;
DataView* result = NULL;
- DataSource* _tmp0_ = NULL;
- ImportPreview* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ ImportPreview* _tmp1_;
#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager);
#line 475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12059,7 +11993,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 12056 "ImportPage.c"
+#line 11990 "ImportPage.c"
}
@@ -12071,19 +12005,19 @@ 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 = (DataView* (*)(ViewManager*, DataSource*)) import_page_import_view_manager_real_create_view;
-#line 12069 "ImportPage.c"
+ ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) import_page_import_view_manager_real_create_view;
+#line 12003 "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 12076 "ImportPage.c"
+#line 12010 "ImportPage.c"
}
-static void import_page_import_view_manager_finalize (ViewManager* obj) {
+static void import_page_import_view_manager_finalize (ViewManager * obj) {
ImportPageImportViewManager * self;
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManager);
@@ -12091,7 +12025,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 12088 "ImportPage.c"
+#line 12022 "ImportPage.c"
}
@@ -12110,32 +12044,32 @@ 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 12107 "ImportPage.c"
+#line 12041 "ImportPage.c"
}
static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type, GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
ImportPageCameraImportJob* self = NULL;
- GPContextWrapper* _tmp0_ = NULL;
- GPContextWrapper* _tmp1_ = NULL;
- ImportSource* _tmp2_ = NULL;
- ImportSource* _tmp3_ = NULL;
- DuplicatedFile* _tmp4_ = NULL;
- DuplicatedFile* _tmp5_ = NULL;
- ImportSource* _tmp6_ = NULL;
- Camera* _tmp7_ = NULL;
- ImportSource* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- ImportSource* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- ImportSource* _tmp13_ = NULL;
- gulong _tmp14_ = 0UL;
+ GPContextWrapper* _tmp0_;
+ GPContextWrapper* _tmp1_;
+ ImportSource* _tmp2_;
+ ImportSource* _tmp3_;
+ DuplicatedFile* _tmp4_;
+ DuplicatedFile* _tmp5_;
+ ImportSource* _tmp6_;
+ Camera* _tmp7_;
+ ImportSource* _tmp8_;
+ gchar* _tmp9_;
+ const gchar* _tmp10_;
+ ImportSource* _tmp11_;
+ gchar* _tmp12_;
+ ImportSource* _tmp13_;
+ gulong _tmp14_;
PhotoMetadata* _tmp15_ = NULL;
- ImportSource* _tmp16_ = NULL;
- PhotoMetadata* _tmp19_ = NULL;
- ImportSource* _tmp20_ = NULL;
- time_t _tmp21_ = 0;
+ ImportSource* _tmp16_;
+ PhotoMetadata* _tmp19_;
+ ImportSource* _tmp20_;
+ time_t _tmp21_;
#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (GP_IS_CONTEXT_WRAPPER (context), NULL);
#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12206,9 +12140,9 @@ 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 12203 "ImportPage.c"
- ImportSource* _tmp17_ = NULL;
- PhotoMetadata* _tmp18_ = NULL;
+#line 12137 "ImportPage.c"
+ ImportSource* _tmp17_;
+ PhotoMetadata* _tmp18_;
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = import_file;
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12217,13 +12151,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 12214 "ImportPage.c"
+#line 12148 "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 12220 "ImportPage.c"
+#line 12154 "ImportPage.c"
}
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12241,20 +12175,20 @@ 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 12238 "ImportPage.c"
+#line 12172 "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 12245 "ImportPage.c"
+#line 12179 "ImportPage.c"
}
static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self) {
time_t result = 0;
- time_t _tmp0_ = 0;
+ time_t _tmp0_;
#line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), 0);
#line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12263,15 +12197,15 @@ 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 12260 "ImportPage.c"
+#line 12194 "ImportPage.c"
}
static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base) {
ImportPageCameraImportJob * self;
DuplicatedFile* result = NULL;
- DuplicatedFile* _tmp0_ = NULL;
- DuplicatedFile* _tmp1_ = NULL;
+ DuplicatedFile* _tmp0_;
+ DuplicatedFile* _tmp1_;
#line 515 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12282,7 +12216,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 12279 "ImportPage.c"
+#line 12213 "ImportPage.c"
}
@@ -12290,38 +12224,38 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
ImportPageCameraImportJob * self;
time_t result = 0;
time_t _tmp0_ = 0;
- ImportSource* _tmp1_ = NULL;
+ ImportSource* _tmp1_;
#line 519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_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 12294 "ImportPage.c"
- time_t _tmp2_ = 0;
+#line 12228 "ImportPage.c"
+ time_t _tmp2_;
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = import_page_camera_import_job_get_exposure_time (self);
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp2_;
-#line 12300 "ImportPage.c"
+#line 12234 "ImportPage.c"
} else {
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = (time_t) 0;
-#line 12304 "ImportPage.c"
+#line 12238 "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 12310 "ImportPage.c"
+#line 12244 "ImportPage.c"
}
static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImportJob* base) {
ImportPageCameraImportJob * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12332,15 +12266,15 @@ 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 12329 "ImportPage.c"
+#line 12263 "ImportPage.c"
}
static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base) {
ImportPageCameraImportJob * self;
gchar* result = NULL;
- ImportSource* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ ImportSource* _tmp0_;
+ gchar* _tmp1_;
#line 527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12351,15 +12285,15 @@ 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 12348 "ImportPage.c"
+#line 12282 "ImportPage.c"
}
static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* base) {
ImportPageCameraImportJob * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12370,15 +12304,15 @@ 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 12367 "ImportPage.c"
+#line 12301 "ImportPage.c"
}
static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base) {
ImportPageCameraImportJob * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12389,14 +12323,14 @@ 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 12386 "ImportPage.c"
+#line 12320 "ImportPage.c"
}
static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
ImportPageCameraImportJob * self;
- BatchImportJob* _tmp0_ = NULL;
- ImportPageCameraImportJob* _tmp1_ = NULL;
+ BatchImportJob* _tmp0_;
+ ImportPageCameraImportJob* _tmp1_;
#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 539 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12409,14 +12343,14 @@ 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 12406 "ImportPage.c"
+#line 12340 "ImportPage.c"
}
static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraImportJob* self) {
ImportSource* result = NULL;
- ImportSource* _tmp0_ = NULL;
- ImportSource* _tmp1_ = NULL;
+ ImportSource* _tmp0_;
+ ImportSource* _tmp1_;
#line 543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IMPORT_PAGE_IS_CAMERA_IMPORT_JOB (self), NULL);
#line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12427,7 +12361,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 12424 "ImportPage.c"
+#line 12358 "ImportPage.c"
}
@@ -12440,16 +12374,16 @@ 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 12437 "ImportPage.c"
+#line 12371 "ImportPage.c"
}
-static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile** file) {
+static gboolean import_page_camera_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file) {
ImportPageCameraImportJob * self;
guint64 _vala_filesize = 0ULL;
GFile* _vala_file = NULL;
gboolean result = FALSE;
- guint64 _tmp0_ = 0ULL;
+ guint64 _tmp0_;
#line 551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
#line 552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12466,35 +12400,35 @@ 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 12463 "ImportPage.c"
+#line 12397 "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 12469 "ImportPage.c"
+#line 12403 "ImportPage.c"
} else {
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file);
-#line 12473 "ImportPage.c"
+#line 12407 "ImportPage.c"
}
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12477 "ImportPage.c"
+#line 12411 "ImportPage.c"
}
-static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile** file_to_import, gboolean* copy_to_library, GError** error) {
+static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
ImportPageCameraImportJob * self;
GFile* _vala_file_to_import = NULL;
gboolean _vala_copy_to_library = FALSE;
gboolean result = FALSE;
GFile* dest_file = NULL;
- GFile* _tmp13_ = NULL;
- GFile* _tmp17_ = NULL;
- ImportPageCameraImportJob* _tmp26_ = NULL;
- GFile* _tmp59_ = NULL;
- GFile* _tmp60_ = NULL;
+ GFile* _tmp13_;
+ GFile* _tmp17_;
+ ImportPageCameraImportJob* _tmp26_;
+ GFile* _tmp59_;
+ GFile* _tmp60_;
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);
@@ -12506,16 +12440,16 @@ 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 12503 "ImportPage.c"
+#line 12437 "ImportPage.c"
{
gboolean collision = FALSE;
GFile* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- PhotoMetadata* _tmp2_ = NULL;
- time_t _tmp3_ = 0;
+ const gchar* _tmp1_;
+ PhotoMetadata* _tmp2_;
+ time_t _tmp3_;
gboolean _tmp4_ = FALSE;
- GFile* _tmp5_ = NULL;
- GFile* _tmp6_ = NULL;
+ GFile* _tmp5_;
+ GFile* _tmp6_;
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->filename;
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12530,8 +12464,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp0_ = _tmp5_;
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12527 "ImportPage.c"
- goto __catch72_g_error;
+#line 12461 "ImportPage.c"
+ goto __catch73_g_error;
}
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp0_;
@@ -12543,17 +12477,17 @@ 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 12540 "ImportPage.c"
+#line 12474 "ImportPage.c"
}
- goto __finally72;
- __catch72_g_error:
+ goto __finally73;
+ __catch73_g_error:
{
GError* err = NULL;
- ImportSource* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- GError* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
+ ImportSource* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ GError* _tmp10_;
+ const gchar* _tmp11_;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12574,12 +12508,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_free0 (_tmp9_);
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 12571 "ImportPage.c"
+#line 12505 "ImportPage.c"
}
- __finally72:
+ __finally73:
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12576 "ImportPage.c"
+#line 12510 "ImportPage.c"
gboolean _tmp12_ = FALSE;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12587,16 +12521,16 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp12_;
-#line 12584 "ImportPage.c"
+#line 12518 "ImportPage.c"
}
#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = dest_file;
#line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp13_ == NULL) {
-#line 12590 "ImportPage.c"
- ImportSource* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+#line 12524 "ImportPage.c"
+ ImportSource* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp14_ = self->priv->import_file;
#line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12615,34 +12549,34 @@ 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 12612 "ImportPage.c"
+#line 12546 "ImportPage.c"
} else {
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12616 "ImportPage.c"
+#line 12550 "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 12622 "ImportPage.c"
+#line 12556 "ImportPage.c"
}
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12626 "ImportPage.c"
+#line 12560 "ImportPage.c"
}
#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = dest_file;
#line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_blacklist_file (_tmp17_, "CameraImportJob.prepare");
-#line 12632 "ImportPage.c"
+#line 12566 "ImportPage.c"
{
- GPContextWrapper* _tmp18_ = NULL;
- GPContext* _tmp19_ = NULL;
- Camera* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- const gchar* _tmp22_ = NULL;
- GFile* _tmp23_ = NULL;
+ GPContextWrapper* _tmp18_;
+ GPContext* _tmp19_;
+ Camera* _tmp20_;
+ const gchar* _tmp21_;
+ const gchar* _tmp22_;
+ GFile* _tmp23_;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = self->priv->context;
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12659,22 +12593,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
gp_save_image (_tmp19_, _tmp20_, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
#line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12656 "ImportPage.c"
- goto __finally73;
+#line 12590 "ImportPage.c"
+ goto __finally74;
}
}
- __finally73:
+ __finally74:
{
- GFile* _tmp24_ = NULL;
+ GFile* _tmp24_;
#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = dest_file;
#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_unblacklist_file (_tmp24_);
-#line 12667 "ImportPage.c"
+#line 12601 "ImportPage.c"
}
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12671 "ImportPage.c"
+#line 12605 "ImportPage.c"
gboolean _tmp25_ = FALSE;
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12682,30 +12616,30 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp25_;
-#line 12679 "ImportPage.c"
+#line 12613 "ImportPage.c"
}
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp26_ = self->priv->associated;
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp26_ != NULL) {
-#line 12685 "ImportPage.c"
- BackingPhotoRow* _tmp42_ = NULL;
+#line 12619 "ImportPage.c"
+ BackingPhotoRow* _tmp42_;
GFile* assoc_dest = NULL;
- BackingPhotoRow* _tmp45_ = NULL;
- const gchar* _tmp46_ = NULL;
- GFile* _tmp47_ = NULL;
- GFile* _tmp48_ = NULL;
+ BackingPhotoRow* _tmp45_;
+ const gchar* _tmp46_;
+ GFile* _tmp47_;
+ GFile* _tmp48_;
{
BackingPhotoRow* _tmp27_ = NULL;
- GFile* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- ImportPageCameraImportJob* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- BackingPhotoRow* _tmp34_ = NULL;
- BackingPhotoRow* _tmp35_ = NULL;
- BackingPhotoRow* _tmp36_ = NULL;
+ GFile* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ ImportPageCameraImportJob* _tmp31_;
+ gchar* _tmp32_;
+ gchar* _tmp33_;
+ BackingPhotoRow* _tmp34_;
+ BackingPhotoRow* _tmp35_;
+ BackingPhotoRow* _tmp36_;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp28_ = dest_file;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12730,8 +12664,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp27_ = _tmp35_;
#line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12727 "ImportPage.c"
- goto __catch74_g_error;
+#line 12661 "ImportPage.c"
+ goto __catch75_g_error;
}
#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp36_ = _tmp27_;
@@ -12743,16 +12677,16 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
self->priv->associated_file = _tmp36_;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_backing_photo_row_unref0 (_tmp27_);
-#line 12740 "ImportPage.c"
+#line 12674 "ImportPage.c"
}
- goto __finally74;
- __catch74_g_error:
+ goto __finally75;
+ __catch75_g_error:
{
GError* err = NULL;
- ImportPageCameraImportJob* _tmp37_ = NULL;
- const gchar* _tmp38_ = NULL;
- GError* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
+ ImportPageCameraImportJob* _tmp37_;
+ const gchar* _tmp38_;
+ GError* _tmp39_;
+ const gchar* _tmp40_;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12770,12 +12704,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
": %s", _tmp38_, _tmp40_);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 12766 "ImportPage.c"
+#line 12700 "ImportPage.c"
}
- __finally74:
+ __finally75:
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12771 "ImportPage.c"
+#line 12705 "ImportPage.c"
gboolean _tmp41_ = FALSE;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12783,15 +12717,15 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp41_;
-#line 12779 "ImportPage.c"
+#line 12713 "ImportPage.c"
}
#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp42_ = self->priv->associated_file;
#line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp42_ == NULL) {
-#line 12785 "ImportPage.c"
- ImportPageCameraImportJob* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
+#line 12719 "ImportPage.c"
+ ImportPageCameraImportJob* _tmp43_;
+ const gchar* _tmp44_;
#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp43_ = self->priv->associated;
#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12806,21 +12740,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
if (file_to_import) {
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*file_to_import = _vala_file_to_import;
-#line 12802 "ImportPage.c"
+#line 12736 "ImportPage.c"
} else {
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12806 "ImportPage.c"
+#line 12740 "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 12812 "ImportPage.c"
+#line 12746 "ImportPage.c"
}
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12816 "ImportPage.c"
+#line 12750 "ImportPage.c"
}
#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = self->priv->associated_file;
@@ -12834,16 +12768,16 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp48_ = assoc_dest;
#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare");
-#line 12830 "ImportPage.c"
+#line 12764 "ImportPage.c"
{
- 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;
+ GPContextWrapper* _tmp49_;
+ GPContext* _tmp50_;
+ Camera* _tmp51_;
+ ImportPageCameraImportJob* _tmp52_;
+ const gchar* _tmp53_;
+ ImportPageCameraImportJob* _tmp54_;
+ const gchar* _tmp55_;
+ GFile* _tmp56_;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp49_ = self->priv->context;
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12864,22 +12798,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
gp_save_image (_tmp50_, _tmp51_, _tmp53_, _tmp55_, _tmp56_, &_inner_error_);
#line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12860 "ImportPage.c"
- goto __finally75;
+#line 12794 "ImportPage.c"
+ goto __finally76;
}
}
- __finally75:
+ __finally76:
{
- GFile* _tmp57_ = NULL;
+ GFile* _tmp57_;
#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp57_ = assoc_dest;
#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_unblacklist_file (_tmp57_);
-#line 12871 "ImportPage.c"
+#line 12805 "ImportPage.c"
}
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12875 "ImportPage.c"
+#line 12809 "ImportPage.c"
gboolean _tmp58_ = FALSE;
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12889,11 +12823,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp58_;
-#line 12885 "ImportPage.c"
+#line 12819 "ImportPage.c"
}
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (assoc_dest);
-#line 12889 "ImportPage.c"
+#line 12823 "ImportPage.c"
}
#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = dest_file;
@@ -12913,21 +12847,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 12909 "ImportPage.c"
+#line 12843 "ImportPage.c"
} else {
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12913 "ImportPage.c"
+#line 12847 "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 12919 "ImportPage.c"
+#line 12853 "ImportPage.c"
}
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12923 "ImportPage.c"
+#line 12857 "ImportPage.c"
}
@@ -12935,7 +12869,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
ImportPageCameraImportJob * self;
gboolean result = FALSE;
gboolean ret = FALSE;
- MediaSource* _tmp0_ = NULL;
+ MediaSource* _tmp0_;
GError * _inner_error_ = NULL;
#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
@@ -12949,11 +12883,11 @@ 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 12945 "ImportPage.c"
+#line 12879 "ImportPage.c"
Photo* photo = NULL;
- MediaSource* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- BackingPhotoRow* _tmp3_ = NULL;
+ MediaSource* _tmp1_;
+ Photo* _tmp2_;
+ BackingPhotoRow* _tmp3_;
#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = source;
#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12964,13 +12898,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 12960 "ImportPage.c"
- Photo* _tmp4_ = NULL;
- BackingPhotoRow* _tmp5_ = NULL;
- Photo* _tmp7_ = NULL;
- ConfigFacade* _tmp8_ = NULL;
- ConfigFacade* _tmp9_ = NULL;
- RawDeveloper _tmp10_ = 0;
+#line 12894 "ImportPage.c"
+ Photo* _tmp4_;
+ BackingPhotoRow* _tmp5_;
+ Photo* _tmp7_;
+ ConfigFacade* _tmp8_;
+ ConfigFacade* _tmp9_;
+ RawDeveloper _tmp10_;
#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = photo;
#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12979,7 +12913,7 @@ 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"
+#line 12909 "ImportPage.c"
gboolean _tmp6_ = FALSE;
#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12987,7 +12921,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
_g_object_unref0 (photo);
#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp6_;
-#line 12983 "ImportPage.c"
+#line 12917 "ImportPage.c"
}
#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ret = TRUE;
@@ -13003,17 +12937,17 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
photo_set_raw_developer (_tmp7_, _tmp10_);
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
-#line 12999 "ImportPage.c"
+#line 12933 "ImportPage.c"
}
#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 13003 "ImportPage.c"
+#line 12937 "ImportPage.c"
}
#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = ret;
#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13009 "ImportPage.c"
+#line 12943 "ImportPage.c"
}
@@ -13025,28 +12959,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 = (DuplicatedFile* (*)(BatchImportJob*)) 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 = (time_t (*)(BatchImportJob*)) 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 = (gchar* (*)(BatchImportJob*)) 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 = (gchar* (*)(BatchImportJob*)) 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 = (gchar* (*)(BatchImportJob*)) 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 = (gchar* (*)(BatchImportJob*)) 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 = (void (*)(BatchImportJob*, BatchImportJob*)) 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 = (gboolean (*)(BatchImportJob*)) 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 = (gboolean (*)(BatchImportJob*, guint64*, GFile**)) 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 = (gboolean (*)(BatchImportJob*, GFile**, gboolean*, GError**)) 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 = (gboolean (*)(BatchImportJob*, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
-#line 13042 "ImportPage.c"
+ ((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
+#line 12976 "ImportPage.c"
}
@@ -13057,11 +12991,11 @@ 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 13053 "ImportPage.c"
+#line 12987 "ImportPage.c"
}
-static void import_page_camera_import_job_finalize (BatchImportJob* obj) {
+static void import_page_camera_import_job_finalize (BatchImportJob * obj) {
ImportPageCameraImportJob * self;
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob);
@@ -13085,7 +13019,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 13081 "ImportPage.c"
+#line 13015 "ImportPage.c"
}
@@ -13110,27 +13044,27 @@ 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 13106 "ImportPage.c"
+#line 13040 "ImportPage.c"
}
static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 13126 "ImportPage.c"
+#line 13060 "ImportPage.c"
}
@@ -13138,11 +13072,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
ImportPageImportPageSearchViewFilter * self;
gboolean result = FALSE;
ImportSource* source = NULL;
- DataView* _tmp0_ = NULL;
- ImportSource* _tmp1_ = NULL;
+ DataView* _tmp0_;
+ ImportSource* _tmp1_;
gboolean _tmp2_ = FALSE;
- guint _tmp3_ = 0U;
- guint _tmp26_ = 0U;
+ guint _tmp3_;
+ guint _tmp26_;
#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter);
#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13157,29 +13091,29 @@ 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 13153 "ImportPage.c"
- gboolean _tmp4_ = FALSE;
+#line 13087 "ImportPage.c"
+ gboolean _tmp4_;
#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 13159 "ImportPage.c"
+#line 13093 "ImportPage.c"
} else {
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = FALSE;
-#line 13163 "ImportPage.c"
+#line 13097 "ImportPage.c"
}
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 13167 "ImportPage.c"
- ImportSource* _tmp5_ = NULL;
+#line 13101 "ImportPage.c"
+ ImportSource* _tmp5_;
#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 13173 "ImportPage.c"
- gboolean _tmp6_ = FALSE;
- gboolean _tmp7_ = FALSE;
+#line 13107 "ImportPage.c"
+ gboolean _tmp6_;
+ gboolean _tmp7_;
#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13192,20 +13126,20 @@ 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 13188 "ImportPage.c"
+#line 13122 "ImportPage.c"
}
} else {
- ImportSource* _tmp8_ = NULL;
+ ImportSource* _tmp8_;
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp8_ = source;
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13196 "ImportPage.c"
+#line 13130 "ImportPage.c"
PhotoImportSource* photo = NULL;
- ImportSource* _tmp9_ = NULL;
- PhotoImportSource* _tmp10_ = NULL;
- PhotoImportSource* _tmp11_ = NULL;
- PhotoFileFormat _tmp12_ = 0;
+ ImportSource* _tmp9_;
+ PhotoImportSource* _tmp10_;
+ PhotoImportSource* _tmp11_;
+ PhotoFileFormat _tmp12_;
#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = source;
#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13218,11 +13152,11 @@ 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 13214 "ImportPage.c"
- PhotoImportSource* _tmp13_ = NULL;
- PhotoImportSource* _tmp14_ = NULL;
- PhotoImportSource* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+#line 13148 "ImportPage.c"
+ PhotoImportSource* _tmp13_;
+ PhotoImportSource* _tmp14_;
+ PhotoImportSource* _tmp15_;
+ gboolean _tmp16_;
#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp13_ = photo;
#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13235,30 +13169,30 @@ 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 13231 "ImportPage.c"
+#line 13165 "ImportPage.c"
gboolean _tmp17_ = FALSE;
- gboolean _tmp18_ = FALSE;
- gboolean _tmp19_ = FALSE;
+ gboolean _tmp18_;
+ gboolean _tmp19_;
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp18_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp19_ = _tmp18_;
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp19_) {
-#line 13241 "ImportPage.c"
- gboolean _tmp20_ = FALSE;
- gboolean _tmp21_ = FALSE;
+#line 13175 "ImportPage.c"
+ gboolean _tmp20_;
+ gboolean _tmp21_;
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp20_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp21_ = _tmp20_;
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = !_tmp21_;
-#line 13250 "ImportPage.c"
+#line 13184 "ImportPage.c"
} else {
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp17_ = FALSE;
-#line 13254 "ImportPage.c"
+#line 13188 "ImportPage.c"
}
#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp17_) {
@@ -13270,11 +13204,11 @@ 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 13266 "ImportPage.c"
+#line 13200 "ImportPage.c"
}
} else {
- gboolean _tmp22_ = FALSE;
- gboolean _tmp23_ = FALSE;
+ gboolean _tmp22_;
+ gboolean _tmp23_;
#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp22_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13289,12 +13223,12 @@ 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 13285 "ImportPage.c"
+#line 13219 "ImportPage.c"
}
}
} else {
- gboolean _tmp24_ = FALSE;
- gboolean _tmp25_ = FALSE;
+ gboolean _tmp24_;
+ gboolean _tmp25_;
#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp24_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13309,12 +13243,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 13305 "ImportPage.c"
+#line 13239 "ImportPage.c"
}
}
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 13310 "ImportPage.c"
+#line 13244 "ImportPage.c"
}
}
}
@@ -13322,14 +13256,14 @@ 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 13318 "ImportPage.c"
+#line 13252 "ImportPage.c"
const gchar* keywords = NULL;
- ImportSource* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
- gboolean _tmp30_ = FALSE;
- gint _tmp31_ = 0;
- gchar** _tmp32_ = NULL;
+ ImportSource* _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
+ gboolean _tmp30_;
+ gint _tmp31_;
+ gchar** _tmp32_;
#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp27_ = source;
#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13348,11 +13282,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 13344 "ImportPage.c"
+#line 13278 "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 13348 "ImportPage.c"
+#line 13282 "ImportPage.c"
{
gchar** word_collection = NULL;
gint word_collection_length1 = 0;
@@ -13364,15 +13298,15 @@ 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 13360 "ImportPage.c"
+#line 13294 "ImportPage.c"
const gchar* word = NULL;
#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
word = word_collection[word_it];
-#line 13364 "ImportPage.c"
+#line 13298 "ImportPage.c"
{
- const gchar* _tmp33_ = NULL;
- const gchar* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
+ const gchar* _tmp33_;
+ const gchar* _tmp34_;
+ gboolean _tmp35_;
#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp33_ = keywords;
#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13387,7 +13321,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 13383 "ImportPage.c"
+#line 13317 "ImportPage.c"
}
}
}
@@ -13399,7 +13333,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 13395 "ImportPage.c"
+#line 13329 "ImportPage.c"
}
@@ -13409,14 +13343,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 13405 "ImportPage.c"
+#line 13339 "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 13412 "ImportPage.c"
+#line 13346 "ImportPage.c"
}
@@ -13424,10 +13358,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 = (guint (*)(SearchViewFilter*)) 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 = (gboolean (*)(ViewFilter*, DataView*)) import_page_import_page_search_view_filter_real_predicate;
-#line 13423 "ImportPage.c"
+ ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_import_page_search_view_filter_real_predicate;
+#line 13357 "ImportPage.c"
}
@@ -13450,8 +13384,8 @@ static GType import_page_import_page_search_view_filter_get_type (void) {
static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, DataView* view) {
ImportPageHideImportedViewFilter * self;
gboolean result = FALSE;
- DataView* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ DataView* _tmp0_;
+ gboolean _tmp1_;
#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter);
#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13464,7 +13398,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 13460 "ImportPage.c"
+#line 13394 "ImportPage.c"
}
@@ -13474,14 +13408,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 13470 "ImportPage.c"
+#line 13404 "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 13477 "ImportPage.c"
+#line 13411 "ImportPage.c"
}
@@ -13489,8 +13423,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 = (gboolean (*)(ViewFilter*, DataView*)) import_page_hide_imported_view_filter_real_predicate;
-#line 13486 "ImportPage.c"
+ ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_hide_imported_view_filter_real_predicate;
+#line 13420 "ImportPage.c"
}
@@ -13516,40 +13450,40 @@ 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 = (GtkToolbar* (*)(Page*)) 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 = (CoreViewTracker* (*)(CheckerboardPage*)) 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 = (gchar* (*)(CheckerboardPage*)) 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 = (gchar* (*)(CheckerboardPage*)) 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 = (void (*)(Page*, GeeList*)) 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 = (void (*)(Page*, GActionMap*)) 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 = (void (*)(Page*, GActionMap*)) 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 = (void (*)(Page*, gint, gint)) 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 = (void (*)(Page*)) 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 = (void (*)(Page*)) 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 = (void (*)(CheckerboardPage*, gboolean)) 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 = (SearchViewFilter* (*)(CheckerboardPage*)) 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 13537 "ImportPage.c"
+#line 13471 "ImportPage.c"
}
static void import_page_instance_init (ImportPage * self) {
- GtkLabel* _tmp0_ = NULL;
- GtkProgressBar* _tmp1_ = NULL;
- ImportPageImportPageSearchViewFilter* _tmp2_ = NULL;
- ImportPageHideImportedViewFilter* _tmp3_ = NULL;
+ GtkLabel* _tmp0_;
+ GtkProgressBar* _tmp1_;
+ ImportPageImportPageSearchViewFilter* _tmp2_;
+ ImportPageHideImportedViewFilter* _tmp3_;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = IMPORT_PAGE_GET_PRIVATE (self);
#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13586,16 +13520,16 @@ 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 13582 "ImportPage.c"
+#line 13516 "ImportPage.c"
}
-static void import_page_finalize (GObject* obj) {
+static void import_page_finalize (GObject * obj) {
ImportPage * self;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- VideoSourceCollection* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
+ LibraryPhotoSourceCollection* _tmp0_;
+ guint _tmp1_;
+ VideoSourceCollection* _tmp2_;
+ guint _tmp3_;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PAGE, ImportPage);
#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13640,7 +13574,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 13636 "ImportPage.c"
+#line 13570 "ImportPage.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 02:52:47 +0000