summaryrefslogtreecommitdiff
path: root/src/camera
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:57:00 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:57:00 +0200
commita9bafe967a7a664c43dec4aeb64a6f6e0f284e05 (patch)
tree653c43a63b70c47278367ad2a4e92640a6669b44 /src/camera
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parentab841afa5cb39058d9ab2cebb67cfe6369443f6e (diff)
Update upstream source from tag 'upstream/0.28.3'
Update to upstream version '0.28.3' with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7
Diffstat (limited to 'src/camera')
-rw-r--r--src/camera/Camera.c15
-rw-r--r--src/camera/CameraBranch.c618
-rw-r--r--src/camera/CameraTable.c2931
-rw-r--r--src/camera/GPhoto.c2027
-rw-r--r--src/camera/ImportPage.c9933
5 files changed, 7933 insertions, 7591 deletions
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index 0d6d3ce..6decca0 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.36.6, the Vala compiler
+/* Camera.c generated by valac 0.40.4, the Vala compiler
* generated from Camera.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
@@ -19,17 +20,21 @@ void camera_terminate (void);
void camera_branch_terminate (void);
-void camera_init (GError** error) {
+void
+camera_init (GError** error)
+{
#line 10 "/home/jens/Source/shotwell/src/camera/Camera.vala"
camera_branch_init ();
-#line 26 "Camera.c"
+#line 29 "Camera.c"
}
-void camera_terminate (void) {
+void
+camera_terminate (void)
+{
#line 14 "/home/jens/Source/shotwell/src/camera/Camera.vala"
camera_branch_terminate ();
-#line 33 "Camera.c"
+#line 38 "Camera.c"
}
diff --git a/src/camera/CameraBranch.c b/src/camera/CameraBranch.c
index 9ac4b11..17c9f52 100644
--- a/src/camera/CameraBranch.c
+++ b/src/camera/CameraBranch.c
@@ -1,4 +1,4 @@
-/* CameraBranch.c generated by valac 0.36.6, the Vala compiler
+/* CameraBranch.c generated by valac 0.40.4, the Vala compiler
* generated from CameraBranch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gee.h>
@@ -70,6 +71,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
typedef struct _CameraSidebarEntry CameraSidebarEntry;
typedef struct _CameraSidebarEntryClass CameraSidebarEntryClass;
+enum {
+ CAMERA_BRANCH_0_PROPERTY,
+ CAMERA_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* camera_branch_properties[CAMERA_BRANCH_NUM_PROPERTIES];
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define SIDEBAR_TYPE_GROUPING (sidebar_grouping_get_type ())
@@ -161,6 +167,11 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate;
typedef struct _CameraHeaderPrivate CameraHeaderPrivate;
+enum {
+ CAMERA_HEADER_0_PROPERTY,
+ CAMERA_HEADER_NUM_PROPERTIES
+};
+static GParamSpec* camera_header_properties[CAMERA_HEADER_NUM_PROPERTIES];
#define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
#define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
@@ -197,6 +208,11 @@ typedef struct _SidebarContextable SidebarContextable;
typedef struct _SidebarContextableIface SidebarContextableIface;
typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
typedef struct _CameraSidebarEntryPrivate CameraSidebarEntryPrivate;
+enum {
+ CAMERA_SIDEBAR_ENTRY_0_PROPERTY,
+ CAMERA_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* camera_sidebar_entry_properties[CAMERA_SIDEBAR_ENTRY_NUM_PROPERTIES];
typedef struct _DiscoveredCameraPrivate DiscoveredCameraPrivate;
#define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
@@ -375,17 +391,20 @@ GType sidebar_branch_get_type (void) G_GNUC_CONST;
GType camera_branch_get_type (void) G_GNUC_CONST;
gpointer discovered_camera_ref (gpointer instance);
void discovered_camera_unref (gpointer instance);
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_discovered_camera (GValue* value, gpointer v_object);
-void value_take_discovered_camera (GValue* value, gpointer v_object);
+GParamSpec* param_spec_discovered_camera (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_discovered_camera (GValue* value,
+ gpointer v_object);
+void value_take_discovered_camera (GValue* value,
+ gpointer v_object);
gpointer value_get_discovered_camera (const GValue* value);
GType discovered_camera_get_type (void) G_GNUC_CONST;
GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
GType camera_sidebar_entry_get_type (void) G_GNUC_CONST;
#define CAMERA_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAMERA_TYPE_BRANCH, CameraBranchPrivate))
-enum {
- CAMERA_BRANCH_DUMMY_PROPERTY
-};
#define RESOURCES_ICON_CAMERAS "camera-photo"
CameraBranch* camera_branch_new (void);
CameraBranch* camera_branch_construct (GType object_type);
@@ -397,96 +416,144 @@ GType camera_header_get_type (void) G_GNUC_CONST;
GType sidebar_tree_get_type (void) G_GNUC_CONST;
GType sidebar_entry_get_type (void) G_GNUC_CONST;
GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
-static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
+static gint camera_branch_camera_comparator (SidebarEntry* a,
+ SidebarEntry* b);
+static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+ SidebarBranchOptions options,
+ GCompareFunc default_comparator,
+ GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+ SidebarEntry* root,
+ SidebarBranchOptions options,
+ GCompareFunc default_comparator,
+ GCompareFunc root_comparator);
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);
-void value_set_camera_table (GValue* value, gpointer v_object);
-void value_take_camera_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_camera_table (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_camera_table (GValue* value,
+ gpointer v_object);
+void value_take_camera_table (GValue* value,
+ gpointer v_object);
gpointer value_get_camera_table (const GValue* value);
GType camera_table_get_type (void) G_GNUC_CONST;
CameraTable* camera_table_get_instance (void);
GeeIterable* camera_table_get_cameras (CameraTable* self);
-static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera);
-static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera);
-static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self);
-static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera);
-static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self);
+static void camera_branch_add_camera (CameraBranch* self,
+ DiscoveredCamera* camera);
+static void camera_branch_on_camera_added (CameraBranch* self,
+ DiscoveredCamera* camera);
+static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+ DiscoveredCamera* camera,
+ gpointer self);
+static void camera_branch_on_camera_removed (CameraBranch* self,
+ DiscoveredCamera* camera);
+static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender,
+ DiscoveredCamera* camera,
+ gpointer self);
void camera_branch_init (void);
void camera_branch_terminate (void);
gchar* sidebar_entry_get_sidebar_name (SidebarEntry* self);
gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self);
-CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera);
-static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera);
+CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self,
+ DiscoveredCamera* camera);
+static void camera_branch_remove_camera (CameraBranch* self,
+ DiscoveredCamera* camera);
CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera);
-CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type,
+ DiscoveredCamera* camera);
+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);
+void sidebar_branch_prune (SidebarBranch* self,
+ SidebarEntry* entry);
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;
-enum {
- CAMERA_HEADER_DUMMY_PROPERTY
-};
-SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name,
+ const gchar* tooltip,
+ gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type,
+ const gchar* name,
+ const gchar* tooltip,
+ gboolean emphasized);
GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
GType page_get_type (void) G_GNUC_CONST;
GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
GType sidebar_contextable_get_type (void) G_GNUC_CONST;
#define CAMERA_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntryPrivate))
-enum {
- CAMERA_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self);
gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self);
-ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
-ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
+ImportPage* import_page_new (Camera* camera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon);
+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 gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_camera_branch_camera_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b)
+{
gint result;
result = camera_branch_camera_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 465 "CameraBranch.c"
+#line 522 "CameraBranch.c"
}
-static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
+static void
+_camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+ DiscoveredCamera* camera,
+ gpointer self)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_on_camera_added ((CameraBranch*) self, camera);
-#line 472 "CameraBranch.c"
+#line 533 "CameraBranch.c"
}
-static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
+static void
+_camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender,
+ DiscoveredCamera* camera,
+ gpointer self)
+{
#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_on_camera_removed ((CameraBranch*) self, camera);
-#line 479 "CameraBranch.c"
+#line 544 "CameraBranch.c"
}
-CameraBranch* camera_branch_construct (GType object_type) {
+CameraBranch*
+camera_branch_construct (GType object_type)
+{
CameraBranch * self = NULL;
CameraHeader* _tmp0_;
CameraHeader* _tmp1_;
+ CameraTable* _tmp12_;
CameraTable* _tmp13_;
CameraTable* _tmp14_;
CameraTable* _tmp15_;
- CameraTable* _tmp16_;
#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = camera_header_new ();
#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -495,7 +562,7 @@ CameraBranch* camera_branch_construct (GType object_type) {
self = (CameraBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, _camera_branch_camera_comparator_gcompare_func, NULL);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (_tmp1_);
-#line 499 "CameraBranch.c"
+#line 566 "CameraBranch.c"
{
GeeIterator* _camera_it = NULL;
CameraTable* _tmp2_;
@@ -524,226 +591,212 @@ CameraBranch* camera_branch_construct (GType object_type) {
_camera_it = _tmp7_;
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
while (TRUE) {
-#line 528 "CameraBranch.c"
+#line 595 "CameraBranch.c"
GeeIterator* _tmp8_;
- gboolean _tmp9_;
DiscoveredCamera* camera = NULL;
- GeeIterator* _tmp10_;
- gpointer _tmp11_;
- DiscoveredCamera* _tmp12_;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
+ DiscoveredCamera* _tmp11_;
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp8_ = _camera_it;
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp9_ = gee_iterator_next (_tmp8_);
-#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- if (!_tmp9_) {
+ if (!gee_iterator_next (_tmp8_)) {
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
break;
-#line 543 "CameraBranch.c"
+#line 607 "CameraBranch.c"
}
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp10_ = _camera_it;
+ _tmp9_ = _camera_it;
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp11_ = gee_iterator_get (_tmp10_);
+ _tmp10_ = gee_iterator_get (_tmp9_);
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- camera = (DiscoveredCamera*) _tmp11_;
+ camera = (DiscoveredCamera*) _tmp10_;
#line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp12_ = camera;
+ _tmp11_ = camera;
#line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- camera_branch_add_camera (self, _tmp12_);
+ camera_branch_add_camera (self, _tmp11_);
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_discovered_camera_unref0 (camera);
-#line 557 "CameraBranch.c"
+#line 621 "CameraBranch.c"
}
#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (_camera_it);
-#line 561 "CameraBranch.c"
+#line 625 "CameraBranch.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp13_ = camera_table_get_instance ();
+ _tmp12_ = camera_table_get_instance ();
#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- g_signal_connect_object (_tmp14_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0);
+ g_signal_connect_object (_tmp13_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _camera_table_unref0 (_tmp14_);
+ _camera_table_unref0 (_tmp13_);
#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp15_ = camera_table_get_instance ();
+ _tmp14_ = camera_table_get_instance ();
#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- g_signal_connect_object (_tmp16_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0);
+ g_signal_connect_object (_tmp15_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0);
#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _camera_table_unref0 (_tmp16_);
+ _camera_table_unref0 (_tmp15_);
#line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self;
-#line 581 "CameraBranch.c"
+#line 645 "CameraBranch.c"
}
-CameraBranch* camera_branch_new (void) {
+CameraBranch*
+camera_branch_new (void)
+{
#line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return camera_branch_construct (CAMERA_TYPE_BRANCH);
-#line 588 "CameraBranch.c"
+#line 654 "CameraBranch.c"
}
-void camera_branch_init (void) {
+void
+camera_branch_init (void)
+{
}
-void camera_branch_terminate (void) {
+void
+camera_branch_terminate (void)
+{
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self ? g_object_ref (self) : NULL;
-#line 603 "CameraBranch.c"
+#line 675 "CameraBranch.c"
}
-static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+camera_branch_camera_comparator (SidebarEntry* a,
+ SidebarEntry* b)
+{
gint result = 0;
- SidebarEntry* _tmp0_;
- SidebarEntry* _tmp1_;
gint ret = 0;
- SidebarEntry* _tmp2_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- SidebarEntry* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- gint _tmp8_;
- gint _tmp9_;
- gint _tmp10_;
+ gint _tmp4_;
+ gint _tmp5_;
#line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp0_ = a;
-#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp1_ = b;
-#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- if (_tmp0_ == _tmp1_) {
+ if (a == b) {
#line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = 0;
#line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 635 "CameraBranch.c"
+#line 701 "CameraBranch.c"
}
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp2_ = a;
-#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp3_ = sidebar_entry_get_sidebar_name (_tmp2_);
-#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp4_ = _tmp3_;
+ _tmp0_ = sidebar_entry_get_sidebar_name (a);
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp5_ = b;
-#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp6_ = sidebar_entry_get_sidebar_name (_tmp5_);
+ _tmp1_ = _tmp0_;
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp7_ = _tmp6_;
+ _tmp2_ = sidebar_entry_get_sidebar_name (b);
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp8_ = g_utf8_collate (_tmp4_, _tmp7_);
+ _tmp3_ = _tmp2_;
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = g_utf8_collate (_tmp1_, _tmp3_);
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp3_);
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp1_);
#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- ret = _tmp9_;
+ ret = _tmp4_;
#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp10_ = ret;
+ _tmp5_ = ret;
#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- if (_tmp10_ == 0) {
-#line 663 "CameraBranch.c"
+ if (_tmp5_ == 0) {
+#line 723 "CameraBranch.c"
CameraSidebarEntry* cam_a = NULL;
- SidebarEntry* _tmp11_;
- CameraSidebarEntry* _tmp12_;
+ CameraSidebarEntry* _tmp6_;
CameraSidebarEntry* cam_b = NULL;
- SidebarEntry* _tmp13_;
+ CameraSidebarEntry* _tmp7_;
+ gboolean _tmp8_ = FALSE;
+ CameraSidebarEntry* _tmp9_;
+ CameraSidebarEntry* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
CameraSidebarEntry* _tmp14_;
- gboolean _tmp15_ = FALSE;
- CameraSidebarEntry* _tmp16_;
- CameraSidebarEntry* _tmp18_;
- gchar* _tmp19_;
- gchar* _tmp20_;
- CameraSidebarEntry* _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
- gint _tmp24_;
-#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp11_ = a;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp11_) : NULL);
+ _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (a, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) a) : NULL);
#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- cam_a = _tmp12_;
+ cam_a = _tmp6_;
#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp13_ = b;
+ _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (b, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) b) : NULL);
#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp13_) : NULL);
-#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- cam_b = _tmp14_;
+ cam_b = _tmp7_;
#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp16_ = cam_a;
+ _tmp9_ = cam_a;
#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- if (_tmp16_ != NULL) {
-#line 695 "CameraBranch.c"
- CameraSidebarEntry* _tmp17_;
+ if (_tmp9_ != NULL) {
+#line 748 "CameraBranch.c"
+ CameraSidebarEntry* _tmp10_;
#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp17_ = cam_b;
+ _tmp10_ = cam_b;
#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp15_ = _tmp17_ != NULL;
-#line 701 "CameraBranch.c"
+ _tmp8_ = _tmp10_ != NULL;
+#line 754 "CameraBranch.c"
} else {
#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp15_ = FALSE;
-#line 705 "CameraBranch.c"
+ _tmp8_ = FALSE;
+#line 758 "CameraBranch.c"
}
#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _vala_assert (_tmp15_, "cam_a != null && cam_b != null");
-#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp18_ = cam_a;
+ _vala_assert (_tmp8_, "cam_a != null && cam_b != null");
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp19_ = camera_sidebar_entry_get_uri (_tmp18_);
+ _tmp11_ = cam_a;
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp20_ = _tmp19_;
+ _tmp12_ = camera_sidebar_entry_get_uri (_tmp11_);
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp21_ = cam_b;
+ _tmp13_ = _tmp12_;
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp22_ = camera_sidebar_entry_get_uri (_tmp21_);
+ _tmp14_ = cam_b;
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp23_ = _tmp22_;
+ _tmp15_ = camera_sidebar_entry_get_uri (_tmp14_);
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp24_ = g_utf8_collate (_tmp20_, _tmp23_);
+ _tmp16_ = _tmp15_;
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- ret = _tmp24_;
+ ret = g_utf8_collate (_tmp13_, _tmp16_);
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _g_free0 (_tmp23_);
+ _g_free0 (_tmp16_);
#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _g_free0 (_tmp20_);
+ _g_free0 (_tmp13_);
#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (cam_b);
#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (cam_a);
-#line 733 "CameraBranch.c"
+#line 784 "CameraBranch.c"
}
#line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
result = ret;
#line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 739 "CameraBranch.c"
+#line 790 "CameraBranch.c"
}
-CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera) {
+CameraSidebarEntry*
+camera_branch_get_entry_for_camera (CameraBranch* self,
+ DiscoveredCamera* camera)
+{
CameraSidebarEntry* result = NULL;
GeeHashMap* _tmp0_;
- DiscoveredCamera* _tmp1_;
- gpointer _tmp2_;
+ gpointer _tmp1_;
#line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL);
#line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -751,56 +804,53 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc
#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->camera_map;
#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp1_ = camera;
-#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera);
#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- result = (CameraSidebarEntry*) _tmp2_;
+ result = (CameraSidebarEntry*) _tmp1_;
#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 762 "CameraBranch.c"
+#line 813 "CameraBranch.c"
}
-static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) {
- DiscoveredCamera* _tmp0_;
+static void
+camera_branch_on_camera_added (CameraBranch* self,
+ DiscoveredCamera* camera)
+{
#line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp0_ = camera;
-#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- camera_branch_add_camera (self, _tmp0_);
-#line 776 "CameraBranch.c"
+ camera_branch_add_camera (self, camera);
+#line 827 "CameraBranch.c"
}
-static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) {
- DiscoveredCamera* _tmp0_;
+static void
+camera_branch_on_camera_removed (CameraBranch* self,
+ DiscoveredCamera* camera)
+{
#line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp0_ = camera;
-#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- camera_branch_remove_camera (self, _tmp0_);
-#line 790 "CameraBranch.c"
+ camera_branch_remove_camera (self, camera);
+#line 841 "CameraBranch.c"
}
-static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* camera) {
+static void
+camera_branch_add_camera (CameraBranch* self,
+ DiscoveredCamera* camera)
+{
GeeHashMap* _tmp0_;
- DiscoveredCamera* _tmp1_;
- gboolean _tmp2_;
CameraSidebarEntry* entry = NULL;
- DiscoveredCamera* _tmp3_;
- CameraSidebarEntry* _tmp4_;
- GeeHashMap* _tmp5_;
- DiscoveredCamera* _tmp6_;
- SidebarEntry* _tmp7_;
- SidebarEntry* _tmp8_;
+ CameraSidebarEntry* _tmp1_;
+ GeeHashMap* _tmp2_;
+ SidebarEntry* _tmp3_;
+ SidebarEntry* _tmp4_;
#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -808,49 +858,40 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came
#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->camera_map;
#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp1_ = camera;
-#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _vala_assert (!_tmp2_, "!camera_map.has_key(camera)");
+ _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera), "!camera_map.has_key(camera)");
#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp3_ = camera;
+ _tmp1_ = camera_sidebar_entry_new (camera);
#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp4_ = camera_sidebar_entry_new (_tmp3_);
-#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- entry = _tmp4_;
-#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp5_ = self->priv->camera_map;
+ entry = _tmp1_;
#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp6_ = camera;
+ _tmp2_ = self->priv->camera_map;
#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, entry);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera, entry);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp7_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp3_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp8_ = _tmp7_;
+ _tmp4_ = _tmp3_;
#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _g_object_unref0 (_tmp8_);
+ _g_object_unref0 (_tmp4_);
#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (entry);
-#line 839 "CameraBranch.c"
+#line 881 "CameraBranch.c"
}
-static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* camera) {
+static void
+camera_branch_remove_camera (CameraBranch* self,
+ DiscoveredCamera* camera)
+{
GeeHashMap* _tmp0_;
- DiscoveredCamera* _tmp1_;
- gboolean _tmp2_;
CameraSidebarEntry* entry = NULL;
- GeeHashMap* _tmp3_;
- DiscoveredCamera* _tmp4_;
- gpointer _tmp5_;
+ GeeHashMap* _tmp1_;
+ gpointer _tmp2_;
gboolean removed = FALSE;
- GeeHashMap* _tmp6_;
- DiscoveredCamera* _tmp7_;
- gboolean _tmp8_;
+ GeeHashMap* _tmp3_;
+ gboolean _tmp4_;
#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_if_fail (CAMERA_IS_BRANCH (self));
#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -858,40 +899,34 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c
#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = self->priv->camera_map;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp1_ = camera;
-#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _vala_assert (_tmp2_, "camera_map.has_key(camera)");
-#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp3_ = self->priv->camera_map;
+ _vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera), "camera_map.has_key(camera)");
#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp4_ = camera;
+ _tmp1_ = self->priv->camera_map;
#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+ _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera);
#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- entry = (CameraSidebarEntry*) _tmp5_;
+ entry = (CameraSidebarEntry*) _tmp2_;
#line 74 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_vala_assert (entry != NULL, "entry != null");
#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp6_ = self->priv->camera_map;
-#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp7_ = camera;
+ _tmp3_ = self->priv->camera_map;
#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, NULL);
+ _tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), camera, NULL);
#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- removed = _tmp8_;
+ removed = _tmp4_;
#line 77 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_vala_assert (removed, "removed");
#line 79 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_object_unref0 (entry);
-#line 891 "CameraBranch.c"
+#line 924 "CameraBranch.c"
}
-static void camera_branch_class_init (CameraBranchClass * klass) {
+static void
+camera_branch_class_init (CameraBranchClass * klass)
+{
gchar* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_parent_class = g_type_class_peek_parent (klass);
@@ -903,11 +938,13 @@ static void camera_branch_class_init (CameraBranchClass * klass) {
_tmp0_ = g_strdup (RESOURCES_ICON_CAMERAS);
#line 8 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_branch_cameras_icon = _tmp0_;
-#line 907 "CameraBranch.c"
+#line 942 "CameraBranch.c"
}
-static void camera_branch_instance_init (CameraBranch * self) {
+static void
+camera_branch_instance_init (CameraBranch * self)
+{
GeeHashMap* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv = CAMERA_BRANCH_GET_PRIVATE (self);
@@ -915,11 +952,13 @@ static void camera_branch_instance_init (CameraBranch * self) {
_tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv->camera_map = _tmp0_;
-#line 919 "CameraBranch.c"
+#line 956 "CameraBranch.c"
}
-static void camera_branch_finalize (GObject * obj) {
+static void
+camera_branch_finalize (GObject * obj)
+{
CameraBranch * self;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch);
@@ -927,11 +966,13 @@ static void camera_branch_finalize (GObject * obj) {
_g_object_unref0 (self->priv->camera_map);
#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
G_OBJECT_CLASS (camera_branch_parent_class)->finalize (obj);
-#line 931 "CameraBranch.c"
+#line 970 "CameraBranch.c"
}
-GType camera_branch_get_type (void) {
+GType
+camera_branch_get_type (void)
+{
static volatile gsize camera_branch_type_id__volatile = 0;
if (g_once_init_enter (&camera_branch_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CameraBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraBranch), 0, (GInstanceInitFunc) camera_branch_instance_init, NULL };
@@ -943,35 +984,45 @@ GType camera_branch_get_type (void) {
}
-CameraHeader* camera_header_construct (GType object_type) {
+CameraHeader*
+camera_header_construct (GType object_type)
+{
CameraHeader * self = NULL;
#line 85 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), _ ("List of all discovered camera devices"), TRUE);
#line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self;
-#line 953 "CameraBranch.c"
+#line 996 "CameraBranch.c"
}
-CameraHeader* camera_header_new (void) {
+CameraHeader*
+camera_header_new (void)
+{
#line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return camera_header_construct (CAMERA_TYPE_HEADER);
-#line 960 "CameraBranch.c"
+#line 1005 "CameraBranch.c"
}
-static void camera_header_class_init (CameraHeaderClass * klass) {
+static void
+camera_header_class_init (CameraHeaderClass * klass)
+{
#line 83 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_header_parent_class = g_type_class_peek_parent (klass);
-#line 967 "CameraBranch.c"
+#line 1014 "CameraBranch.c"
}
-static void camera_header_instance_init (CameraHeader * self) {
+static void
+camera_header_instance_init (CameraHeader * self)
+{
}
-GType camera_header_get_type (void) {
+GType
+camera_header_get_type (void)
+{
static volatile gsize camera_header_type_id__volatile = 0;
if (g_once_init_enter (&camera_header_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CameraHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraHeader), 0, (GInstanceInitFunc) camera_header_instance_init, NULL };
@@ -983,56 +1034,59 @@ GType camera_header_get_type (void) {
}
-static gpointer _discovered_camera_ref0 (gpointer self) {
+static gpointer
+_discovered_camera_ref0 (gpointer self)
+{
#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self ? discovered_camera_ref (self) : NULL;
-#line 990 "CameraBranch.c"
+#line 1043 "CameraBranch.c"
}
-CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, DiscoveredCamera* camera) {
+CameraSidebarEntry*
+camera_sidebar_entry_construct (GType object_type,
+ DiscoveredCamera* camera)
+{
CameraSidebarEntry * self = NULL;
DiscoveredCamera* _tmp0_;
- DiscoveredCamera* _tmp1_;
- DiscoveredCamera* _tmp2_;
- const gchar* _tmp3_;
- gchar* _tmp4_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self = (CameraSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp0_ = camera;
-#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp1_ = _discovered_camera_ref0 (_tmp0_);
+ _tmp0_ = _discovered_camera_ref0 (camera);
#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_discovered_camera_unref0 (self->priv->camera);
#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- self->priv->camera = _tmp1_;
+ self->priv->camera = _tmp0_;
#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp2_ = camera;
+ _tmp1_ = camera->uri;
#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp3_ = _tmp2_->uri;
-#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- _tmp4_ = g_strdup (_tmp3_);
+ _tmp2_ = g_strdup (_tmp1_);
#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_g_free0 (self->priv->uri);
#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
- self->priv->uri = _tmp4_;
+ self->priv->uri = _tmp2_;
#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return self;
-#line 1025 "CameraBranch.c"
+#line 1075 "CameraBranch.c"
}
-CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) {
+CameraSidebarEntry*
+camera_sidebar_entry_new (DiscoveredCamera* camera)
+{
#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera);
-#line 1032 "CameraBranch.c"
+#line 1084 "CameraBranch.c"
}
-static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
CameraSidebarEntry * self;
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
@@ -1051,7 +1105,7 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
if (_tmp0_ == NULL) {
#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = _ ("Camera");
-#line 1055 "CameraBranch.c"
+#line 1109 "CameraBranch.c"
}
#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = g_strdup (_tmp0_);
@@ -1059,11 +1113,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
result = _tmp3_;
#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1063 "CameraBranch.c"
+#line 1117 "CameraBranch.c"
}
-static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
CameraSidebarEntry * self;
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
@@ -1080,13 +1136,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
_tmp0_ = _tmp2_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
if (_tmp0_ == NULL) {
-#line 1084 "CameraBranch.c"
+#line 1140 "CameraBranch.c"
const gchar* _tmp3_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp3_ = camera_branch_cameras_icon;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp0_ = _tmp3_;
-#line 1090 "CameraBranch.c"
+#line 1146 "CameraBranch.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
_tmp4_ = g_strdup (_tmp0_);
@@ -1094,11 +1150,13 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
result = _tmp4_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1098 "CameraBranch.c"
+#line 1154 "CameraBranch.c"
}
-static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
CameraSidebarEntry * self;
Page* result = NULL;
DiscoveredCamera* _tmp0_;
@@ -1140,11 +1198,13 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base
result = _tmp8_;
#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1144 "CameraBranch.c"
+#line 1202 "CameraBranch.c"
}
-gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
+gchar*
+camera_sidebar_entry_get_uri (CameraSidebarEntry* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -1158,11 +1218,13 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
result = _tmp1_;
#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
return result;
-#line 1162 "CameraBranch.c"
+#line 1222 "CameraBranch.c"
}
-static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
+static void
+camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass)
+{
#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
camera_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
@@ -1175,18 +1237,22 @@ static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_create_page;
#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize;
-#line 1179 "CameraBranch.c"
+#line 1241 "CameraBranch.c"
}
-static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) {
+static void
+camera_sidebar_entry_instance_init (CameraSidebarEntry * self)
+{
#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1186 "CameraBranch.c"
+#line 1250 "CameraBranch.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/CameraBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
@@ -1196,11 +1262,13 @@ static void camera_sidebar_entry_finalize (GObject * obj) {
_g_free0 (self->priv->uri);
#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj);
-#line 1200 "CameraBranch.c"
+#line 1266 "CameraBranch.c"
}
-GType camera_sidebar_entry_get_type (void) {
+GType
+camera_sidebar_entry_get_type (void)
+{
static volatile gsize camera_sidebar_entry_type_id__volatile = 0;
if (g_once_init_enter (&camera_sidebar_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CameraSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraSidebarEntry), 0, (GInstanceInitFunc) camera_sidebar_entry_instance_init, NULL };
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 5c3c502..f0f37e6 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.36.6, the Vala compiler
+/* CameraTable.c generated by valac 0.40.4, the Vala compiler
* generated from CameraTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gphoto2/gphoto2-camera.h>
@@ -107,9 +108,9 @@ typedef struct _ParamSpecCameraTable ParamSpecCameraTable;
enum {
CAMERA_TABLE_CAMERA_ADDED_SIGNAL,
CAMERA_TABLE_CAMERA_REMOVED_SIGNAL,
- CAMERA_TABLE_LAST_SIGNAL
+ CAMERA_TABLE_NUM_SIGNALS
};
-static guint camera_table_signals[CAMERA_TABLE_LAST_SIGNAL] = {0};
+static guint camera_table_signals[CAMERA_TABLE_NUM_SIGNALS] = {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; }
@@ -171,97 +172,167 @@ static CameraTable* camera_table_instance = NULL;
gpointer discovered_camera_ref (gpointer instance);
void discovered_camera_unref (gpointer instance);
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_discovered_camera (GValue* value, gpointer v_object);
-void value_take_discovered_camera (GValue* value, gpointer v_object);
+GParamSpec* param_spec_discovered_camera (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_discovered_camera (GValue* value,
+ gpointer v_object);
+void value_take_discovered_camera (GValue* value,
+ gpointer v_object);
gpointer value_get_discovered_camera (const GValue* value);
GType discovered_camera_get_type (void) G_GNUC_CONST;
-enum {
- DISCOVERED_CAMERA_DUMMY_PROPERTY
-};
-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);
+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);
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);
-void value_set_camera_table (GValue* value, gpointer v_object);
-void value_take_camera_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_camera_table (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_camera_table (GValue* value,
+ gpointer v_object);
+void value_take_camera_table (GValue* value,
+ gpointer v_object);
gpointer value_get_camera_table (const GValue* value);
GType camera_table_get_type (void) G_GNUC_CONST;
gpointer one_shot_scheduler_ref (gpointer instance);
void one_shot_scheduler_unref (gpointer instance);
-GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_one_shot_scheduler (GValue* value, gpointer v_object);
-void value_take_one_shot_scheduler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_one_shot_scheduler (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_one_shot_scheduler (GValue* value,
+ gpointer v_object);
+void value_take_one_shot_scheduler (GValue* value,
+ gpointer v_object);
gpointer value_get_one_shot_scheduler (const GValue* value);
GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
#define CAMERA_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CAMERA_TABLE, CameraTablePrivate))
-enum {
- CAMERA_TABLE_DUMMY_PROPERTY
-};
#define CAMERA_TABLE_UPDATE_DELAY_MSEC 1000
static CameraTable* camera_table_new (void);
static CameraTable* camera_table_construct (GType object_type);
static void camera_table_on_update_cameras (CameraTable* self);
static void _camera_table_on_update_cameras_one_shot_callback (gpointer self);
-OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
-OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
-static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device);
-static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self);
-void camera_table_on_volume_changed (CameraTable* self, GVolume* volume);
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self);
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self);
+OneShotScheduler* one_shot_scheduler_new (const gchar* name,
+ OneShotCallback callback,
+ void* callback_target);
+OneShotScheduler* one_shot_scheduler_construct (GType object_type,
+ const gchar* name,
+ OneShotCallback callback,
+ void* callback_target);
+static void camera_table_on_udev_event (CameraTable* self,
+ const gchar* action,
+ GUdevDevice* device);
+static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender,
+ const gchar* action,
+ GUdevDevice* device,
+ gpointer self);
+void camera_table_on_volume_changed (CameraTable* self,
+ GVolume* volume);
+static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender,
+ GVolume* volume,
+ gpointer self);
+static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender,
+ GVolume* volume,
+ gpointer self);
static gboolean camera_table_delayed_init (CameraTable* self);
static gboolean _camera_table_delayed_init_gsource_func (gpointer self);
GType page_window_get_type (void) G_GNUC_CONST;
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
GType library_window_get_type (void) G_GNUC_CONST;
-void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable);
+void library_window_set_page_switching_enabled (LibraryWindow* self,
+ gboolean should_enable);
GQuark gphoto_error_quark (void);
-static void camera_table_init_camera_table (CameraTable* self, GError** error);
-static void camera_table_update_camera_table (CameraTable* self, GError** error);
+static void camera_table_init_camera_table (CameraTable* self,
+ GError** error);
+static void camera_table_update_camera_table (CameraTable* self,
+ GError** error);
CameraTable* camera_table_get_instance (void);
GeeIterable* camera_table_get_cameras (CameraTable* self);
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_add69 (gchar** * array, int* length, int* size, gchar* value);
+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_add69 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value);
static void _g_object_unref0_ (gpointer var);
-static void _g_list_free__g_object_unref0_ (GList* self);
-static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port);
+static inline 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);
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_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
-void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
-static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static 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_add70 (DiscoveredCamera** * array,
+ int* length,
+ int* size,
+ DiscoveredCamera* value);
+void one_shot_scheduler_after_timeout (OneShotScheduler* self,
+ guint msec,
+ gboolean reschedule);
+static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
static void camera_table_finalize (CameraTable * obj);
-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);
+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);
static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL};
-static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
+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 252 "CameraTable.c"
+#line 321 "CameraTable.c"
}
-DiscoveredCamera* discovered_camera_construct (GType object_type, 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)
+{
DiscoveredCamera* self = NULL;
Camera* _tmp0_;
- Camera* _tmp1_;
- const gchar* _tmp2_;
+ gchar* _tmp1_;
+ 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"
@@ -271,148 +342,170 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self = (DiscoveredCamera*) g_type_create_instance (object_type);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = gcamera;
-#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
+ _tmp0_ = _GPHOTO_REF_CAMERA0 (gcamera);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (self->gcamera);
#line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->gcamera = _tmp1_;
+ self->gcamera = _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = uri;
-#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (uri);
#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->uri);
#line 15 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->uri = _tmp3_;
-#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = display_name;
+ self->uri = _tmp1_;
#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp2_ = g_strdup (display_name);
#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->display_name);
#line 16 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->display_name = _tmp5_;
-#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = icon;
+ self->display_name = _tmp2_;
#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = g_strdup (_tmp6_);
+ _tmp3_ = g_strdup (icon);
#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (self->icon);
#line 17 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- self->icon = _tmp7_;
+ self->icon = _tmp3_;
#line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return self;
-#line 308 "CameraTable.c"
+#line 371 "CameraTable.c"
}
-DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
+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 315 "CameraTable.c"
+#line 383 "CameraTable.c"
}
-static void value_discovered_camera_init (GValue* value) {
+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 322 "CameraTable.c"
+#line 392 "CameraTable.c"
}
-static void value_discovered_camera_free_value (GValue* value) {
+static void
+value_discovered_camera_free_value (GValue* value)
+{
#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"
discovered_camera_unref (value->data[0].v_pointer);
-#line 331 "CameraTable.c"
+#line 403 "CameraTable.c"
}
}
-static void value_discovered_camera_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_discovered_camera_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 341 "CameraTable.c"
+#line 416 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 345 "CameraTable.c"
+#line 420 "CameraTable.c"
}
}
-static gpointer value_discovered_camera_peek_pointer (const GValue* value) {
+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 353 "CameraTable.c"
+#line 430 "CameraTable.c"
}
-static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 360 "CameraTable.c"
+#line 442 "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 367 "CameraTable.c"
+#line 449 "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 371 "CameraTable.c"
+#line 453 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = discovered_camera_ref (object);
-#line 375 "CameraTable.c"
+#line 457 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 379 "CameraTable.c"
+#line 461 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 383 "CameraTable.c"
+#line 465 "CameraTable.c"
}
-static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_discovered_camera_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
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 394 "CameraTable.c"
+#line 481 "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 400 "CameraTable.c"
+#line 487 "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 404 "CameraTable.c"
+#line 491 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 408 "CameraTable.c"
+#line 495 "CameraTable.c"
}
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 412 "CameraTable.c"
+#line 499 "CameraTable.c"
}
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_discovered_camera (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecDiscoveredCamera* spec;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_DISCOVERED_CAMERA), NULL);
@@ -422,20 +515,25 @@ 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 426 "CameraTable.c"
+#line 519 "CameraTable.c"
}
-gpointer value_get_discovered_camera (const GValue* value) {
+gpointer
+value_get_discovered_camera (const GValue* value)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 435 "CameraTable.c"
+#line 530 "CameraTable.c"
}
-void value_set_discovered_camera (GValue* value, gpointer v_object) {
+void
+value_set_discovered_camera (GValue* value,
+ gpointer v_object)
+{
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));
@@ -451,22 +549,25 @@ 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 455 "CameraTable.c"
+#line 553 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 459 "CameraTable.c"
+#line 557 "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 465 "CameraTable.c"
+#line 563 "CameraTable.c"
}
}
-void value_take_discovered_camera (GValue* value, gpointer v_object) {
+void
+value_take_discovered_camera (GValue* value,
+ gpointer v_object)
+{
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));
@@ -480,38 +581,44 @@ 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 484 "CameraTable.c"
+#line 585 "CameraTable.c"
} else {
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 488 "CameraTable.c"
+#line 589 "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 494 "CameraTable.c"
+#line 595 "CameraTable.c"
}
}
-static void discovered_camera_class_init (DiscoveredCameraClass * klass) {
+static void
+discovered_camera_class_init (DiscoveredCameraClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 504 "CameraTable.c"
+#line 607 "CameraTable.c"
}
-static void discovered_camera_instance_init (DiscoveredCamera * self) {
+static void
+discovered_camera_instance_init (DiscoveredCamera * self)
+{
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
self->ref_count = 1;
-#line 511 "CameraTable.c"
+#line 616 "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);
@@ -525,11 +632,13 @@ 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 529 "CameraTable.c"
+#line 636 "CameraTable.c"
}
-GType discovered_camera_get_type (void) {
+GType
+discovered_camera_get_type (void)
+{
static volatile gsize discovered_camera_type_id__volatile = 0;
if (g_once_init_enter (&discovered_camera_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { value_discovered_camera_init, value_discovered_camera_free_value, value_discovered_camera_copy_value, value_discovered_camera_peek_pointer, "p", value_discovered_camera_collect_value, "p", value_discovered_camera_lcopy_value };
@@ -543,18 +652,22 @@ GType discovered_camera_get_type (void) {
}
-gpointer discovered_camera_ref (gpointer instance) {
+gpointer
+discovered_camera_ref (gpointer instance)
+{
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 554 "CameraTable.c"
+#line 665 "CameraTable.c"
}
-void discovered_camera_unref (gpointer instance) {
+void
+discovered_camera_unref (gpointer instance)
+{
DiscoveredCamera * self;
self = instance;
#line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -563,49 +676,68 @@ 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 567 "CameraTable.c"
+#line 680 "CameraTable.c"
}
}
-static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) {
+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 575 "CameraTable.c"
+#line 690 "CameraTable.c"
}
-static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
+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 582 "CameraTable.c"
+#line 702 "CameraTable.c"
}
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
+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 589 "CameraTable.c"
+#line 713 "CameraTable.c"
}
-static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
+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 596 "CameraTable.c"
+#line 724 "CameraTable.c"
}
-static gboolean _camera_table_delayed_init_gsource_func (gpointer self) {
+static gboolean
+_camera_table_delayed_init_gsource_func (gpointer self)
+{
gboolean result;
result = camera_table_delayed_init ((CameraTable*) self);
#line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 605 "CameraTable.c"
+#line 735 "CameraTable.c"
}
-static CameraTable* camera_table_construct (GType object_type) {
+static CameraTable*
+camera_table_construct (GType object_type)
+{
CameraTable* self = NULL;
OneShotScheduler* _tmp0_;
GUdevClient* _tmp1_;
@@ -642,18 +774,22 @@ 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 646 "CameraTable.c"
+#line 778 "CameraTable.c"
}
-static CameraTable* camera_table_new (void) {
+static CameraTable*
+camera_table_new (void)
+{
#line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 653 "CameraTable.c"
+#line 787 "CameraTable.c"
}
-static gboolean camera_table_delayed_init (CameraTable* self) {
+static gboolean
+camera_table_delayed_init (CameraTable* self)
+{
gboolean result = FALSE;
AppWindow* _tmp0_;
LibraryWindow* _tmp1_;
@@ -670,17 +806,17 @@ 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 674 "CameraTable.c"
+#line 810 "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 680 "CameraTable.c"
+#line 816 "CameraTable.c"
gboolean _tmp2_ = FALSE;
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 684 "CameraTable.c"
+#line 820 "CameraTable.c"
goto __catch64_gphoto_error;
}
#line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -689,7 +825,7 @@ 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 693 "CameraTable.c"
+#line 829 "CameraTable.c"
}
}
goto __finally64;
@@ -714,12 +850,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 718 "CameraTable.c"
+#line 854 "CameraTable.c"
}
__finally64:
#line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 723 "CameraTable.c"
+#line 859 "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);
@@ -727,18 +863,18 @@ 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 731 "CameraTable.c"
+#line 867 "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 738 "CameraTable.c"
+#line 874 "CameraTable.c"
gboolean _tmp6_ = FALSE;
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 742 "CameraTable.c"
+#line 878 "CameraTable.c"
goto __catch65_gphoto_error;
}
#line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -747,7 +883,7 @@ 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 751 "CameraTable.c"
+#line 887 "CameraTable.c"
}
}
goto __finally65;
@@ -768,12 +904,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 772 "CameraTable.c"
+#line 908 "CameraTable.c"
}
__finally65:
#line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 777 "CameraTable.c"
+#line 913 "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);
@@ -781,7 +917,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 785 "CameraTable.c"
+#line 921 "CameraTable.c"
}
#line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp10_ = app_window_get_instance ();
@@ -795,18 +931,22 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
result = FALSE;
#line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 799 "CameraTable.c"
+#line 935 "CameraTable.c"
}
-static gpointer _camera_table_ref0 (gpointer self) {
+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 806 "CameraTable.c"
+#line 944 "CameraTable.c"
}
-CameraTable* camera_table_get_instance (void) {
+CameraTable*
+camera_table_get_instance (void)
+{
CameraTable* result = NULL;
CameraTable* _tmp0_;
CameraTable* _tmp2_;
@@ -815,7 +955,7 @@ CameraTable* camera_table_get_instance (void) {
_tmp0_ = camera_table_instance;
#line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp0_ == NULL) {
-#line 819 "CameraTable.c"
+#line 959 "CameraTable.c"
CameraTable* _tmp1_;
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp1_ = camera_table_new ();
@@ -823,7 +963,7 @@ CameraTable* camera_table_get_instance (void) {
_camera_table_unref0 (camera_table_instance);
#line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_instance = _tmp1_;
-#line 827 "CameraTable.c"
+#line 967 "CameraTable.c"
}
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = camera_table_instance;
@@ -833,11 +973,13 @@ CameraTable* camera_table_get_instance (void) {
result = _tmp3_;
#line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 837 "CameraTable.c"
+#line 977 "CameraTable.c"
}
-GeeIterable* camera_table_get_cameras (CameraTable* self) {
+GeeIterable*
+camera_table_get_cameras (CameraTable* self)
+{
GeeIterable* result = NULL;
GeeHashMap* _tmp0_;
GeeCollection* _tmp1_;
@@ -854,11 +996,13 @@ 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 858 "CameraTable.c"
+#line 1000 "CameraTable.c"
}
-gint camera_table_get_count (CameraTable* self) {
+gint
+camera_table_get_count (CameraTable* self)
+{
gint result = 0;
GeeHashMap* _tmp0_;
gint _tmp1_;
@@ -875,15 +1019,17 @@ gint camera_table_get_count (CameraTable* self) {
result = _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 879 "CameraTable.c"
+#line 1023 "CameraTable.c"
}
-DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri) {
+DiscoveredCamera*
+camera_table_get_for_uri (CameraTable* self,
+ const gchar* uri)
+{
DiscoveredCamera* result = NULL;
GeeHashMap* _tmp0_;
- const gchar* _tmp1_;
- gpointer _tmp2_;
+ gpointer _tmp1_;
#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,53 +1037,44 @@ DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri)
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp0_ = self->priv->camera_map;
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = uri;
-#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), uri);
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = (DiscoveredCamera*) _tmp2_;
+ result = (DiscoveredCamera*) _tmp1_;
#line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 902 "CameraTable.c"
+#line 1046 "CameraTable.c"
}
-static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error) {
- int _tmp0_;
+static void
+camera_table_do_op (CameraTable* self,
+ int res,
+ const gchar* op,
+ GError** error)
+{
GError * _inner_error_ = NULL;
#line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
#line 101 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (op != NULL);
#line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = res;
-#line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp0_ != GP_OK) {
-#line 917 "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;
+ if (res != GP_OK) {
+#line 1063 "CameraTable.c"
+ const gchar* _tmp0_;
+ GError* _tmp1_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = op;
+ _tmp0_ = gp_port_result_as_string (res);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = res;
+ _tmp1_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Unable to %s: %s", (gint) res, op, _tmp0_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = gp_port_result_as_string (_tmp3_);
-#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Unable to %s: %s", (gint) _tmp1_, _tmp2_, _tmp4_);
-#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _inner_error_ = _tmp5_;
+ _inner_error_ = _tmp1_;
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_propagate_error (error, _inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 941 "CameraTable.c"
+#line 1078 "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);
@@ -945,18 +1082,20 @@ 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 949 "CameraTable.c"
+#line 1086 "CameraTable.c"
}
}
}
-static void camera_table_init_camera_table (CameraTable* self, GError** error) {
+static void
+camera_table_init_camera_table (CameraTable* self,
+ GError** error)
+{
CameraAbilitiesList* _tmp0_ = NULL;
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));
@@ -976,7 +1115,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 980 "CameraTable.c"
+#line 1119 "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);
@@ -984,7 +1123,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 988 "CameraTable.c"
+#line 1127 "CameraTable.c"
}
}
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -992,9 +1131,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = self->priv->null_context;
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = gp_abilities_list_load (_tmp2_, _tmp3_);
-#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp4_, "load camera abilities list", &_inner_error_);
+ camera_table_do_op (self, gp_abilities_list_load (_tmp2_, _tmp3_), "load camera abilities list", &_inner_error_);
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1003,7 +1140,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 1007 "CameraTable.c"
+#line 1144 "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);
@@ -1011,53 +1148,65 @@ 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 1015 "CameraTable.c"
+#line 1152 "CameraTable.c"
}
}
}
-static gpointer _g_object_ref0 (gpointer self) {
+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 1024 "CameraTable.c"
+#line 1163 "CameraTable.c"
}
-static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value) {
+static void
+_vala_array_add69 (gchar** * array,
+ int* length,
+ int* size,
+ gchar* value)
+{
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1035 "CameraTable.c"
+#line 1179 "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 1041 "CameraTable.c"
+#line 1185 "CameraTable.c"
}
-static void _g_object_unref0_ (gpointer var) {
+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 1048 "CameraTable.c"
+#line 1194 "CameraTable.c"
}
-static void _g_list_free__g_object_unref0_ (GList* self) {
+static inline void
+_g_list_free__g_object_unref0_ (GList* self)
+{
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_list_free (self);
-#line 1057 "CameraTable.c"
+ g_list_free_full (self, (GDestroyNotify) _g_object_unref0_);
+#line 1203 "CameraTable.c"
}
-static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1) {
+static gchar**
+camera_table_get_all_usb_cameras (CameraTable* self,
+ int* result_length1)
+{
gchar** result = NULL;
gchar** cameras = NULL;
gchar** _tmp0_;
@@ -1067,8 +1216,8 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
GUdevClient* _tmp1_;
GList* _tmp2_;
GList* _tmp3_;
- gchar** _tmp25_;
- gint _tmp25__length1;
+ gchar** _tmp22_;
+ gint _tmp22__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"
@@ -1087,7 +1236,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 1091 "CameraTable.c"
+#line 1240 "CameraTable.c"
{
GList* device_collection = NULL;
GList* device_it = NULL;
@@ -1095,14 +1244,14 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
device_collection = _tmp3_;
#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1099 "CameraTable.c"
+#line 1248 "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 1106 "CameraTable.c"
+#line 1255 "CameraTable.c"
{
gchar* device_file = NULL;
GUdevDevice* _tmp5_;
@@ -1123,371 +1272,307 @@ 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 1127 "CameraTable.c"
+#line 1276 "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 1136 "CameraTable.c"
+ _tmp9_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
+#line 1282 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp9_ = FALSE;
-#line 1140 "CameraTable.c"
+#line 1286 "CameraTable.c"
}
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp9_) {
-#line 1144 "CameraTable.c"
- GUdevDevice* _tmp13_;
- gboolean _tmp14_;
-#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp13_ = device;
+#line 1290 "CameraTable.c"
+ GUdevDevice* _tmp12_;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
+ _tmp12_ = device;
#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = _tmp14_;
-#line 1153 "CameraTable.c"
+ _tmp8_ = g_udev_device_has_property (_tmp12_, "GPHOTO2_DRIVER");
+#line 1296 "CameraTable.c"
} else {
#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp8_ = FALSE;
-#line 1157 "CameraTable.c"
+#line 1300 "CameraTable.c"
}
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_tmp8_) {
-#line 1161 "CameraTable.c"
+#line 1304 "CameraTable.c"
gint camera_bus = 0;
gint camera_device = 0;
- const gchar* _tmp15_;
- gint _tmp16_;
+ const gchar* _tmp13_;
gchar* camera = 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;
+ gint _tmp15_;
+ gint _tmp16_;
+ gchar* _tmp17_;
+ const gchar* _tmp18_;
+ gchar** _tmp19_;
+ gint _tmp19__length1;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp16_ = sscanf (_tmp15_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device);
+ _tmp13_ = device_file;
#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp16_ < 2) {
-#line 1181 "CameraTable.c"
- const gchar* _tmp17_;
+ if (sscanf (_tmp13_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device) < 2) {
+#line 1321 "CameraTable.c"
+ const gchar* _tmp14_;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp17_ = device_file;
+ _tmp14_ = device_file;
#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_critical ("CameraTable.vala:129: get_all_usb_cameras: Failed to scanf device file" \
-" %s", _tmp17_);
+" %s", _tmp14_);
#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (device_file);
#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (device);
#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 1193 "CameraTable.c"
+#line 1333 "CameraTable.c"
}
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp18_ = camera_bus;
+ _tmp15_ = camera_bus;
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp19_ = camera_device;
+ _tmp16_ = camera_device;
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp20_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp18_, _tmp19_);
+ _tmp17_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp15_, _tmp16_);
#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp20_;
+ camera = _tmp17_;
#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp21_ = camera;
+ _tmp18_ = camera;
#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp21_);
+ g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp18_);
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22_ = cameras;
+ _tmp19_ = cameras;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22__length1 = cameras_length1;
+ _tmp19__length1 = cameras_length1;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp23_ = camera;
+ _tmp20_ = camera;
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp24_ = g_strdup (_tmp23_);
+ _tmp21_ = g_strdup (_tmp20_);
#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
+ _vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp21_);
#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (camera);
-#line 1219 "CameraTable.c"
+#line 1359 "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 1225 "CameraTable.c"
+#line 1365 "CameraTable.c"
}
}
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25_ = cameras;
+ _tmp22_ = cameras;
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25__length1 = cameras_length1;
+ _tmp22__length1 = cameras_length1;
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (result_length1) {
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- *result_length1 = _tmp25__length1;
-#line 1237 "CameraTable.c"
+ *result_length1 = _tmp22__length1;
+#line 1377 "CameraTable.c"
}
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp25_;
+ result = _tmp22_;
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (device_list);
#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1245 "CameraTable.c"
+#line 1385 "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_;
- gint _tmp1_;
- const gchar* _tmp2_;
- gboolean _tmp3_ = FALSE;
- gint _tmp4_;
- const gchar* _tmp11_;
+ gboolean _tmp0_ = FALSE;
gint bus = 0;
gint device = 0;
- 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"
g_return_val_if_fail (port != NULL, FALSE);
#line 153 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = current_camera_count;
-#line 153 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_assert (_tmp0_ > 0, "current_camera_count > 0");
-#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = current_camera_count;
+ _vala_assert (current_camera_count > 0, "current_camera_count > 0");
#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = port;
-#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:155: USB ESP: current_camera_count=%d port=%s", _tmp1_, _tmp2_);
+ g_debug ("CameraTable.vala:155: USB ESP: current_camera_count=%d port=%s", current_camera_count, port);
#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_vala_full_port = NULL;
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = current_camera_count;
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp4_ == 1) {
-#line 1287 "CameraTable.c"
- gchar** _tmp5_;
- gint _tmp5__length1;
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = usb_cameras;
+ if (current_camera_count == 1) {
#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 1296 "CameraTable.c"
+ _tmp0_ = usb_cameras_length1 == 1;
+#line 1418 "CameraTable.c"
} else {
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = FALSE;
-#line 1300 "CameraTable.c"
+ _tmp0_ = FALSE;
+#line 1422 "CameraTable.c"
}
#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp3_) {
-#line 1304 "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"
- _tmp6__length1 = usb_cameras_length1;
+ if (_tmp0_) {
+#line 1426 "CameraTable.c"
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = _tmp6_[0];
+ _tmp1_ = usb_cameras[0];
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp2_ = g_strdup (_tmp1_);
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_full_port = _tmp8_;
-#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = port;
+ _vala_full_port = _tmp2_;
#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp10_ = _vala_full_port;
+ _tmp3_ = _vala_full_port;
#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:163: USB ESP: port=%s full_port=%s", _tmp9_, _tmp10_);
+ g_debug ("CameraTable.vala:163: USB ESP: port=%s full_port=%s", port, _tmp3_);
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = TRUE;
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (full_port) {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1335 "CameraTable.c"
+#line 1448 "CameraTable.c"
} else {
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1339 "CameraTable.c"
+#line 1452 "CameraTable.c"
}
#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1343 "CameraTable.c"
+#line 1456 "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 1349 "CameraTable.c"
- const gchar* _tmp12_;
+ if (g_strcmp0 (port, "usb:") == 0) {
#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp12_ = port;
-#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:170: USB ESP: Skipping %s", _tmp12_);
+ g_debug ("CameraTable.vala:170: USB ESP: Skipping %s", port);
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = FALSE;
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (full_port) {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1361 "CameraTable.c"
+#line 1468 "CameraTable.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1365 "CameraTable.c"
+#line 1472 "CameraTable.c"
}
#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1369 "CameraTable.c"
+#line 1476 "CameraTable.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp13_ = port;
-#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = sscanf (_tmp13_, "usb:%d,%d", &bus, &device);
-#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp14_ < 2) {
-#line 1377 "CameraTable.c"
- const gchar* _tmp15_;
-#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp15_ = port;
+ if (sscanf (port, "usb:%d,%d", &bus, &device) < 2) {
#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_critical ("CameraTable.vala:178: USB ESP: Failed to scanf %s", _tmp15_);
+ g_critical ("CameraTable.vala:178: USB ESP: Failed to scanf %s", port);
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = FALSE;
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (full_port) {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1389 "CameraTable.c"
+#line 1488 "CameraTable.c"
} else {
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1393 "CameraTable.c"
+#line 1492 "CameraTable.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1397 "CameraTable.c"
+#line 1496 "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 1403 "CameraTable.c"
{
gchar** usb_camera_collection = NULL;
gint usb_camera_collection_length1 = 0;
gint _usb_camera_collection_size_ = 0;
gint usb_camera_it = 0;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_camera_collection = _tmp16_;
+ usb_camera_collection = usb_cameras;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_camera_collection_length1 = _tmp16__length1;
+ usb_camera_collection_length1 = usb_cameras_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 1415 "CameraTable.c"
- gchar* _tmp17_;
+ for (usb_camera_it = 0; usb_camera_it < usb_cameras_length1; usb_camera_it = usb_camera_it + 1) {
+#line 1509 "CameraTable.c"
+ gchar* _tmp4_;
gchar* usb_camera = NULL;
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]);
+ _tmp4_ = g_strdup (usb_camera_collection[usb_camera_it]);
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_camera = _tmp17_;
-#line 1422 "CameraTable.c"
+ usb_camera = _tmp4_;
+#line 1516 "CameraTable.c"
{
gint camera_bus = 0;
gint camera_device = 0;
- const gchar* _tmp18_;
- gint _tmp19_;
- gboolean _tmp21_ = FALSE;
- gint _tmp22_;
- gint _tmp23_;
-#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp18_ = usb_camera;
+ const gchar* _tmp5_;
+ gboolean _tmp7_ = FALSE;
+ gint _tmp8_;
+ gint _tmp9_;
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
+ _tmp5_ = usb_camera;
#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp19_ < 2) {
-#line 1437 "CameraTable.c"
- const gchar* _tmp20_;
+ if (sscanf (_tmp5_, "usb:%d,%d", &camera_bus, &camera_device) < 2) {
+#line 1528 "CameraTable.c"
+ const gchar* _tmp6_;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp20_ = usb_camera;
+ _tmp6_ = usb_camera;
#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_critical ("CameraTable.vala:186: USB ESP: Failed to scanf %s", _tmp20_);
+ g_critical ("CameraTable.vala:186: USB ESP: Failed to scanf %s", _tmp6_);
#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
continue;
-#line 1447 "CameraTable.c"
+#line 1538 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22_ = bus;
+ _tmp8_ = bus;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp23_ = camera_bus;
+ _tmp9_ = camera_bus;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp22_ == _tmp23_) {
-#line 1455 "CameraTable.c"
- gint _tmp24_;
- gint _tmp25_;
+ if (_tmp8_ == _tmp9_) {
+#line 1546 "CameraTable.c"
+ gint _tmp10_;
+ gint _tmp11_;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp24_ = device;
+ _tmp10_ = device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25_ = camera_device;
+ _tmp11_ = camera_device;
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp21_ = _tmp24_ == _tmp25_;
-#line 1464 "CameraTable.c"
+ _tmp7_ = _tmp10_ == _tmp11_;
+#line 1555 "CameraTable.c"
} else {
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp21_ = FALSE;
-#line 1468 "CameraTable.c"
+ _tmp7_ = FALSE;
+#line 1559 "CameraTable.c"
}
#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp21_) {
-#line 1472 "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;
+ if (_tmp7_) {
+#line 1563 "CameraTable.c"
+ gchar* _tmp12_;
+ const gchar* _tmp13_;
#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp27_ = g_strdup (_tmp26_);
+ _tmp12_ = g_strdup (port);
#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_full_port = _tmp27_;
-#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp28_ = port;
+ _vala_full_port = _tmp12_;
#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp29_ = _vala_full_port;
+ _tmp13_ = _vala_full_port;
#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:194: USB ESP: port=%s full_port=%s", _tmp28_, _tmp29_);
+ g_debug ("CameraTable.vala:194: USB ESP: port=%s full_port=%s", port, _tmp13_);
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = TRUE;
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1496,450 +1581,379 @@ 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 1499 "CameraTable.c"
+#line 1584 "CameraTable.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1503 "CameraTable.c"
+#line 1588 "CameraTable.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1507 "CameraTable.c"
+#line 1592 "CameraTable.c"
}
#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (usb_camera);
-#line 1511 "CameraTable.c"
+#line 1596 "CameraTable.c"
}
}
}
#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp30_ = port;
-#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_debug ("CameraTable.vala:200: USB ESP: No matching bus/device found for port=%" \
-"s", _tmp30_);
+"s", port);
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
result = FALSE;
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (full_port) {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*full_port = _vala_full_port;
-#line 1525 "CameraTable.c"
+#line 1608 "CameraTable.c"
} else {
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_vala_full_port);
-#line 1529 "CameraTable.c"
+#line 1612 "CameraTable.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1533 "CameraTable.c"
+#line 1616 "CameraTable.c"
}
-gchar* camera_table_get_port_uri (const gchar* port) {
+gchar*
+camera_table_get_port_uri (const gchar* port)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#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"
- _tmp0_ = port;
-#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = g_strdup_printf ("gphoto2://[%s]/", _tmp0_);
+ _tmp0_ = g_strdup_printf ("gphoto2://[%s]/", port);
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 1551 "CameraTable.c"
+#line 1633 "CameraTable.c"
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 1574 "CameraTable.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1582 "CameraTable.c"
+#line 1657 "CameraTable.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1594 "CameraTable.c"
+#line 1666 "CameraTable.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 1618 "CameraTable.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1624 "CameraTable.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 1687 "CameraTable.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 1628 "CameraTable.c"
+#line 1691 "CameraTable.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1632 "CameraTable.c"
- glong _tmp3_;
- glong _tmp4_;
- glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 1644 "CameraTable.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 1697 "CameraTable.c"
} else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 1654 "CameraTable.c"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 1707 "CameraTable.c"
}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 1660 "CameraTable.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1674 "CameraTable.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 1711 "CameraTable.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 1719 "CameraTable.c"
} else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1684 "CameraTable.c"
+ glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 1726 "CameraTable.c"
}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 1690 "CameraTable.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 1699 "CameraTable.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 1730 "CameraTable.c"
+ glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 1736 "CameraTable.c"
}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1719 "CameraTable.c"
+#line 1748 "CameraTable.c"
}
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+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 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 1738 "CameraTable.c"
+#line 1771 "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 1745 "CameraTable.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) old)) == '\0';
+#line 1775 "CameraTable.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 1751 "CameraTable.c"
+#line 1781 "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 1761 "CameraTable.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 1785 "CameraTable.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 1765 "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"
+#line 1789 "CameraTable.c"
+ gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1773 "CameraTable.c"
+#line 1797 "CameraTable.c"
}
{
GRegex* regex = NULL;
- 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"
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GRegex* _tmp5_;
+ GRegex* _tmp6_;
+ gchar* _tmp7_ = NULL;
+ GRegex* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1805 "CameraTable.c"
+#line 1825 "CameraTable.c"
goto __catch66_g_regex_error;
}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/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 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 1814 "CameraTable.c"
+#line 1834 "CameraTable.c"
}
-#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"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1830 "CameraTable.c"
+#line 1848 "CameraTable.c"
goto __catch66_g_regex_error;
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/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 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 1841 "CameraTable.c"
+#line 1859 "CameraTable.c"
}
-#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"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1855 "CameraTable.c"
+#line 1873 "CameraTable.c"
}
goto __finally66;
__catch66_g_regex_error:
{
GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 1869 "CameraTable.c"
+#line 1887 "CameraTable.c"
}
__finally66:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 1880 "CameraTable.c"
+#line 1898 "CameraTable.c"
}
}
-gchar* camera_table_get_port_path (const gchar* port) {
+gchar*
+camera_table_get_port_path (const gchar* port)
+{
gchar* result = NULL;
gchar* _tmp0_ = NULL;
- 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"
- _tmp1_ = port;
-#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = g_str_has_prefix (_tmp1_, "usb:");
-#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp2_) {
-#line 1898 "CameraTable.c"
- const gchar* _tmp3_;
+ if (g_str_has_prefix (port, "usb:")) {
+#line 1912 "CameraTable.c"
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = port;
+ _tmp1_ = string_substring (port, (glong) 4, (glong) -1);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp4_ = string_substring (_tmp3_, (glong) 4, (glong) -1);
+ _tmp2_ = _tmp1_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = string_replace (_tmp2_, ",", "/");
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = string_replace (_tmp5_, ",", "/");
+ _tmp4_ = _tmp3_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = _tmp6_;
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp7_);
+ _tmp5_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp4_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp0_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = _tmp8_;
+ _tmp0_ = _tmp5_;
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp4_);
#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp5_);
-#line 1925 "CameraTable.c"
+ _g_free0 (_tmp2_);
+#line 1936 "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 1931 "CameraTable.c"
+#line 1942 "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 1937 "CameraTable.c"
+#line 1948 "CameraTable.c"
}
-static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid) {
+static gchar*
+camera_table_get_name_for_uuid (CameraTable* self,
+ const gchar* uuid)
+{
gchar* result = NULL;
GVolumeMonitor* _tmp0_;
GList* _tmp1_;
@@ -1951,7 +1965,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 1953 "CameraTable.c"
+#line 1967 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -1959,20 +1973,19 @@ 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 1961 "CameraTable.c"
+#line 1975 "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 1968 "CameraTable.c"
+#line 1982 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
- const gchar* _tmp6_;
- gboolean _tmp7_;
+ gboolean _tmp6_;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = volume;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1980,48 +1993,49 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp5_ = _tmp4_;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = uuid;
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0;
+ _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0;
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp5_);
#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp7_) {
-#line 1989 "CameraTable.c"
- GVolume* _tmp8_;
- gchar* _tmp9_;
+ if (_tmp6_) {
+#line 2000 "CameraTable.c"
+ GVolume* _tmp7_;
+ gchar* _tmp8_;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = volume;
+ _tmp7_ = volume;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = g_volume_get_name (_tmp8_);
+ _tmp8_ = g_volume_get_name (_tmp7_);
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp9_;
+ result = _tmp8_;
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2004 "CameraTable.c"
+#line 2015 "CameraTable.c"
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2008 "CameraTable.c"
+#line 2019 "CameraTable.c"
}
}
#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2013 "CameraTable.c"
+#line 2024 "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 2019 "CameraTable.c"
+#line 2030 "CameraTable.c"
}
-static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid) {
+static gchar*
+camera_table_get_icon_for_uuid (CameraTable* self,
+ const gchar* uuid)
+{
gchar* result = NULL;
GVolumeMonitor* _tmp0_;
GList* _tmp1_;
@@ -2033,7 +2047,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 2035 "CameraTable.c"
+#line 2049 "CameraTable.c"
{
GList* volume_collection = NULL;
GList* volume_it = NULL;
@@ -2041,20 +2055,19 @@ 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 2043 "CameraTable.c"
+#line 2057 "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 2050 "CameraTable.c"
+#line 2064 "CameraTable.c"
{
GVolume* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
- const gchar* _tmp6_;
- gboolean _tmp7_;
+ gboolean _tmp6_;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp3_ = volume;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2062,109 +2075,115 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp5_ = _tmp4_;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = uuid;
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0;
+ _tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0;
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (_tmp5_);
#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp7_) {
-#line 2071 "CameraTable.c"
- GVolume* _tmp8_;
+ if (_tmp6_) {
+#line 2082 "CameraTable.c"
+ GVolume* _tmp7_;
+ GIcon* _tmp8_;
GIcon* _tmp9_;
- GIcon* _tmp10_;
+ gchar* _tmp10_;
gchar* _tmp11_;
- gchar* _tmp12_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = volume;
+ _tmp7_ = volume;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = g_volume_get_icon (_tmp8_);
+ _tmp8_ = g_volume_get_icon (_tmp7_);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp11_ = g_icon_to_string (_tmp10_);
+ _tmp10_ = g_icon_to_string (_tmp9_);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp9_);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- result = _tmp12_;
+ result = _tmp11_;
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return result;
-#line 2097 "CameraTable.c"
+#line 2108 "CameraTable.c"
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
-#line 2101 "CameraTable.c"
+#line 2112 "CameraTable.c"
}
}
#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2106 "CameraTable.c"
+#line 2117 "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 2112 "CameraTable.c"
+#line 2123 "CameraTable.c"
}
-static gpointer _discovered_camera_ref0 (gpointer self) {
+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 2119 "CameraTable.c"
+#line 2132 "CameraTable.c"
}
-static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
+static void
+_vala_array_add70 (DiscoveredCamera** * array,
+ int* length,
+ int* size,
+ DiscoveredCamera* value)
+{
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if ((*length) == (*size)) {
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2130 "CameraTable.c"
+#line 2148 "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 2136 "CameraTable.c"
+#line 2154 "CameraTable.c"
}
-static void camera_table_update_camera_table (CameraTable* self, GError** error) {
+static void
+camera_table_update_camera_table (CameraTable* self,
+ GError** error)
+{
GPPortInfoList* port_info_list = NULL;
GPPortInfoList* _tmp0_ = NULL;
int _tmp1_;
GPPortInfoList* _tmp2_;
- int _tmp3_;
CameraList* camera_list = NULL;
- CameraList* _tmp4_ = NULL;
- int _tmp5_;
- CameraAbilitiesList* _tmp6_;
- GPPortInfoList* _tmp7_;
- CameraList* _tmp8_;
- GPContext* _tmp9_;
- int _tmp10_;
+ CameraList* _tmp3_ = NULL;
+ int _tmp4_;
+ CameraAbilitiesList* _tmp5_;
+ GPPortInfoList* _tmp6_;
+ CameraList* _tmp7_;
+ GPContext* _tmp8_;
GeeHashMap* detected_map = NULL;
- GeeHashMap* _tmp11_;
+ GeeHashMap* _tmp9_;
gchar** usb_cameras = NULL;
- gint _tmp12_;
- gchar** _tmp13_;
+ gint _tmp10_;
+ gchar** _tmp11_;
gint usb_cameras_length1;
gint _usb_cameras_size_;
DiscoveredCamera** missing = NULL;
- DiscoveredCamera** _tmp47_;
+ DiscoveredCamera** _tmp41_;
gint missing_length1;
gint _missing_size_;
- DiscoveredCamera** _tmp80_;
- gint _tmp80__length1;
+ DiscoveredCamera** _tmp72_;
+ gint _tmp72__length1;
GError * _inner_error_ = NULL;
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -2186,7 +2205,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 2188 "CameraTable.c"
+#line 2207 "CameraTable.c"
} else {
#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2196,15 +2215,13 @@ 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 2198 "CameraTable.c"
+#line 2217 "CameraTable.c"
}
}
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_tmp2_ = port_info_list;
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = gp_port_info_list_load (_tmp2_);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp3_, "load port list", &_inner_error_);
+ camera_table_do_op (self, gp_port_info_list_load (_tmp2_), "load port list", &_inner_error_);
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2215,7 +2232,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 2217 "CameraTable.c"
+#line 2234 "CameraTable.c"
} else {
#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_port_info_list_free0 (port_info_list);
@@ -2225,17 +2242,17 @@ 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 2227 "CameraTable.c"
+#line 2244 "CameraTable.c"
}
}
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp5_ = gp_list_new (&_tmp4_);
+ _tmp4_ = gp_list_new (&_tmp3_);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_list = _tmp4_;
+ camera_list = _tmp3_;
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp5_, "create camera list", &_inner_error_);
+ camera_table_do_op (self, _tmp4_, "create camera list", &_inner_error_);
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2248,7 +2265,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 2250 "CameraTable.c"
+#line 2267 "CameraTable.c"
} else {
#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2260,21 +2277,19 @@ 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 2262 "CameraTable.c"
+#line 2279 "CameraTable.c"
}
}
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp6_ = self->priv->abilities_list;
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp7_ = port_info_list;
+ _tmp5_ = self->priv->abilities_list;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp8_ = camera_list;
+ _tmp6_ = port_info_list;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp9_ = self->priv->null_context;
+ _tmp7_ = camera_list;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp10_ = gp_abilities_list_detect (_tmp6_, _tmp7_, _tmp8_, _tmp9_);
+ _tmp8_ = self->priv->null_context;
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp10_, "detect cameras", &_inner_error_);
+ camera_table_do_op (self, gp_abilities_list_detect (_tmp5_, _tmp6_, _tmp7_, _tmp8_), "detect cameras", &_inner_error_);
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2287,7 +2302,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 2289 "CameraTable.c"
+#line 2304 "CameraTable.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_list_unref0 (camera_list);
@@ -2299,97 +2314,92 @@ 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 2301 "CameraTable.c"
+#line 2316 "CameraTable.c"
}
}
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp9_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- detected_map = _tmp11_;
+ detected_map = _tmp9_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp13_ = camera_table_get_all_usb_cameras (self, &_tmp12_);
+ _tmp11_ = camera_table_get_all_usb_cameras (self, &_tmp10_);
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_cameras = _tmp13_;
+ usb_cameras = _tmp11_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- usb_cameras_length1 = _tmp12_;
+ usb_cameras_length1 = _tmp10_;
#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_usb_cameras_size_ = usb_cameras_length1;
-#line 2316 "CameraTable.c"
+#line 2331 "CameraTable.c"
{
gint ctr = 0;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
ctr = 0;
-#line 2321 "CameraTable.c"
+#line 2336 "CameraTable.c"
{
- gboolean _tmp14_ = FALSE;
+ gboolean _tmp12_ = FALSE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = TRUE;
+ _tmp12_ = TRUE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2328 "CameraTable.c"
- gint _tmp16_;
- CameraList* _tmp17_;
- gint _tmp18_;
+#line 2343 "CameraTable.c"
+ gint _tmp14_;
+ CameraList* _tmp15_;
gchar* name = NULL;
- CameraList* _tmp19_;
- gint _tmp20_;
- const gchar* _tmp21_ = NULL;
- int _tmp22_;
- gchar* _tmp23_;
+ CameraList* _tmp16_;
+ gint _tmp17_;
+ const gchar* _tmp18_ = NULL;
+ int _tmp19_;
+ gchar* _tmp20_;
gchar* port = NULL;
- CameraList* _tmp24_;
- gint _tmp25_;
- const gchar* _tmp26_ = 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_;
+ CameraList* _tmp21_;
+ gint _tmp22_;
+ const gchar* _tmp23_ = NULL;
+ int _tmp24_;
+ gchar* _tmp25_;
+ gint _tmp26_;
+ CameraList* _tmp27_;
+ const gchar* _tmp28_;
+ const gchar* _tmp29_;
+ const gchar* _tmp30_;
+ GeeHashMap* _tmp38_;
+ const gchar* _tmp39_;
+ const gchar* _tmp40_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!_tmp14_) {
-#line 2356 "CameraTable.c"
- gint _tmp15_;
+ if (!_tmp12_) {
+#line 2368 "CameraTable.c"
+ gint _tmp13_;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp15_ = ctr;
+ _tmp13_ = ctr;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- ctr = _tmp15_ + 1;
-#line 2362 "CameraTable.c"
+ ctr = _tmp13_ + 1;
+#line 2374 "CameraTable.c"
}
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp14_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp16_ = ctr;
+ _tmp12_ = FALSE;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp17_ = camera_list;
+ _tmp14_ = ctr;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp18_ = gp_list_count (_tmp17_);
+ _tmp15_ = camera_list;
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!(_tmp16_ < _tmp18_)) {
+ if (!(_tmp14_ < gp_list_count (_tmp15_))) {
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2376 "CameraTable.c"
+#line 2386 "CameraTable.c"
}
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp19_ = camera_list;
+ _tmp16_ = camera_list;
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp20_ = ctr;
+ _tmp17_ = ctr;
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp22_ = gp_list_get_name (_tmp19_, _tmp20_, &_tmp21_);
+ _tmp19_ = gp_list_get_name (_tmp16_, _tmp17_, &_tmp18_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp23_ = g_strdup (_tmp21_);
+ _tmp20_ = g_strdup (_tmp18_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- name = _tmp23_;
+ name = _tmp20_;
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp22_, "get detected camera name", &_inner_error_);
+ camera_table_do_op (self, _tmp19_, "get detected camera name", &_inner_error_);
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2408,7 +2418,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 2410 "CameraTable.c"
+#line 2420 "CameraTable.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
@@ -2426,23 +2436,23 @@ 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 2428 "CameraTable.c"
+#line 2438 "CameraTable.c"
}
}
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp24_ = camera_list;
+ _tmp21_ = camera_list;
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp25_ = ctr;
+ _tmp22_ = ctr;
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp27_ = gp_list_get_value (_tmp24_, _tmp25_, &_tmp26_);
+ _tmp24_ = gp_list_get_value (_tmp21_, _tmp22_, &_tmp23_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp28_ = g_strdup (_tmp26_);
+ _tmp25_ = g_strdup (_tmp23_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port = _tmp28_;
+ port = _tmp25_;
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp27_, "get detected camera port", &_inner_error_);
+ camera_table_do_op (self, _tmp24_, "get detected camera port", &_inner_error_);
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2463,7 +2473,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 2465 "CameraTable.c"
+#line 2475 "CameraTable.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
@@ -2483,56 +2493,49 @@ 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 2485 "CameraTable.c"
+#line 2495 "CameraTable.c"
}
}
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp29_ = ctr;
+ _tmp26_ = ctr;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp30_ = camera_list;
+ _tmp27_ = camera_list;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp31_ = gp_list_count (_tmp30_);
+ _tmp28_ = name;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp32_ = name;
+ _tmp29_ = port;
#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp33_ = port;
-#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:256: Detected %d/%d %s @ %s", _tmp29_ + 1, _tmp31_, _tmp32_, _tmp33_);
-#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp34_ = port;
+ g_debug ("CameraTable.vala:256: Detected %d/%d %s @ %s", _tmp26_ + 1, gp_list_count (_tmp27_), _tmp28_, _tmp29_);
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp35_ = g_str_has_prefix (_tmp34_, "usb:");
+ _tmp30_ = port;
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp35_) {
-#line 2506 "CameraTable.c"
+ if (g_str_has_prefix (_tmp30_, "usb:")) {
+#line 2512 "CameraTable.c"
gchar* full_port = NULL;
- CameraList* _tmp36_;
- gint _tmp37_;
- gchar** _tmp38_;
- gint _tmp38__length1;
- const gchar* _tmp39_;
- gchar* _tmp40_ = NULL;
- gboolean _tmp41_;
- const gchar* _tmp42_;
- gchar* _tmp43_;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp36_ = camera_list;
+ CameraList* _tmp31_;
+ gchar** _tmp32_;
+ gint _tmp32__length1;
+ const gchar* _tmp33_;
+ gchar* _tmp34_ = NULL;
+ gboolean _tmp35_;
+ const gchar* _tmp36_;
+ gchar* _tmp37_;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp37_ = gp_list_count (_tmp36_);
+ _tmp31_ = camera_list;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp38_ = usb_cameras;
+ _tmp32_ = usb_cameras;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp38__length1 = usb_cameras_length1;
+ _tmp32__length1 = usb_cameras_length1;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp39_ = port;
+ _tmp33_ = port;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp41_ = camera_table_usb_esp (self, _tmp37_, _tmp38_, _tmp38__length1, _tmp39_, &_tmp40_);
+ _tmp35_ = camera_table_usb_esp (self, gp_list_count (_tmp31_), _tmp32_, _tmp32__length1, _tmp33_, &_tmp34_);
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (full_port);
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- full_port = _tmp40_;
+ full_port = _tmp34_;
#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!_tmp41_) {
+ if (!_tmp35_) {
#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (full_port);
#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2541,128 +2544,124 @@ 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 2543 "CameraTable.c"
+#line 2546 "CameraTable.c"
}
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp42_ = full_port;
+ _tmp36_ = full_port;
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp43_ = g_strdup (_tmp42_);
+ _tmp37_ = g_strdup (_tmp36_);
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port = _tmp43_;
+ port = _tmp37_;
#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (full_port);
-#line 2555 "CameraTable.c"
+#line 2558 "CameraTable.c"
}
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp44_ = detected_map;
+ _tmp38_ = detected_map;
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp45_ = port;
+ _tmp39_ = port;
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp46_ = name;
+ _tmp40_ = name;
#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp45_, _tmp46_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_);
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (port);
#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (name);
-#line 2569 "CameraTable.c"
+#line 2572 "CameraTable.c"
}
}
}
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp47_ = g_new0 (DiscoveredCamera*, 0 + 1);
+ _tmp41_ = g_new0 (DiscoveredCamera*, 0 + 1);
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- missing = _tmp47_;
+ missing = _tmp41_;
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing_length1 = 0;
#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_missing_size_ = missing_length1;
-#line 2581 "CameraTable.c"
+#line 2584 "CameraTable.c"
{
GeeIterator* _camera_it = NULL;
- GeeHashMap* _tmp48_;
- GeeCollection* _tmp49_;
- GeeCollection* _tmp50_;
- GeeCollection* _tmp51_;
- GeeIterator* _tmp52_;
- GeeIterator* _tmp53_;
+ GeeHashMap* _tmp42_;
+ GeeCollection* _tmp43_;
+ GeeCollection* _tmp44_;
+ GeeCollection* _tmp45_;
+ GeeIterator* _tmp46_;
+ GeeIterator* _tmp47_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp48_ = self->priv->camera_map;
+ _tmp42_ = self->priv->camera_map;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp49_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+ _tmp43_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp50_ = _tmp49_;
+ _tmp44_ = _tmp43_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp51_ = _tmp50_;
+ _tmp45_ = _tmp44_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp52_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable));
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp53_ = _tmp52_;
+ _tmp47_ = _tmp46_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp51_);
+ _g_object_unref0 (_tmp45_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _camera_it = _tmp53_;
+ _camera_it = _tmp47_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 2608 "CameraTable.c"
- GeeIterator* _tmp54_;
- gboolean _tmp55_;
+#line 2611 "CameraTable.c"
+ GeeIterator* _tmp48_;
DiscoveredCamera* camera = NULL;
- GeeIterator* _tmp56_;
- gpointer _tmp57_;
+ GeeIterator* _tmp49_;
+ gpointer _tmp50_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- DiscoveredCamera* _tmp58_;
- Camera* _tmp59_;
- GPPortInfo _tmp60_ = {0};
- int _tmp61_;
- const gchar* _tmp62_ = NULL;
- gchar* _tmp63_;
+ DiscoveredCamera* _tmp51_;
+ Camera* _tmp52_;
+ GPPortInfo _tmp53_ = {0};
+ int _tmp54_;
+ const gchar* _tmp55_ = NULL;
+ gchar* _tmp56_;
CameraAbilities abilities = {0};
- DiscoveredCamera* _tmp64_;
- Camera* _tmp65_;
- CameraAbilities _tmp66_ = {0};
- 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_;
+ DiscoveredCamera* _tmp57_;
+ Camera* _tmp58_;
+ CameraAbilities _tmp59_ = {0};
+ int _tmp60_;
+ GeeHashMap* _tmp61_;
+ const gchar* _tmp62_;
+ CameraAbilities _tmp66_;
+ const gchar* _tmp67_;
+ const gchar* _tmp68_;
+ DiscoveredCamera** _tmp69_;
+ gint _tmp69__length1;
+ DiscoveredCamera* _tmp70_;
+ DiscoveredCamera* _tmp71_;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp54_ = _camera_it;
+ _tmp48_ = _camera_it;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp55_ = gee_iterator_next (_tmp54_);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!_tmp55_) {
+ if (!gee_iterator_next (_tmp48_)) {
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 2645 "CameraTable.c"
+#line 2644 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp56_ = _camera_it;
+ _tmp49_ = _camera_it;
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp57_ = gee_iterator_get (_tmp56_);
+ _tmp50_ = gee_iterator_get (_tmp49_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = (DiscoveredCamera*) _tmp57_;
+ camera = (DiscoveredCamera*) _tmp50_;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp58_ = camera;
+ _tmp51_ = camera;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp59_ = _tmp58_->gcamera;
+ _tmp52_ = _tmp51_->gcamera;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp61_ = gp_camera_get_port_info (_tmp59_, &_tmp60_);
+ _tmp54_ = gp_camera_get_port_info (_tmp52_, &_tmp53_);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp60_;
+ port_info = _tmp53_;
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp61_, "retrieve missing camera port information", &_inner_error_);
+ camera_table_do_op (self, _tmp54_, "retrieve missing camera port information", &_inner_error_);
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2689,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 2691 "CameraTable.c"
+#line 2690 "CameraTable.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2715,29 +2714,29 @@ 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 2717 "CameraTable.c"
+#line 2716 "CameraTable.c"
}
}
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp62_);
+ gp_port_info_get_path (port_info, &_tmp55_);
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp63_ = g_strdup (_tmp62_);
+ _tmp56_ = g_strdup (_tmp55_);
#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp63_;
+ tmp_path = _tmp56_;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp64_ = camera;
+ _tmp57_ = camera;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp65_ = _tmp64_->gcamera;
+ _tmp58_ = _tmp57_->gcamera;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp67_ = gp_camera_get_abilities (_tmp65_, &_tmp66_);
+ _tmp60_ = gp_camera_get_abilities (_tmp58_, &_tmp59_);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- abilities = _tmp66_;
+ abilities = _tmp59_;
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp67_, "retrieve camera abilities", &_inner_error_);
+ camera_table_do_op (self, _tmp60_, "retrieve camera abilities", &_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2766,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 2768 "CameraTable.c"
+#line 2767 "CameraTable.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -2794,29 +2793,27 @@ 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 2796 "CameraTable.c"
+#line 2795 "CameraTable.c"
}
}
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp68_ = detected_map;
-#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp69_ = tmp_path;
+ _tmp61_ = detected_map;
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp70_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp69_);
+ _tmp62_ = tmp_path;
#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp70_) {
-#line 2807 "CameraTable.c"
- CameraAbilities _tmp71_;
- const gchar* _tmp72_;
- const gchar* _tmp73_;
+ if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp62_)) {
+#line 2804 "CameraTable.c"
+ CameraAbilities _tmp63_;
+ const gchar* _tmp64_;
+ const gchar* _tmp65_;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp71_ = abilities;
+ _tmp63_ = abilities;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp72_ = _tmp71_.model;
+ _tmp64_ = _tmp63_.model;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp73_ = tmp_path;
+ _tmp65_ = tmp_path;
#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:285: Found camera for %s @ %s in detected map", _tmp72_, _tmp73_);
+ g_debug ("CameraTable.vala:285: Found camera for %s @ %s in detected map", _tmp64_, _tmp65_);
#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2827,26 +2824,26 @@ 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 2829 "CameraTable.c"
+#line 2826 "CameraTable.c"
}
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp74_ = abilities;
+ _tmp66_ = abilities;
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp75_ = _tmp74_.model;
+ _tmp67_ = _tmp66_.model;
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp76_ = tmp_path;
+ _tmp68_ = tmp_path;
#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp75_, _tmp76_);
+ g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp67_, _tmp68_);
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp77_ = missing;
+ _tmp69_ = missing;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp77__length1 = missing_length1;
+ _tmp69__length1 = missing_length1;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp78_ = camera;
+ _tmp70_ = camera;
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp79_ = _discovered_camera_ref0 (_tmp78_);
+ _tmp71_ = _discovered_camera_ref0 (_tmp70_);
#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp79_);
+ _vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp71_);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2855,70 +2852,70 @@ 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 2857 "CameraTable.c"
+#line 2854 "CameraTable.c"
}
#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_camera_it);
-#line 2861 "CameraTable.c"
+#line 2858 "CameraTable.c"
}
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp80_ = missing;
+ _tmp72_ = missing;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp80__length1 = missing_length1;
-#line 2867 "CameraTable.c"
+ _tmp72__length1 = missing_length1;
+#line 2864 "CameraTable.c"
{
DiscoveredCamera** camera_collection = NULL;
gint camera_collection_length1 = 0;
gint _camera_collection_size_ = 0;
gint camera_it = 0;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_collection = _tmp80_;
+ camera_collection = _tmp72_;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_collection_length1 = _tmp80__length1;
+ camera_collection_length1 = _tmp72__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 2879 "CameraTable.c"
- DiscoveredCamera* _tmp81_;
+ for (camera_it = 0; camera_it < _tmp72__length1; camera_it = camera_it + 1) {
+#line 2876 "CameraTable.c"
+ DiscoveredCamera* _tmp73_;
DiscoveredCamera* camera = NULL;
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]);
+ _tmp73_ = _discovered_camera_ref0 (camera_collection[camera_it]);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp81_;
-#line 2886 "CameraTable.c"
+ camera = _tmp73_;
+#line 2883 "CameraTable.c"
{
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- DiscoveredCamera* _tmp82_;
- Camera* _tmp83_;
- GPPortInfo _tmp84_ = {0};
- int _tmp85_;
- const gchar* _tmp86_ = NULL;
- gchar* _tmp87_;
+ DiscoveredCamera* _tmp74_;
+ Camera* _tmp75_;
+ GPPortInfo _tmp76_ = {0};
+ int _tmp77_;
+ const gchar* _tmp78_ = NULL;
+ gchar* _tmp79_;
CameraAbilities abilities = {0};
- DiscoveredCamera* _tmp88_;
- Camera* _tmp89_;
- CameraAbilities _tmp90_ = {0};
- int _tmp91_;
- CameraAbilities _tmp92_;
- const gchar* _tmp93_;
- const gchar* _tmp94_;
- GeeHashMap* _tmp95_;
- const gchar* _tmp96_;
- gchar* _tmp97_;
- gchar* _tmp98_;
- DiscoveredCamera* _tmp99_;
+ DiscoveredCamera* _tmp80_;
+ Camera* _tmp81_;
+ CameraAbilities _tmp82_ = {0};
+ int _tmp83_;
+ CameraAbilities _tmp84_;
+ const gchar* _tmp85_;
+ const gchar* _tmp86_;
+ GeeHashMap* _tmp87_;
+ const gchar* _tmp88_;
+ gchar* _tmp89_;
+ gchar* _tmp90_;
+ DiscoveredCamera* _tmp91_;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp82_ = camera;
+ _tmp74_ = camera;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp83_ = _tmp82_->gcamera;
+ _tmp75_ = _tmp74_->gcamera;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp85_ = gp_camera_get_port_info (_tmp83_, &_tmp84_);
+ _tmp77_ = gp_camera_get_port_info (_tmp75_, &_tmp76_);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp84_;
+ port_info = _tmp76_;
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp85_, "retrieve missing camera port information", &_inner_error_);
+ camera_table_do_op (self, _tmp77_, "retrieve missing camera port information", &_inner_error_);
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2943,7 +2940,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 2945 "CameraTable.c"
+#line 2942 "CameraTable.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -2967,29 +2964,29 @@ 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 2969 "CameraTable.c"
+#line 2966 "CameraTable.c"
}
}
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp86_);
+ gp_port_info_get_path (port_info, &_tmp78_);
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp87_ = g_strdup (_tmp86_);
+ _tmp79_ = g_strdup (_tmp78_);
#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp87_;
+ tmp_path = _tmp79_;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp88_ = camera;
+ _tmp80_ = camera;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp89_ = _tmp88_->gcamera;
+ _tmp81_ = _tmp80_->gcamera;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp91_ = gp_camera_get_abilities (_tmp89_, &_tmp90_);
+ _tmp83_ = gp_camera_get_abilities (_tmp81_, &_tmp82_);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- abilities = _tmp90_;
+ abilities = _tmp82_;
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp91_, "retrieve missing camera abilities", &_inner_error_);
+ camera_table_do_op (self, _tmp83_, "retrieve missing camera abilities", &_inner_error_);
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3016,7 +3013,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 3018 "CameraTable.c"
+#line 3015 "CameraTable.c"
} else {
#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
@@ -3042,33 +3039,33 @@ 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 3044 "CameraTable.c"
+#line 3041 "CameraTable.c"
}
}
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp92_ = abilities;
+ _tmp84_ = abilities;
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp93_ = _tmp92_.model;
+ _tmp85_ = _tmp84_.model;
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp94_ = tmp_path;
+ _tmp86_ = tmp_path;
#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp93_, _tmp94_);
+ g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp85_, _tmp86_);
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp95_ = self->priv->camera_map;
+ _tmp87_ = self->priv->camera_map;
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp96_ = tmp_path;
+ _tmp88_ = tmp_path;
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp97_ = camera_table_get_port_uri (_tmp96_);
+ _tmp89_ = camera_table_get_port_uri (_tmp88_);
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp98_ = _tmp97_;
+ _tmp90_ = _tmp89_;
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp98_, NULL);
+ gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL);
#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp98_);
+ _g_free0 (_tmp90_);
#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp99_ = camera;
+ _tmp91_ = camera;
#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp99_);
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp91_);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(abilities);
#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3077,173 +3074,162 @@ 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 3079 "CameraTable.c"
+#line 3076 "CameraTable.c"
}
}
}
{
GeeIterator* _port_it = NULL;
- GeeHashMap* _tmp100_;
- GeeSet* _tmp101_;
- GeeSet* _tmp102_;
- GeeSet* _tmp103_;
- GeeIterator* _tmp104_;
- GeeIterator* _tmp105_;
+ GeeHashMap* _tmp92_;
+ GeeSet* _tmp93_;
+ GeeSet* _tmp94_;
+ GeeSet* _tmp95_;
+ GeeIterator* _tmp96_;
+ GeeIterator* _tmp97_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp100_ = detected_map;
+ _tmp92_ = detected_map;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp101_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+ _tmp93_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp102_ = _tmp101_;
+ _tmp94_ = _tmp93_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp103_ = _tmp102_;
+ _tmp95_ = _tmp94_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp104_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp96_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ITERABLE, GeeIterable));
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp105_ = _tmp104_;
+ _tmp97_ = _tmp96_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp103_);
+ _g_object_unref0 (_tmp95_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _port_it = _tmp105_;
+ _port_it = _tmp97_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
while (TRUE) {
-#line 3109 "CameraTable.c"
- GeeIterator* _tmp106_;
- gboolean _tmp107_;
+#line 3106 "CameraTable.c"
+ GeeIterator* _tmp98_;
gchar* port = NULL;
- GeeIterator* _tmp108_;
- gpointer _tmp109_;
+ GeeIterator* _tmp99_;
+ gpointer _tmp100_;
gchar* name = NULL;
- GeeHashMap* _tmp110_;
- const gchar* _tmp111_;
- gpointer _tmp112_;
+ GeeHashMap* _tmp101_;
+ const gchar* _tmp102_;
+ gpointer _tmp103_;
gchar* display_name = NULL;
gchar* icon = NULL;
gchar* uri = NULL;
- const gchar* _tmp113_;
- gchar* _tmp114_;
- GeeHashMap* _tmp115_;
- const gchar* _tmp116_;
- gboolean _tmp117_;
+ const gchar* _tmp104_;
+ gchar* _tmp105_;
+ GeeHashMap* _tmp106_;
+ const gchar* _tmp107_;
gchar* path = NULL;
- const gchar* _tmp120_;
- gchar* _tmp121_;
- const gchar* _tmp122_;
- const gchar* _tmp142_;
- gboolean _tmp143_;
- const gchar* _tmp162_;
+ const gchar* _tmp110_;
+ gchar* _tmp111_;
+ const gchar* _tmp112_;
+ const gchar* _tmp132_;
+ const gchar* _tmp151_;
gint index = 0;
- GPPortInfoList* _tmp165_;
- const gchar* _tmp166_;
- gint _tmp167_;
- gint _tmp168_;
+ GPPortInfoList* _tmp154_;
+ const gchar* _tmp155_;
+ gint _tmp156_;
GPPortInfo port_info = {0};
gchar* tmp_path = NULL;
- GPPortInfoList* _tmp173_;
+ GPPortInfoList* _tmp161_;
+ gint _tmp162_;
+ GPPortInfo _tmp163_ = {0};
+ int _tmp164_;
+ const gchar* _tmp165_;
+ gchar* _tmp166_;
+ gchar* _tmp167_;
+ const gchar* _tmp168_ = NULL;
+ gchar* _tmp169_;
+ const gchar* _tmp170_;
+ const gchar* _tmp171_;
+ CameraAbilitiesList* _tmp172_;
+ const gchar* _tmp173_;
gint _tmp174_;
- GPPortInfo _tmp175_ = {0};
- int _tmp176_;
- const gchar* _tmp177_;
- gchar* _tmp178_;
- gchar* _tmp179_;
- const gchar* _tmp180_ = NULL;
- gchar* _tmp181_;
- const gchar* _tmp182_;
- const gchar* _tmp183_;
- CameraAbilitiesList* _tmp184_;
- const gchar* _tmp185_;
- gint _tmp186_;
- gint _tmp187_;
CameraAbilities camera_abilities = {0};
- CameraAbilitiesList* _tmp192_;
- gint _tmp193_;
- CameraAbilities _tmp194_ = {0};
- int _tmp195_;
- const gchar* _tmp196_;
- gchar* _tmp197_;
- gchar* _tmp198_;
+ CameraAbilitiesList* _tmp179_;
+ gint _tmp180_;
+ CameraAbilities _tmp181_ = {0};
+ int _tmp182_;
+ const gchar* _tmp183_;
+ gchar* _tmp184_;
+ gchar* _tmp185_;
Camera* gcamera = NULL;
- Camera* _tmp199_ = NULL;
- int _tmp200_;
- const gchar* _tmp201_;
- gchar* _tmp202_;
- gchar* _tmp203_;
+ Camera* _tmp186_ = NULL;
+ int _tmp187_;
+ const gchar* _tmp188_;
+ gchar* _tmp189_;
+ gchar* _tmp190_;
+ Camera* _tmp191_;
+ CameraAbilities _tmp192_;
+ const gchar* _tmp193_;
+ gchar* _tmp194_;
+ gchar* _tmp195_;
+ Camera* _tmp196_;
+ GPPortInfo _tmp197_;
+ const gchar* _tmp198_;
+ const gchar* _tmp199_;
+ gchar* _tmp200_;
+ gchar* _tmp201_;
+ const gchar* _tmp202_;
+ const gchar* _tmp203_;
+ DiscoveredCamera* camera = NULL;
Camera* _tmp204_;
- CameraAbilities _tmp205_;
- int _tmp206_;
+ const gchar* _tmp205_;
+ const gchar* _tmp206_;
const gchar* _tmp207_;
- gchar* _tmp208_;
- gchar* _tmp209_;
- Camera* _tmp210_;
- GPPortInfo _tmp211_;
- int _tmp212_;
- const gchar* _tmp213_;
- const gchar* _tmp214_;
- gchar* _tmp215_;
- gchar* _tmp216_;
- const gchar* _tmp217_;
- const gchar* _tmp218_;
- DiscoveredCamera* camera = NULL;
- Camera* _tmp219_;
- const gchar* _tmp220_;
- const gchar* _tmp221_;
- const gchar* _tmp222_;
- DiscoveredCamera* _tmp223_;
- GeeHashMap* _tmp224_;
- const gchar* _tmp225_;
- DiscoveredCamera* _tmp226_;
- DiscoveredCamera* _tmp227_;
+ DiscoveredCamera* _tmp208_;
+ GeeHashMap* _tmp209_;
+ const gchar* _tmp210_;
+ DiscoveredCamera* _tmp211_;
+ DiscoveredCamera* _tmp212_;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp106_ = _port_it;
+ _tmp98_ = _port_it;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp107_ = gee_iterator_next (_tmp106_);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (!_tmp107_) {
+ if (!gee_iterator_next (_tmp98_)) {
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
break;
-#line 3203 "CameraTable.c"
+#line 3191 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp108_ = _port_it;
+ _tmp99_ = _port_it;
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp109_ = gee_iterator_get (_tmp108_);
+ _tmp100_ = gee_iterator_get (_tmp99_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port = (gchar*) _tmp109_;
+ port = (gchar*) _tmp100_;
#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp110_ = detected_map;
+ _tmp101_ = detected_map;
#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp111_ = port;
+ _tmp102_ = port;
#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp112_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp111_);
+ _tmp103_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp102_);
#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- name = (gchar*) _tmp112_;
+ name = (gchar*) _tmp103_;
#line 317 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
display_name = NULL;
#line 318 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
icon = NULL;
#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp113_ = port;
+ _tmp104_ = port;
#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp114_ = camera_table_get_port_uri (_tmp113_);
+ _tmp105_ = camera_table_get_port_uri (_tmp104_);
#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- uri = _tmp114_;
-#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp115_ = self->priv->camera_map;
+ uri = _tmp105_;
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp116_ = uri;
+ _tmp106_ = self->priv->camera_map;
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp117_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_);
+ _tmp107_ = uri;
#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp117_) {
-#line 3237 "CameraTable.c"
- const gchar* _tmp118_;
- const gchar* _tmp119_;
+ if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp107_)) {
+#line 3223 "CameraTable.c"
+ const gchar* _tmp108_;
+ const gchar* _tmp109_;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp118_ = name;
+ _tmp108_ = name;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp119_ = port;
+ _tmp109_ = port;
#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp118_, _tmp119_);
+ g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp108_, _tmp109_);
#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (uri);
#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3256,213 +3242,211 @@ 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 3258 "CameraTable.c"
+#line 3244 "CameraTable.c"
}
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp120_ = port;
+ _tmp110_ = port;
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp121_ = camera_table_get_port_path (_tmp120_);
+ _tmp111_ = camera_table_get_port_path (_tmp110_);
#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- path = _tmp121_;
+ path = _tmp111_;
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp122_ = path;
+ _tmp112_ = path;
#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL != _tmp122_) {
-#line 3270 "CameraTable.c"
+ if (NULL != _tmp112_) {
+#line 3256 "CameraTable.c"
GUdevDevice* device = NULL;
- GUdevClient* _tmp123_;
- const gchar* _tmp124_;
- GUdevDevice* _tmp125_;
+ GUdevClient* _tmp113_;
+ const gchar* _tmp114_;
+ GUdevDevice* _tmp115_;
gchar* serial = NULL;
- GUdevDevice* _tmp126_;
- const gchar* _tmp127_;
- gchar* _tmp128_;
- const gchar* _tmp129_;
- const gchar* _tmp134_;
- const gchar* _tmp138_;
+ GUdevDevice* _tmp116_;
+ const gchar* _tmp117_;
+ gchar* _tmp118_;
+ const gchar* _tmp119_;
+ const gchar* _tmp124_;
+ const gchar* _tmp128_;
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp123_ = self->priv->client;
+ _tmp113_ = self->priv->client;
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp124_ = path;
+ _tmp114_ = path;
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp125_ = g_udev_client_query_by_device_file (_tmp123_, _tmp124_);
+ _tmp115_ = g_udev_client_query_by_device_file (_tmp113_, _tmp114_);
#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- device = _tmp125_;
+ device = _tmp115_;
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp126_ = device;
+ _tmp116_ = device;
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp127_ = g_udev_device_get_property (_tmp126_, "ID_SERIAL_SHORT");
+ _tmp117_ = g_udev_device_get_property (_tmp116_, "ID_SERIAL_SHORT");
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp128_ = g_strdup (_tmp127_);
+ _tmp118_ = g_strdup (_tmp117_);
#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- serial = _tmp128_;
+ serial = _tmp118_;
#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp129_ = serial;
+ _tmp119_ = serial;
#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL != _tmp129_) {
-#line 3302 "CameraTable.c"
- const gchar* _tmp130_;
- gchar* _tmp131_;
- const gchar* _tmp132_;
- gchar* _tmp133_;
+ if (NULL != _tmp119_) {
+#line 3288 "CameraTable.c"
+ const gchar* _tmp120_;
+ gchar* _tmp121_;
+ const gchar* _tmp122_;
+ gchar* _tmp123_;
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp130_ = serial;
+ _tmp120_ = serial;
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp131_ = camera_table_get_name_for_uuid (self, _tmp130_);
+ _tmp121_ = camera_table_get_name_for_uuid (self, _tmp120_);
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp131_;
+ display_name = _tmp121_;
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp132_ = serial;
+ _tmp122_ = serial;
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp133_ = camera_table_get_icon_for_uuid (self, _tmp132_);
+ _tmp123_ = camera_table_get_icon_for_uuid (self, _tmp122_);
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- icon = _tmp133_;
-#line 3323 "CameraTable.c"
+ icon = _tmp123_;
+#line 3309 "CameraTable.c"
}
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp134_ = display_name;
+ _tmp124_ = display_name;
#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL == _tmp134_) {
-#line 3329 "CameraTable.c"
- GUdevDevice* _tmp135_;
- const gchar* _tmp136_;
- gchar* _tmp137_;
+ if (NULL == _tmp124_) {
+#line 3315 "CameraTable.c"
+ GUdevDevice* _tmp125_;
+ const gchar* _tmp126_;
+ gchar* _tmp127_;
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp135_ = device;
+ _tmp125_ = device;
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp136_ = g_udev_device_get_sysfs_attr (_tmp135_, "product");
+ _tmp126_ = g_udev_device_get_sysfs_attr (_tmp125_, "product");
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp137_ = g_strdup (_tmp136_);
+ _tmp127_ = g_strdup (_tmp126_);
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp137_;
-#line 3343 "CameraTable.c"
+ display_name = _tmp127_;
+#line 3329 "CameraTable.c"
}
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp138_ = display_name;
+ _tmp128_ = display_name;
#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL == _tmp138_) {
-#line 3349 "CameraTable.c"
- GUdevDevice* _tmp139_;
- const gchar* _tmp140_;
- gchar* _tmp141_;
+ if (NULL == _tmp128_) {
+#line 3335 "CameraTable.c"
+ GUdevDevice* _tmp129_;
+ const gchar* _tmp130_;
+ gchar* _tmp131_;
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp139_ = device;
+ _tmp129_ = device;
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp140_ = g_udev_device_get_property (_tmp139_, "ID_MODEL");
+ _tmp130_ = g_udev_device_get_property (_tmp129_, "ID_MODEL");
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp141_ = g_strdup (_tmp140_);
+ _tmp131_ = g_strdup (_tmp130_);
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp141_;
-#line 3363 "CameraTable.c"
+ display_name = _tmp131_;
+#line 3349 "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 3369 "CameraTable.c"
+#line 3355 "CameraTable.c"
}
#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp142_ = port;
-#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp143_ = g_str_has_prefix (_tmp142_, "disk:");
+ _tmp132_ = port;
#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp143_) {
-#line 3377 "CameraTable.c"
+ if (g_str_has_prefix (_tmp132_, "disk:")) {
+#line 3361 "CameraTable.c"
{
GMount* mount = NULL;
- const gchar* _tmp144_;
+ const gchar* _tmp133_;
+ gchar* _tmp134_;
+ gchar* _tmp135_;
+ GFile* _tmp136_;
+ GFile* _tmp137_;
+ GMount* _tmp138_;
+ GMount* _tmp139_;
+ GVolume* volume = NULL;
+ GMount* _tmp140_;
+ GVolume* _tmp141_;
+ const gchar* _tmp142_;
+ GVolume* _tmp143_;
+ gchar* _tmp144_;
gchar* _tmp145_;
gchar* _tmp146_;
- GFile* _tmp147_;
- GFile* _tmp148_;
- GMount* _tmp149_;
- GMount* _tmp150_;
- GVolume* volume = NULL;
- GMount* _tmp151_;
- GVolume* _tmp152_;
- const gchar* _tmp153_;
- GVolume* _tmp154_;
- gchar* _tmp155_;
- gchar* _tmp156_;
- gchar* _tmp157_;
- GVolume* _tmp158_;
- GIcon* _tmp159_;
- GIcon* _tmp160_;
- gchar* _tmp161_;
+ GVolume* _tmp147_;
+ GIcon* _tmp148_;
+ GIcon* _tmp149_;
+ gchar* _tmp150_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp144_ = port;
+ _tmp133_ = port;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp145_ = string_substring (_tmp144_, (glong) 5, (glong) -1);
+ _tmp134_ = string_substring (_tmp133_, (glong) 5, (glong) -1);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp146_ = _tmp145_;
+ _tmp135_ = _tmp134_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp147_ = g_file_new_for_path (_tmp146_);
+ _tmp136_ = g_file_new_for_path (_tmp135_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp148_ = _tmp147_;
+ _tmp137_ = _tmp136_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp149_ = g_file_find_enclosing_mount (_tmp148_, NULL, &_inner_error_);
+ _tmp138_ = g_file_find_enclosing_mount (_tmp137_, NULL, &_inner_error_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp150_ = _tmp149_;
+ _tmp139_ = _tmp138_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp148_);
+ _g_object_unref0 (_tmp137_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp146_);
+ _g_free0 (_tmp135_);
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- mount = _tmp150_;
+ mount = _tmp139_;
#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3421 "CameraTable.c"
+#line 3405 "CameraTable.c"
goto __catch67_g_error;
}
#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp151_ = mount;
+ _tmp140_ = mount;
#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp152_ = g_mount_get_volume (_tmp151_);
+ _tmp141_ = g_mount_get_volume (_tmp140_);
#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- volume = _tmp152_;
+ volume = _tmp141_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp153_ = name;
+ _tmp142_ = name;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp154_ = volume;
+ _tmp143_ = volume;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp155_ = g_volume_get_name (_tmp154_);
+ _tmp144_ = g_volume_get_name (_tmp143_);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp156_ = _tmp155_;
+ _tmp145_ = _tmp144_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp157_ = g_strdup_printf (_ ("%s (%s)"), _tmp153_, _tmp156_);
+ _tmp146_ = g_strdup_printf (_ ("%s (%s)"), _tmp142_, _tmp145_);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp157_;
+ display_name = _tmp146_;
#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp156_);
+ _g_free0 (_tmp145_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp158_ = volume;
+ _tmp147_ = volume;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp159_ = g_volume_get_icon (_tmp158_);
+ _tmp148_ = g_volume_get_icon (_tmp147_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp160_ = _tmp159_;
+ _tmp149_ = _tmp148_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp161_ = g_icon_to_string (_tmp160_);
+ _tmp150_ = g_icon_to_string (_tmp149_);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (icon);
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- icon = _tmp161_;
+ icon = _tmp150_;
#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_object_unref0 (_tmp160_);
+ _g_object_unref0 (_tmp149_);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (volume);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (mount);
-#line 3464 "CameraTable.c"
+#line 3448 "CameraTable.c"
}
goto __finally67;
__catch67_g_error:
@@ -3474,7 +3458,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_inner_error_ = NULL;
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (e);
-#line 3476 "CameraTable.c"
+#line 3460 "CameraTable.c"
}
__finally67:
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3509,7 +3493,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3511 "CameraTable.c"
+#line 3495 "CameraTable.c"
} else {
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
@@ -3541,56 +3525,54 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3543 "CameraTable.c"
+#line 3527 "CameraTable.c"
}
}
}
#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp162_ = display_name;
+ _tmp151_ = display_name;
#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (NULL == _tmp162_) {
-#line 3551 "CameraTable.c"
- const gchar* _tmp163_;
- gchar* _tmp164_;
+ if (NULL == _tmp151_) {
+#line 3535 "CameraTable.c"
+ const gchar* _tmp152_;
+ gchar* _tmp153_;
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp163_ = name;
+ _tmp152_ = name;
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp164_ = g_strdup (_tmp163_);
+ _tmp153_ = g_strdup (_tmp152_);
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (display_name);
#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- display_name = _tmp164_;
-#line 3562 "CameraTable.c"
+ display_name = _tmp153_;
+#line 3546 "CameraTable.c"
}
#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp165_ = port_info_list;
-#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp166_ = port;
+ _tmp154_ = port_info_list;
#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp167_ = gp_port_info_list_lookup_path (_tmp165_, _tmp166_);
+ _tmp155_ = port;
#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp167_;
+ index = gp_port_info_list_lookup_path (_tmp154_, _tmp155_);
#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp168_ = index;
+ _tmp156_ = index;
#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp168_ < 0) {
-#line 3576 "CameraTable.c"
- gint _tmp169_;
- const gchar* _tmp170_;
- gchar* _tmp171_;
- gchar* _tmp172_;
+ if (_tmp156_ < 0) {
+#line 3558 "CameraTable.c"
+ gint _tmp157_;
+ const gchar* _tmp158_;
+ gchar* _tmp159_;
+ gchar* _tmp160_;
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp169_ = index;
+ _tmp157_ = index;
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp170_ = port;
+ _tmp158_ = port;
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp171_ = g_strdup_printf ("lookup port %s", _tmp170_);
+ _tmp159_ = g_strdup_printf ("lookup port %s", _tmp158_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp172_ = _tmp171_;
+ _tmp160_ = _tmp159_;
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp169_, _tmp172_, &_inner_error_);
+ camera_table_do_op (self, (int) _tmp157_, _tmp160_, &_inner_error_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp172_);
+ _g_free0 (_tmp160_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3623,7 +3605,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3625 "CameraTable.c"
+#line 3607 "CameraTable.c"
} else {
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (path);
@@ -3655,30 +3637,30 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3657 "CameraTable.c"
+#line 3639 "CameraTable.c"
}
}
}
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp173_ = port_info_list;
+ _tmp161_ = port_info_list;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp174_ = index;
+ _tmp162_ = index;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp176_ = gp_port_info_list_get_info (_tmp173_, _tmp174_, &_tmp175_);
+ _tmp164_ = gp_port_info_list_get_info (_tmp161_, _tmp162_, &_tmp163_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(port_info);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- port_info = _tmp175_;
+ port_info = _tmp163_;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp177_ = port;
+ _tmp165_ = port;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp178_ = g_strdup_printf ("get port info for %s", _tmp177_);
+ _tmp166_ = g_strdup_printf ("get port info for %s", _tmp165_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp179_ = _tmp178_;
+ _tmp167_ = _tmp166_;
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp176_, _tmp179_, &_inner_error_);
+ camera_table_do_op (self, _tmp164_, _tmp167_, &_inner_error_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp179_);
+ _g_free0 (_tmp167_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3715,7 +3697,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3717 "CameraTable.c"
+#line 3699 "CameraTable.c"
} else {
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3751,52 +3733,50 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3753 "CameraTable.c"
+#line 3735 "CameraTable.c"
}
}
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gp_port_info_get_path (port_info, &_tmp180_);
+ gp_port_info_get_path (port_info, &_tmp168_);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp181_ = g_strdup (_tmp180_);
+ _tmp169_ = g_strdup (_tmp168_);
#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- tmp_path = _tmp181_;
+ tmp_path = _tmp169_;
#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp182_ = port;
+ _tmp170_ = port;
#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp183_ = tmp_path;
+ _tmp171_ = tmp_path;
#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _vala_assert (g_strcmp0 (_tmp182_, _tmp183_) == 0, "port == tmp_path");
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp184_ = self->priv->abilities_list;
+ _vala_assert (g_strcmp0 (_tmp170_, _tmp171_) == 0, "port == tmp_path");
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp185_ = name;
+ _tmp172_ = self->priv->abilities_list;
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp186_ = gp_abilities_list_lookup_model (_tmp184_, _tmp185_);
+ _tmp173_ = name;
#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- index = _tmp186_;
+ index = gp_abilities_list_lookup_model (_tmp172_, _tmp173_);
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp187_ = index;
+ _tmp174_ = index;
#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- if (_tmp187_ < 0) {
-#line 3782 "CameraTable.c"
- gint _tmp188_;
- const gchar* _tmp189_;
- gchar* _tmp190_;
- gchar* _tmp191_;
+ if (_tmp174_ < 0) {
+#line 3762 "CameraTable.c"
+ gint _tmp175_;
+ const gchar* _tmp176_;
+ gchar* _tmp177_;
+ gchar* _tmp178_;
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp188_ = index;
+ _tmp175_ = index;
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp189_ = name;
+ _tmp176_ = name;
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp190_ = g_strdup_printf ("lookup camera model %s", _tmp189_);
+ _tmp177_ = g_strdup_printf ("lookup camera model %s", _tmp176_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp191_ = _tmp190_;
+ _tmp178_ = _tmp177_;
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, (int) _tmp188_, _tmp191_, &_inner_error_);
+ camera_table_do_op (self, (int) _tmp175_, _tmp178_, &_inner_error_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp191_);
+ _g_free0 (_tmp178_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3833,7 +3813,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3835 "CameraTable.c"
+#line 3815 "CameraTable.c"
} else {
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_free0 (tmp_path);
@@ -3869,30 +3849,30 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3871 "CameraTable.c"
+#line 3851 "CameraTable.c"
}
}
}
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp192_ = self->priv->abilities_list;
+ _tmp179_ = self->priv->abilities_list;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp193_ = index;
+ _tmp180_ = index;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp195_ = gp_abilities_list_get_abilities (_tmp192_, _tmp193_, &_tmp194_);
+ _tmp182_ = gp_abilities_list_get_abilities (_tmp179_, _tmp180_, &_tmp181_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_abilities = _tmp194_;
+ camera_abilities = _tmp181_;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp196_ = name;
+ _tmp183_ = name;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp197_ = g_strdup_printf ("lookup camera abilities for %s", _tmp196_);
+ _tmp184_ = g_strdup_printf ("lookup camera abilities for %s", _tmp183_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp198_ = _tmp197_;
+ _tmp185_ = _tmp184_;
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp195_, _tmp198_, &_inner_error_);
+ camera_table_do_op (self, _tmp182_, _tmp185_, &_inner_error_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp198_);
+ _g_free0 (_tmp185_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3931,7 +3911,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3933 "CameraTable.c"
+#line 3913 "CameraTable.c"
} else {
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
(camera_abilities);
@@ -3969,25 +3949,25 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 3971 "CameraTable.c"
+#line 3951 "CameraTable.c"
}
}
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp200_ = gp_camera_new (&_tmp199_);
+ _tmp187_ = gp_camera_new (&_tmp186_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gcamera = _tmp199_;
+ gcamera = _tmp186_;
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp201_ = name;
+ _tmp188_ = name;
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp202_ = g_strdup_printf ("create camera object for %s", _tmp201_);
+ _tmp189_ = g_strdup_printf ("create camera object for %s", _tmp188_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp203_ = _tmp202_;
+ _tmp190_ = _tmp189_;
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp200_, _tmp203_, &_inner_error_);
+ camera_table_do_op (self, _tmp187_, _tmp190_, &_inner_error_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp203_);
+ _g_free0 (_tmp190_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4028,7 +4008,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4030 "CameraTable.c"
+#line 4010 "CameraTable.c"
} else {
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4068,25 +4048,23 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4070 "CameraTable.c"
+#line 4050 "CameraTable.c"
}
}
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp204_ = gcamera;
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp205_ = camera_abilities;
+ _tmp191_ = gcamera;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp206_ = gp_camera_set_abilities (_tmp204_, _tmp205_);
+ _tmp192_ = camera_abilities;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp207_ = name;
+ _tmp193_ = name;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp208_ = g_strdup_printf ("set camera abilities for %s", _tmp207_);
+ _tmp194_ = g_strdup_printf ("set camera abilities for %s", _tmp193_);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp209_ = _tmp208_;
+ _tmp195_ = _tmp194_;
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp206_, _tmp209_, &_inner_error_);
+ camera_table_do_op (self, gp_camera_set_abilities (_tmp191_, _tmp192_), _tmp195_, &_inner_error_);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp209_);
+ _g_free0 (_tmp195_);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4127,7 +4105,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4129 "CameraTable.c"
+#line 4107 "CameraTable.c"
} else {
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4167,27 +4145,25 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4169 "CameraTable.c"
+#line 4147 "CameraTable.c"
}
}
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp210_ = gcamera;
+ _tmp196_ = gcamera;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp211_ = port_info;
+ _tmp197_ = port_info;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp212_ = gp_camera_set_port_info (_tmp210_, _tmp211_);
+ _tmp198_ = name;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp213_ = name;
+ _tmp199_ = port;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp214_ = port;
+ _tmp200_ = g_strdup_printf ("set port info for %s on %s", _tmp198_, _tmp199_);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp215_ = g_strdup_printf ("set port info for %s on %s", _tmp213_, _tmp214_);
+ _tmp201_ = _tmp200_;
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp216_ = _tmp215_;
+ camera_table_do_op (self, gp_camera_set_port_info (_tmp196_, _tmp197_), _tmp201_, &_inner_error_);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera_table_do_op (self, _tmp212_, _tmp216_, &_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _g_free0 (_tmp216_);
+ _g_free0 (_tmp201_);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4228,7 +4204,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
_gp_port_info_list_free0 (port_info_list);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4230 "CameraTable.c"
+#line 4206 "CameraTable.c"
} else {
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_gp_camera_unref0 (gcamera);
@@ -4268,39 +4244,39 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
g_clear_error (&_inner_error_);
#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4270 "CameraTable.c"
+#line 4246 "CameraTable.c"
}
}
#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp217_ = name;
+ _tmp202_ = name;
#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp218_ = port;
+ _tmp203_ = port;
#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp217_, _tmp218_);
+ g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp202_, _tmp203_);
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp219_ = gcamera;
+ _tmp204_ = gcamera;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp220_ = uri;
+ _tmp205_ = uri;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp221_ = display_name;
+ _tmp206_ = display_name;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp222_ = icon;
+ _tmp207_ = icon;
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp223_ = discovered_camera_new (_tmp219_, _tmp220_, _tmp221_, _tmp222_);
+ _tmp208_ = discovered_camera_new (_tmp204_, _tmp205_, _tmp206_, _tmp207_);
#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- camera = _tmp223_;
+ camera = _tmp208_;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp224_ = self->priv->camera_map;
+ _tmp209_ = self->priv->camera_map;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp225_ = uri;
+ _tmp210_ = uri;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp226_ = camera;
+ _tmp211_ = camera;
#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp225_, _tmp226_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp209_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp210_, _tmp211_);
#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp227_ = camera;
+ _tmp212_ = camera;
#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp227_);
+ g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp212_);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_discovered_camera_unref0 (camera);
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4323,11 +4299,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 4325 "CameraTable.c"
+#line 4301 "CameraTable.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_object_unref0 (_port_it);
-#line 4329 "CameraTable.c"
+#line 4305 "CameraTable.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4339,15 +4315,17 @@ 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 4341 "CameraTable.c"
+#line 4317 "CameraTable.c"
}
-static void camera_table_on_udev_event (CameraTable* self, const gchar* action, GUdevDevice* device) {
+static void
+camera_table_on_udev_event (CameraTable* self,
+ const gchar* action,
+ GUdevDevice* device)
+{
const gchar* _tmp0_;
- GUdevDevice* _tmp1_;
- const gchar* _tmp2_;
- OneShotScheduler* _tmp3_;
+ OneShotScheduler* _tmp1_;
#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4355,22 +4333,21 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (G_UDEV_IS_DEVICE (device));
#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp0_ = action;
-#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp1_ = device;
+ _tmp0_ = g_udev_device_get_name (device);
#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp2_ = g_udev_device_get_name (_tmp1_);
-#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- g_debug ("CameraTable.vala:396: udev event: %s on %s", _tmp0_, _tmp2_);
+ g_debug ("CameraTable.vala:396: udev event: %s on %s", action, _tmp0_);
#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- _tmp3_ = self->priv->camera_update_scheduler;
+ _tmp1_ = self->priv->camera_update_scheduler;
#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
- one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4368 "CameraTable.c"
+ one_shot_scheduler_after_timeout (_tmp1_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
+#line 4342 "CameraTable.c"
}
-void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
+void
+camera_table_on_volume_changed (CameraTable* self,
+ GVolume* volume)
+{
OneShotScheduler* _tmp0_;
#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
@@ -4380,15 +4357,17 @@ void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
_tmp0_ = self->priv->camera_update_scheduler;
#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4382 "CameraTable.c"
+#line 4359 "CameraTable.c"
}
-static void camera_table_on_update_cameras (CameraTable* self) {
+static void
+camera_table_on_update_cameras (CameraTable* self)
+{
GError * _inner_error_ = NULL;
#line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4390 "CameraTable.c"
+#line 4369 "CameraTable.c"
{
CameraTable* _tmp0_;
CameraTable* _tmp1_;
@@ -4404,7 +4383,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4406 "CameraTable.c"
+#line 4385 "CameraTable.c"
goto __catch68_gphoto_error;
}
#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4413,7 +4392,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4415 "CameraTable.c"
+#line 4394 "CameraTable.c"
}
}
goto __finally68;
@@ -4434,7 +4413,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_warning ("CameraTable.vala:411: Error updating camera table: %s", _tmp3_);
#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
_g_error_free0 (err);
-#line 4436 "CameraTable.c"
+#line 4415 "CameraTable.c"
}
__finally68:
#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4445,12 +4424,19 @@ static void camera_table_on_update_cameras (CameraTable* self) {
g_clear_error (&_inner_error_);
#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return;
-#line 4447 "CameraTable.c"
+#line 4426 "CameraTable.c"
}
}
-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
+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)
+{
typedef void (*GMarshalFunc_VOID__DISCOVERED_CAMERA) (gpointer data1, gpointer arg_1, gpointer data2);
register GMarshalFunc_VOID__DISCOVERED_CAMERA callback;
register GCClosure * cc;
@@ -4465,61 +4451,75 @@ 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 4467 "CameraTable.c"
+#line 4453 "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 4473 "CameraTable.c"
+#line 4459 "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 4479 "CameraTable.c"
+#line 4465 "CameraTable.c"
}
-static void value_camera_table_init (GValue* value) {
+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 4486 "CameraTable.c"
+#line 4474 "CameraTable.c"
}
-static void value_camera_table_free_value (GValue* value) {
+static void
+value_camera_table_free_value (GValue* value)
+{
#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"
camera_table_unref (value->data[0].v_pointer);
-#line 4495 "CameraTable.c"
+#line 4485 "CameraTable.c"
}
}
-static void value_camera_table_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_camera_table_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 4505 "CameraTable.c"
+#line 4498 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4509 "CameraTable.c"
+#line 4502 "CameraTable.c"
}
}
-static gpointer value_camera_table_peek_pointer (const GValue* value) {
+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 4517 "CameraTable.c"
+#line 4512 "CameraTable.c"
}
-static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 4524 "CameraTable.c"
@@ -4549,36 +4549,47 @@ static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_v
}
-static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_camera_table_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
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 4558 "CameraTable.c"
+#line 4563 "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 4564 "CameraTable.c"
+#line 4569 "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 4568 "CameraTable.c"
+#line 4573 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4572 "CameraTable.c"
+#line 4577 "CameraTable.c"
}
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
return NULL;
-#line 4576 "CameraTable.c"
+#line 4581 "CameraTable.c"
}
-GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_camera_table (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
ParamSpecCameraTable* spec;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_CAMERA_TABLE), NULL);
@@ -4588,20 +4599,25 @@ 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 4590 "CameraTable.c"
+#line 4601 "CameraTable.c"
}
-gpointer value_get_camera_table (const GValue* value) {
+gpointer
+value_get_camera_table (const GValue* value)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
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 4599 "CameraTable.c"
+#line 4612 "CameraTable.c"
}
-void value_set_camera_table (GValue* value, gpointer v_object) {
+void
+value_set_camera_table (GValue* value,
+ gpointer v_object)
+{
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));
@@ -4617,22 +4633,25 @@ 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 4619 "CameraTable.c"
+#line 4635 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4623 "CameraTable.c"
+#line 4639 "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 4629 "CameraTable.c"
+#line 4645 "CameraTable.c"
}
}
-void value_take_camera_table (GValue* value, gpointer v_object) {
+void
+value_take_camera_table (GValue* value,
+ gpointer v_object)
+{
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));
@@ -4646,22 +4665,24 @@ 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 4648 "CameraTable.c"
+#line 4667 "CameraTable.c"
} else {
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
value->data[0].v_pointer = NULL;
-#line 4652 "CameraTable.c"
+#line 4671 "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 4658 "CameraTable.c"
+#line 4677 "CameraTable.c"
}
}
-static void camera_table_class_init (CameraTableClass * klass) {
+static void
+camera_table_class_init (CameraTableClass * klass)
+{
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_parent_class = g_type_class_peek_parent (klass);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4672,11 +4693,13 @@ static void camera_table_class_init (CameraTableClass * klass) {
camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
-#line 4674 "CameraTable.c"
+#line 4695 "CameraTable.c"
}
-static void camera_table_instance_init (CameraTable * self) {
+static void
+camera_table_instance_init (CameraTable * self)
+{
GUdevClient* _tmp0_;
GPContext* _tmp1_;
GeeHashMap* _tmp2_;
@@ -4698,11 +4721,13 @@ 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 4700 "CameraTable.c"
+#line 4723 "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);
@@ -4720,11 +4745,13 @@ 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 4722 "CameraTable.c"
+#line 4747 "CameraTable.c"
}
-GType camera_table_get_type (void) {
+GType
+camera_table_get_type (void)
+{
static volatile gsize camera_table_type_id__volatile = 0;
if (g_once_init_enter (&camera_table_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { value_camera_table_init, value_camera_table_free_value, value_camera_table_copy_value, value_camera_table_peek_pointer, "p", value_camera_table_collect_value, "p", value_camera_table_lcopy_value };
@@ -4738,18 +4765,22 @@ GType camera_table_get_type (void) {
}
-gpointer camera_table_ref (gpointer instance) {
+gpointer
+camera_table_ref (gpointer instance)
+{
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 4747 "CameraTable.c"
+#line 4776 "CameraTable.c"
}
-void camera_table_unref (gpointer instance) {
+void
+camera_table_unref (gpointer instance)
+{
CameraTable * self;
self = instance;
#line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4758,12 +4789,16 @@ 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 4760 "CameraTable.c"
+#line 4791 "CameraTable.c"
}
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -4775,7 +4810,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index b1865ed..773ab4e 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.36.6, the Vala compiler
+/* GPhoto.c generated by valac 0.40.4, the Vala compiler
* generated from GPhoto.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -132,148 +133,290 @@ static gpointer gp_spin_idle_wrapper_parent_class = NULL;
GQuark gphoto_error_quark (void);
gpointer gp_context_wrapper_ref (gpointer instance);
void gp_context_wrapper_unref (gpointer instance);
-GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void gp_value_set_context_wrapper (GValue* value, gpointer v_object);
-void gp_value_take_context_wrapper (GValue* value, gpointer v_object);
+GParamSpec* gp_param_spec_context_wrapper (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void gp_value_set_context_wrapper (GValue* value,
+ gpointer v_object);
+void gp_value_take_context_wrapper (GValue* value,
+ gpointer v_object);
gpointer gp_value_get_context_wrapper (const GValue* value);
GType gp_context_wrapper_get_type (void) G_GNUC_CONST;
-enum {
- GP_CONTEXT_WRAPPER_DUMMY_PROPERTY
-};
GPContextWrapper* gp_context_wrapper_new (void);
GPContextWrapper* gp_context_wrapper_construct (GType object_type);
-static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* context);
-static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self);
-static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* context, const gchar* text);
-static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self);
-static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* context, const gchar* text);
-static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self);
-static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* context, const gchar* text);
-static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self);
-static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPContext* context, gfloat target, const gchar* text);
-static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context, gfloat target, const gchar* text, gpointer self);
-static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPContext* context, guint id, gfloat current);
-static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self);
-static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPContext* context, guint id);
-static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self);
+static void gp_context_wrapper_on_idle (GPContextWrapper* self,
+ GPContext* context);
+static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context,
+ gpointer self);
+static void gp_context_wrapper_on_error (GPContextWrapper* self,
+ GPContext* context,
+ const gchar* text);
+static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context,
+ const gchar* text,
+ gpointer self);
+static void gp_context_wrapper_on_status (GPContextWrapper* self,
+ GPContext* context,
+ const gchar* text);
+static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context,
+ const gchar* text,
+ gpointer self);
+static void gp_context_wrapper_on_message (GPContextWrapper* self,
+ GPContext* context,
+ const gchar* text);
+static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context,
+ const gchar* text,
+ gpointer self);
+static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self,
+ GPContext* context,
+ gfloat target,
+ const gchar* text);
+static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context,
+ gfloat target,
+ const gchar* text,
+ gpointer self);
+static void gp_context_wrapper_on_progress_update (GPContextWrapper* self,
+ GPContext* context,
+ guint id,
+ gfloat current);
+static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context,
+ guint id,
+ gfloat current,
+ gpointer self);
+static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self,
+ GPContext* context,
+ guint id);
+static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context,
+ guint id,
+ gpointer self);
void gp_context_wrapper_idle (GPContextWrapper* self);
static void gp_context_wrapper_real_idle (GPContextWrapper* self);
-void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void* data);
-static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data);
-void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void* data);
-static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data);
-void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void* data);
-static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data);
-void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data);
-static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data);
-void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current, void* data);
-static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, gfloat current, void* data);
+void gp_context_wrapper_error (GPContextWrapper* self,
+ const gchar* text,
+ void* data);
+static void gp_context_wrapper_real_error (GPContextWrapper* self,
+ const gchar* text,
+ void* data);
+void gp_context_wrapper_status (GPContextWrapper* self,
+ const gchar* text,
+ void* data);
+static void gp_context_wrapper_real_status (GPContextWrapper* self,
+ const gchar* text,
+ void* data);
+void gp_context_wrapper_message (GPContextWrapper* self,
+ const gchar* text,
+ void* data);
+static void gp_context_wrapper_real_message (GPContextWrapper* self,
+ const gchar* text,
+ void* data);
+void gp_context_wrapper_progress_start (GPContextWrapper* self,
+ gfloat current,
+ const gchar* text,
+ void* data);
+static void gp_context_wrapper_real_progress_start (GPContextWrapper* self,
+ gfloat current,
+ const gchar* text,
+ void* data);
+void gp_context_wrapper_progress_update (GPContextWrapper* self,
+ gfloat current,
+ void* data);
+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);
GType gp_spin_idle_wrapper_get_type (void) G_GNUC_CONST;
-enum {
- GP_SPIN_IDLE_WRAPPER_DUMMY_PROPERTY
-};
GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void);
GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type);
static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base);
void spin_event_loop (void);
-static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, gfloat current, void* data);
+static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base,
+ gfloat current,
+ void* data);
#define GP_MAX_FILENAME_LENGTH 63
#define GP_MAX_BASEDIR_LENGTH 255
-gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error);
-GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file);
+gboolean gp_get_info (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ CameraFileInfo* info,
+ GError** error);
+GBytes* gp_camera_file_to_bytes (GPContext* context,
+ CameraFile* file);
gpointer media_metadata_ref (gpointer instance);
void media_metadata_unref (gpointer instance);
-GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_metadata (GValue* value, gpointer v_object);
-void value_take_media_metadata (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_metadata (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_media_metadata (GValue* value,
+ gpointer v_object);
+void value_take_media_metadata (GValue* value,
+ gpointer v_object);
gpointer value_get_media_metadata (const GValue* value);
GType media_metadata_get_type (void) G_GNUC_CONST;
GType photo_metadata_get_type (void) G_GNUC_CONST;
-PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, const gchar* folder, const gchar* filename);
+PhotoMetadata* gp_get_fallback_metadata (Camera* camera,
+ GPContext* context,
+ const gchar* folder,
+ const gchar* filename);
PhotoMetadata* photo_metadata_new (void);
PhotoMetadata* photo_metadata_construct (GType object_type);
-void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error);
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error);
-GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error);
+void media_metadata_read_from_file (MediaMetadata* self,
+ GFile* file,
+ GError** error);
+GdkPixbuf* gp_load_preview (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ gchar* * preview_md5,
+ GError** error);
+GBytes* gp_load_file_into_buffer (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ CameraFileType filetype,
+ GError** error);
guint photo_metadata_get_preview_count (PhotoMetadata* self);
gpointer photo_preview_ref (gpointer instance);
void photo_preview_unref (gpointer instance);
-GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_preview (GValue* value, gpointer v_object);
-void value_take_photo_preview (GValue* value, gpointer v_object);
+GParamSpec* param_spec_photo_preview (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_photo_preview (GValue* value,
+ gpointer v_object);
+void value_take_photo_preview (GValue* value,
+ gpointer v_object);
gpointer value_get_photo_preview (const GValue* value);
GType photo_preview_get_type (void) G_GNUC_CONST;
-PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
-GBytes* photo_preview_flatten (PhotoPreview* self, GError** error);
+PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self,
+ guint number);
+GBytes* photo_preview_flatten (PhotoPreview* self,
+ GError** error);
#define IMPORT_PREVIEW_MAX_SCALE 128
-GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
-GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error);
-void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error);
-PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
-void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error);
+GdkPixbuf* gp_load_image (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ GError** error);
+GInputStream* gp_load_file_into_stream (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ CameraFileType filetype,
+ GError** error);
+void gp_save_image (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ GFile* dest_file,
+ GError** error);
+PhotoMetadata* gp_load_metadata (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ GError** error);
+void photo_metadata_read_from_app1_segment (PhotoMetadata* self,
+ GBytes* buffer,
+ GError** error);
GFile* app_dirs_get_temp_dir (void);
-GQuark gphoto_error_quark (void) {
+GQuark
+gphoto_error_quark (void)
+{
return g_quark_from_static_string ("gphoto_error-quark");
}
-static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) {
+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 229 "GPhoto.c"
+#line 344 "GPhoto.c"
}
-static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) {
+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 236 "GPhoto.c"
+#line 355 "GPhoto.c"
}
-static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) {
+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 243 "GPhoto.c"
+#line 366 "GPhoto.c"
}
-static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) {
+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 250 "GPhoto.c"
+#line 377 "GPhoto.c"
}
-static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context, gfloat target, const gchar* text, gpointer self) {
+static guint
+_gp_context_wrapper_on_progress_start_gp_context_progress_start_func (GPContext* context,
+ gfloat target,
+ const gchar* text,
+ gpointer self)
+{
guint result;
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 259 "GPhoto.c"
+#line 391 "GPhoto.c"
}
-static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) {
+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 266 "GPhoto.c"
+#line 403 "GPhoto.c"
}
-static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) {
+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 273 "GPhoto.c"
+#line 414 "GPhoto.c"
}
-GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
+GPContextWrapper*
+gp_context_wrapper_construct (GType object_type)
+{
GPContextWrapper* self = NULL;
GPContext* _tmp0_;
GPContext* _tmp1_;
@@ -304,133 +447,191 @@ 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 308 "GPhoto.c"
+#line 451 "GPhoto.c"
}
-GPContextWrapper* gp_context_wrapper_new (void) {
+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 315 "GPhoto.c"
+#line 460 "GPhoto.c"
}
-static void gp_context_wrapper_real_idle (GPContextWrapper* self) {
+static void
+gp_context_wrapper_real_idle (GPContextWrapper* self)
+{
}
-void gp_context_wrapper_idle (GPContextWrapper* self) {
+void
+gp_context_wrapper_idle (GPContextWrapper* self)
+{
#line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 328 "GPhoto.c"
+#line 477 "GPhoto.c"
}
-static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) {
+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 335 "GPhoto.c"
+#line 488 "GPhoto.c"
}
-void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void* data) {
+void
+gp_context_wrapper_error (GPContextWrapper* self,
+ const gchar* text,
+ void* data)
+{
#line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 344 "GPhoto.c"
+#line 501 "GPhoto.c"
}
-static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) {
+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 351 "GPhoto.c"
+#line 512 "GPhoto.c"
}
-void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void* data) {
+void
+gp_context_wrapper_status (GPContextWrapper* self,
+ const gchar* text,
+ void* data)
+{
#line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 360 "GPhoto.c"
+#line 525 "GPhoto.c"
}
-static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) {
+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 367 "GPhoto.c"
+#line 536 "GPhoto.c"
}
-void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void* data) {
+void
+gp_context_wrapper_message (GPContextWrapper* self,
+ const gchar* text,
+ void* data)
+{
#line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 376 "GPhoto.c"
+#line 549 "GPhoto.c"
}
-static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
+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 383 "GPhoto.c"
+#line 561 "GPhoto.c"
}
-void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
+void
+gp_context_wrapper_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 (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 392 "GPhoto.c"
+#line 575 "GPhoto.c"
}
-static void gp_context_wrapper_real_progress_update (GPContextWrapper* self, gfloat current, void* data) {
+static void
+gp_context_wrapper_real_progress_update (GPContextWrapper* self,
+ gfloat current,
+ void* data)
+{
}
-void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current, void* data) {
+void
+gp_context_wrapper_progress_update (GPContextWrapper* self,
+ gfloat current,
+ void* data)
+{
#line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 405 "GPhoto.c"
+#line 596 "GPhoto.c"
}
-static void gp_context_wrapper_real_progress_stop (GPContextWrapper* self) {
+static void
+gp_context_wrapper_real_progress_stop (GPContextWrapper* self)
+{
}
-void gp_context_wrapper_progress_stop (GPContextWrapper* self) {
+void
+gp_context_wrapper_progress_stop (GPContextWrapper* self)
+{
#line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 418 "GPhoto.c"
+#line 613 "GPhoto.c"
}
-static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* context) {
+static void
+gp_context_wrapper_on_idle (GPContextWrapper* self,
+ GPContext* context)
+{
#line 46 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 46 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (context != NULL);
#line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_idle (self);
-#line 429 "GPhoto.c"
+#line 627 "GPhoto.c"
}
-static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* context, const gchar* text) {
- const gchar* _tmp0_;
+static void
+gp_context_wrapper_on_error (GPContextWrapper* self,
+ GPContext* context,
+ const gchar* text)
+{
#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"
@@ -438,15 +639,16 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont
#line 50 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
#line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = text;
-#line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_context_wrapper_error (self, _tmp0_, NULL);
-#line 445 "GPhoto.c"
+ gp_context_wrapper_error (self, text, NULL);
+#line 644 "GPhoto.c"
}
-static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* context, const gchar* text) {
- const gchar* _tmp0_;
+static void
+gp_context_wrapper_on_status (GPContextWrapper* self,
+ GPContext* context,
+ const gchar* text)
+{
#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"
@@ -454,15 +656,16 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con
#line 54 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
#line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = text;
-#line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_context_wrapper_status (self, _tmp0_, NULL);
-#line 461 "GPhoto.c"
+ gp_context_wrapper_status (self, text, NULL);
+#line 661 "GPhoto.c"
}
-static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* context, const gchar* text) {
- const gchar* _tmp0_;
+static void
+gp_context_wrapper_on_message (GPContextWrapper* self,
+ GPContext* context,
+ const gchar* text)
+{
#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"
@@ -470,17 +673,18 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co
#line 58 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (text != NULL);
#line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = text;
-#line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_context_wrapper_message (self, _tmp0_, NULL);
-#line 477 "GPhoto.c"
+ gp_context_wrapper_message (self, text, NULL);
+#line 678 "GPhoto.c"
}
-static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPContext* context, gfloat target, const gchar* text) {
+static guint
+gp_context_wrapper_on_progress_start (GPContextWrapper* self,
+ GPContext* context,
+ gfloat target,
+ const gchar* text)
+{
guint result = 0U;
- 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"
@@ -488,142 +692,169 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon
#line 62 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (text != NULL, 0U);
#line 63 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = target;
-#line 63 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = text;
-#line 63 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_context_wrapper_progress_start (self, _tmp0_, _tmp1_, NULL);
+ gp_context_wrapper_progress_start (self, target, text, NULL);
#line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = (guint) 0;
#line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 501 "GPhoto.c"
+#line 701 "GPhoto.c"
}
-static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPContext* context, guint id, gfloat current) {
- gfloat _tmp0_;
+static void
+gp_context_wrapper_on_progress_update (GPContextWrapper* self,
+ GPContext* context,
+ guint id,
+ gfloat current)
+{
#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"
g_return_if_fail (context != NULL);
#line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = current;
-#line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_context_wrapper_progress_update (self, _tmp0_, NULL);
-#line 515 "GPhoto.c"
+ gp_context_wrapper_progress_update (self, current, NULL);
+#line 717 "GPhoto.c"
}
-static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPContext* context, guint id) {
+static void
+gp_context_wrapper_on_progress_stop (GPContextWrapper* self,
+ GPContext* context,
+ guint id)
+{
#line 72 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
#line 72 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (context != NULL);
#line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_progress_stop (self);
-#line 526 "GPhoto.c"
+#line 732 "GPhoto.c"
}
-static void gp_value_context_wrapper_init (GValue* value) {
+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 533 "GPhoto.c"
+#line 741 "GPhoto.c"
}
-static void gp_value_context_wrapper_free_value (GValue* value) {
+static void
+gp_value_context_wrapper_free_value (GValue* value)
+{
#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"
gp_context_wrapper_unref (value->data[0].v_pointer);
-#line 542 "GPhoto.c"
+#line 752 "GPhoto.c"
}
}
-static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+gp_value_context_wrapper_copy_value (const GValue* src_value,
+ GValue* dest_value)
+{
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 552 "GPhoto.c"
+#line 765 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
dest_value->data[0].v_pointer = NULL;
-#line 556 "GPhoto.c"
+#line 769 "GPhoto.c"
}
}
-static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) {
+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 564 "GPhoto.c"
+#line 779 "GPhoto.c"
}
-static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+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 571 "GPhoto.c"
+#line 791 "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 578 "GPhoto.c"
+#line 798 "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 582 "GPhoto.c"
+#line 802 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 586 "GPhoto.c"
+#line 806 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 590 "GPhoto.c"
+#line 810 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 594 "GPhoto.c"
+#line 814 "GPhoto.c"
}
-static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+gp_value_context_wrapper_lcopy_value (const GValue* value,
+ guint n_collect_values,
+ GTypeCValue* collect_values,
+ guint collect_flags)
+{
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 605 "GPhoto.c"
+#line 830 "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 611 "GPhoto.c"
+#line 836 "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 615 "GPhoto.c"
+#line 840 "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 619 "GPhoto.c"
+#line 844 "GPhoto.c"
}
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 623 "GPhoto.c"
+#line 848 "GPhoto.c"
}
-GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+gp_param_spec_context_wrapper (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags)
+{
GPParamSpecContextWrapper* spec;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (g_type_is_a (object_type, GP_TYPE_CONTEXT_WRAPPER), NULL);
@@ -633,20 +864,25 @@ 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 637 "GPhoto.c"
+#line 868 "GPhoto.c"
}
-gpointer gp_value_get_context_wrapper (const GValue* value) {
+gpointer
+gp_value_get_context_wrapper (const GValue* value)
+{
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
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 646 "GPhoto.c"
+#line 879 "GPhoto.c"
}
-void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
+void
+gp_value_set_context_wrapper (GValue* value,
+ gpointer v_object)
+{
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));
@@ -662,22 +898,25 @@ 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 666 "GPhoto.c"
+#line 902 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 670 "GPhoto.c"
+#line 906 "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 676 "GPhoto.c"
+#line 912 "GPhoto.c"
}
}
-void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
+void
+gp_value_take_context_wrapper (GValue* value,
+ gpointer v_object)
+{
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));
@@ -691,22 +930,24 @@ 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 695 "GPhoto.c"
+#line 934 "GPhoto.c"
} else {
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
value->data[0].v_pointer = NULL;
-#line 699 "GPhoto.c"
+#line 938 "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 705 "GPhoto.c"
+#line 944 "GPhoto.c"
}
}
-static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
+static void
+gp_context_wrapper_class_init (GPContextWrapperClass * klass)
+{
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
gp_context_wrapper_parent_class = g_type_class_peek_parent (klass);
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -725,11 +966,13 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_context_wrapper_real_progress_update;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
((GPContextWrapperClass *) klass)->progress_stop = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_progress_stop;
-#line 729 "GPhoto.c"
+#line 970 "GPhoto.c"
}
-static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
+static void
+gp_context_wrapper_instance_init (GPContextWrapper * self)
+{
GPContext* _tmp0_;
#line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = gp_context_new ();
@@ -737,11 +980,13 @@ static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
self->context = _tmp0_;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self->ref_count = 1;
-#line 741 "GPhoto.c"
+#line 984 "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);
@@ -749,11 +994,13 @@ 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 753 "GPhoto.c"
+#line 998 "GPhoto.c"
}
-GType gp_context_wrapper_get_type (void) {
+GType
+gp_context_wrapper_get_type (void)
+{
static volatile gsize gp_context_wrapper_type_id__volatile = 0;
if (g_once_init_enter (&gp_context_wrapper_type_id__volatile)) {
static const GTypeValueTable g_define_type_value_table = { gp_value_context_wrapper_init, gp_value_context_wrapper_free_value, gp_value_context_wrapper_copy_value, gp_value_context_wrapper_peek_pointer, "p", gp_value_context_wrapper_collect_value, "p", gp_value_context_wrapper_lcopy_value };
@@ -767,18 +1014,22 @@ GType gp_context_wrapper_get_type (void) {
}
-gpointer gp_context_wrapper_ref (gpointer instance) {
+gpointer
+gp_context_wrapper_ref (gpointer instance)
+{
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 778 "GPhoto.c"
+#line 1027 "GPhoto.c"
}
-void gp_context_wrapper_unref (gpointer instance) {
+void
+gp_context_wrapper_unref (gpointer instance)
+{
GPContextWrapper * self;
self = instance;
#line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -787,29 +1038,35 @@ 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 791 "GPhoto.c"
+#line 1042 "GPhoto.c"
}
}
-GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) {
+GPSpinIdleWrapper*
+gp_spin_idle_wrapper_construct (GType object_type)
+{
GPSpinIdleWrapper* self = NULL;
#line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type);
#line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return self;
-#line 802 "GPhoto.c"
+#line 1055 "GPhoto.c"
}
-GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) {
+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 809 "GPhoto.c"
+#line 1064 "GPhoto.c"
}
-static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) {
+static void
+gp_spin_idle_wrapper_real_idle (GPContextWrapper* base)
+{
GPSpinIdleWrapper * self;
#line 82 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, GP_TYPE_SPIN_IDLE_WRAPPER, GPSpinIdleWrapper);
@@ -817,44 +1074,48 @@ 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 821 "GPhoto.c"
+#line 1078 "GPhoto.c"
}
-static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, gfloat current, void* data) {
+static void
+gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base,
+ gfloat current,
+ void* data)
+{
GPSpinIdleWrapper * self;
- 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"
- _tmp0_ = current;
-#line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = data;
-#line 89 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- 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_);
+ GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), current, data);
#line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
spin_event_loop ();
-#line 839 "GPhoto.c"
+#line 1094 "GPhoto.c"
}
-static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
+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;
#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 850 "GPhoto.c"
+#line 1107 "GPhoto.c"
}
-static void gp_spin_idle_wrapper_instance_init (GPSpinIdleWrapper * self) {
+static void
+gp_spin_idle_wrapper_instance_init (GPSpinIdleWrapper * self)
+{
}
-GType gp_spin_idle_wrapper_get_type (void) {
+GType
+gp_spin_idle_wrapper_get_type (void)
+{
static volatile gsize gp_spin_idle_wrapper_type_id__volatile = 0;
if (g_once_init_enter (&gp_spin_idle_wrapper_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (GPSpinIdleWrapperClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gp_spin_idle_wrapper_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GPSpinIdleWrapper), 0, (GInstanceInitFunc) gp_spin_idle_wrapper_instance_init, NULL };
@@ -866,21 +1127,23 @@ GType gp_spin_idle_wrapper_get_type (void) {
}
-gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error) {
+gboolean
+gp_get_info (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ CameraFileInfo* info,
+ GError** error)
+{
CameraFileInfo _vala_info = {0};
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_;
+ gint _tmp1_;
gint _tmp2_;
- gint _tmp3_;
int res = 0;
- Camera* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
- GPContext* _tmp11_;
- CameraFileInfo _tmp12_ = {0};
- int _tmp13_;
- int _tmp14_;
+ CameraFileInfo _tmp6_ = {0};
+ int _tmp7_;
+ int _tmp8_;
GError * _inner_error_ = NULL;
#line 102 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, FALSE);
@@ -891,101 +1154,82 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
#line 102 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, FALSE);
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = folder;
-#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp2_ = strlen (_tmp1_);
+ _tmp1_ = strlen (folder);
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) {
+ if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) {
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = TRUE;
-#line 904 "GPhoto.c"
+#line 1165 "GPhoto.c"
} else {
- const gchar* _tmp4_;
- gint _tmp5_;
- gint _tmp6_;
-#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp4_ = filename;
+ gint _tmp3_;
+ gint _tmp4_;
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp5_ = strlen (_tmp4_);
+ _tmp3_ = strlen (filename);
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = _tmp3_;
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH;
-#line 917 "GPhoto.c"
+ _tmp0_ = _tmp4_ > GP_MAX_FILENAME_LENGTH;
+#line 1175 "GPhoto.c"
}
#line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp0_) {
-#line 921 "GPhoto.c"
- CameraFileInfo _tmp7_ = {0};
+#line 1179 "GPhoto.c"
+ CameraFileInfo _tmp5_ = {0};
#line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
#line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_info = _tmp7_;
+ _vala_info = _tmp5_;
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = FALSE;
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (info) {
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*info = _vala_info;
-#line 933 "GPhoto.c"
+#line 1191 "GPhoto.c"
} else {
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
-#line 937 "GPhoto.c"
+#line 1195 "GPhoto.c"
}
#line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 941 "GPhoto.c"
+#line 1199 "GPhoto.c"
}
#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = camera;
-#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = folder;
-#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = filename;
-#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = context;
-#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = gp_camera_file_get_info (_tmp8_, _tmp9_, _tmp10_, &_tmp12_, _tmp11_);
+ _tmp7_ = gp_camera_file_get_info (camera, folder, filename, &_tmp6_, context);
#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_info = _tmp12_;
+ _vala_info = _tmp6_;
#line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp13_;
+ res = _tmp7_;
#line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = res;
+ _tmp8_ = res;
#line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp14_ != GP_OK) {
-#line 963 "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;
+ if (_tmp8_ != GP_OK) {
+#line 1213 "GPhoto.c"
+ int _tmp9_;
+ int _tmp10_;
+ const gchar* _tmp11_;
+ GError* _tmp12_;
+ gboolean _tmp13_ = FALSE;
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = folder;
+ _tmp9_ = res;
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = filename;
+ _tmp10_ = res;
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = res;
+ _tmp11_ = gp_port_result_as_string (_tmp10_);
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = gp_port_result_as_string (_tmp18_);
+ _tmp12_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file information for %s/%s: %s", (gint) _tmp9_, folder, filename, _tmp11_);
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file information for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp20_;
+ _inner_error_ = _tmp12_;
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- return _tmp21_;
-#line 989 "GPhoto.c"
+ return _tmp13_;
+#line 1233 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = TRUE;
@@ -993,240 +1237,205 @@ 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 997 "GPhoto.c"
+#line 1241 "GPhoto.c"
} else {
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(_vala_info);
-#line 1001 "GPhoto.c"
+#line 1245 "GPhoto.c"
}
#line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1005 "GPhoto.c"
+#line 1249 "GPhoto.c"
}
-static gpointer _GPHOTO_REF_FILE0 (gpointer self) {
+static gpointer
+_GPHOTO_REF_FILE0 (gpointer self)
+{
#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return self ? GPHOTO_REF_FILE (self) : NULL;
-#line 1012 "GPhoto.c"
+#line 1258 "GPhoto.c"
}
-GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file) {
+GBytes*
+gp_camera_file_to_bytes (GPContext* context,
+ CameraFile* file)
+{
GBytes* result = NULL;
guint8* data = NULL;
gulong data_len = 0UL;
int res = 0;
- CameraFile* _tmp0_;
- guint8* _tmp1_ = NULL;
- gulong _tmp2_ = 0UL;
+ guint8* _tmp0_ = NULL;
+ gulong _tmp1_ = 0UL;
+ int _tmp2_;
int _tmp3_;
- int _tmp4_;
guint8* buffer = NULL;
- guint8* _tmp5_;
+ guint8* _tmp4_;
gint buffer_length1;
gint _buffer_size_;
- gulong _tmp6_;
- gint _tmp7_;
- guint8* _tmp8_;
- gint _tmp8__length1;
- CameraFile* _tmp9_;
- CameraFile* _tmp10_;
- GBytes* _tmp11_;
+ gulong _tmp5_;
+ gint _tmp6_;
+ guint8* _tmp7_;
+ gint _tmp7__length1;
+ CameraFile* _tmp8_;
+ GBytes* _tmp9_;
#line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
#line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (file != NULL, NULL);
#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = file;
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp3_ = gp_file_get_data_and_size (_tmp0_, &_tmp1_, &_tmp2_);
+ _tmp2_ = gp_file_get_data_and_size (file, &_tmp0_, &_tmp1_);
#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- data = _tmp1_;
+ data = _tmp0_;
#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- data_len = _tmp2_;
+ data_len = _tmp1_;
#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp3_;
+ res = _tmp2_;
#line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp4_ = res;
+ _tmp3_ = res;
#line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp4_ != GP_OK) {
+ if (_tmp3_ != GP_OK) {
#line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
#line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1059 "GPhoto.c"
+#line 1304 "GPhoto.c"
}
#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp5_ = data;
+ _tmp4_ = data;
#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- buffer = (guint8*) _tmp5_;
+ buffer = (guint8*) _tmp4_;
#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
buffer_length1 = sizeof (guint8) / sizeof (guint8);
#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_buffer_size_ = buffer_length1;
#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = data_len;
+ _tmp5_ = data_len;
#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- buffer_length1 = (gint) _tmp6_;
+ buffer_length1 = (gint) _tmp5_;
#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = buffer_length1;
+ _tmp6_ = buffer_length1;
#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = buffer;
+ _tmp7_ = buffer;
#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8__length1 = buffer_length1;
+ _tmp7__length1 = buffer_length1;
#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = file;
+ _tmp8_ = _GPHOTO_REF_FILE0 (file);
#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = _GPHOTO_REF_FILE0 (_tmp9_);
+ _tmp9_ = g_bytes_new_with_free_func (_tmp7_, (gsize) _tmp7__length1, gp_file_unref, _tmp8_);
#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = g_bytes_new_with_free_func (_tmp8_, (gsize) _tmp8__length1, gp_file_unref, _tmp10_);
-#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp11_;
+ result = _tmp9_;
#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1089 "GPhoto.c"
+#line 1332 "GPhoto.c"
}
-static gchar* string_slice (const gchar* self, glong start, glong end) {
+static gchar*
+string_slice (const gchar* self,
+ glong start,
+ glong end)
+{
gchar* result = NULL;
glong string_length = 0L;
gint _tmp0_;
gint _tmp1_;
- glong _tmp2_;
- glong _tmp5_;
- gboolean _tmp8_ = FALSE;
- glong _tmp9_;
- gboolean _tmp12_ = FALSE;
- 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"
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp6_ = FALSE;
+ gchar* _tmp8_;
+#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = start;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_ < ((glong) 0)) {
-#line 1122 "GPhoto.c"
+#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start < ((glong) 0)) {
+#line 1358 "GPhoto.c"
+ glong _tmp2_;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = string_length;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ start = _tmp2_ + start;
+#line 1364 "GPhoto.c"
+ }
+#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end < ((glong) 0)) {
+#line 1368 "GPhoto.c"
glong _tmp3_;
- glong _tmp4_;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = start;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- start = _tmp3_ + _tmp4_;
-#line 1131 "GPhoto.c"
- }
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp5_ < ((glong) 0)) {
-#line 1137 "GPhoto.c"
- glong _tmp6_;
- glong _tmp7_;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = string_length;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = end;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp6_ + _tmp7_;
-#line 1146 "GPhoto.c"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp3_ + end;
+#line 1374 "GPhoto.c"
}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp9_ >= ((glong) 0)) {
-#line 1152 "GPhoto.c"
- glong _tmp10_;
- glong _tmp11_;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = string_length;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp10_ <= _tmp11_;
-#line 1161 "GPhoto.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start >= ((glong) 0)) {
+#line 1378 "GPhoto.c"
+ glong _tmp5_;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = start <= _tmp5_;
+#line 1384 "GPhoto.c"
} else {
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = FALSE;
-#line 1165 "GPhoto.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 1388 "GPhoto.c"
}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp8_, NULL);
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13_ >= ((glong) 0)) {
-#line 1173 "GPhoto.c"
- glong _tmp14_;
- glong _tmp15_;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ <= _tmp15_;
-#line 1182 "GPhoto.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp4_, NULL);
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end >= ((glong) 0)) {
+#line 1394 "GPhoto.c"
+ glong _tmp7_;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = string_length;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = end <= _tmp7_;
+#line 1400 "GPhoto.c"
} else {
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
-#line 1186 "GPhoto.c"
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = FALSE;
+#line 1404 "GPhoto.c"
}
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_, NULL);
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = start;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = end;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = end;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp21_;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp6_, NULL);
+#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (start <= end, NULL);
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start));
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp8_;
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1208 "GPhoto.c"
+#line 1416 "GPhoto.c"
}
-PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, const gchar* folder, const gchar* filename) {
+PhotoMetadata*
+gp_get_fallback_metadata (Camera* camera,
+ GPContext* context,
+ const gchar* folder,
+ const gchar* filename)
+{
PhotoMetadata* result = NULL;
CameraStorageInformation* sifs = NULL;
gint count = 0;
- Camera* _tmp0_;
- GPContext* _tmp1_;
- gint _tmp2_ = 0;
+ gint _tmp0_ = 0;
GPPortInfo port_info = {0};
- Camera* _tmp3_;
- GPPortInfo _tmp4_ = {0};
+ GPPortInfo _tmp1_ = {0};
gchar* path = NULL;
- const gchar* _tmp5_ = NULL;
- gchar* _tmp6_;
+ const gchar* _tmp2_ = NULL;
+ gchar* _tmp3_;
gchar* prefix = NULL;
- gchar* _tmp7_;
- const gchar* _tmp8_;
- gboolean _tmp9_;
+ gchar* _tmp4_;
+ const gchar* _tmp5_;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp17_;
+ PhotoMetadata* _tmp13_;
GError * _inner_error_ = NULL;
#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (camera != NULL, NULL);
@@ -1241,66 +1450,58 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
count = 0;
#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = camera;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = context;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp2_, _tmp1_);
+ gp_camera_get_storageinfo (camera, &sifs, &_tmp0_, context);
#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- count = _tmp2_;
+ count = _tmp0_;
#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp3_ = camera;
-#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_camera_get_port_info (_tmp3_, &_tmp4_);
+ gp_camera_get_port_info (camera, &_tmp1_);
#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
(port_info);
#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- port_info = _tmp4_;
+ port_info = _tmp1_;
#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- gp_port_info_get_path (port_info, &_tmp5_);
+ gp_port_info_get_path (port_info, &_tmp2_);
#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (path);
#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp3_ = g_strdup (_tmp2_);
#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- path = _tmp6_;
+ path = _tmp3_;
#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = g_strdup ("disk:");
+ _tmp4_ = g_strdup ("disk:");
#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- prefix = _tmp7_;
-#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = path;
+ prefix = _tmp4_;
#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = g_str_has_prefix (_tmp8_, prefix);
+ _tmp5_ = path;
#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp9_) {
-#line 1278 "GPhoto.c"
- const gchar* _tmp10_;
+ if (g_str_has_prefix (_tmp5_, prefix)) {
+#line 1479 "GPhoto.c"
+ const gchar* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
+ const gchar* _tmp9_;
+ gint _tmp10_;
gint _tmp11_;
- gint _tmp12_;
- const gchar* _tmp13_;
- gint _tmp14_;
- gint _tmp15_;
- gchar* _tmp16_;
+ gchar* _tmp12_;
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = path;
+ _tmp6_ = path;
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = strlen (prefix);
+ _tmp7_ = strlen (prefix);
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = _tmp11_;
+ _tmp8_ = _tmp7_;
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = path;
+ _tmp9_ = path;
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = strlen (_tmp13_);
+ _tmp10_ = strlen (_tmp9_);
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = _tmp14_;
+ _tmp11_ = _tmp10_;
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = string_slice (_tmp10_, (glong) _tmp12_, (glong) _tmp15_);
+ _tmp12_ = string_slice (_tmp6_, (glong) _tmp8_, (glong) _tmp11_);
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (path);
#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- path = _tmp16_;
-#line 1304 "GPhoto.c"
+ path = _tmp12_;
+#line 1505 "GPhoto.c"
} else {
#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
@@ -1312,63 +1513,57 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
(port_info);
#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1316 "GPhoto.c"
+#line 1517 "GPhoto.c"
}
#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = photo_metadata_new ();
+ _tmp13_ = photo_metadata_new ();
#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- metadata = _tmp17_;
-#line 1322 "GPhoto.c"
+ metadata = _tmp13_;
+#line 1523 "GPhoto.c"
{
- PhotoMetadata* _tmp18_;
- const gchar* _tmp19_;
- const gchar* _tmp20_;
+ PhotoMetadata* _tmp14_;
+ const gchar* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
gchar* _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
- gchar* _tmp24_;
- const gchar* _tmp25_;
- gchar* _tmp26_;
- gchar* _tmp27_;
- GFile* _tmp28_;
- GFile* _tmp29_;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = metadata;
+ GFile* _tmp22_;
+ GFile* _tmp23_;
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = path;
+ _tmp14_ = metadata;
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = folder;
+ _tmp15_ = path;
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = g_strconcat (_tmp19_, _tmp20_, NULL);
+ _tmp16_ = g_strconcat (_tmp15_, folder, NULL);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp22_ = _tmp21_;
+ _tmp17_ = _tmp16_;
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = g_strconcat (_tmp22_, "/", NULL);
+ _tmp18_ = g_strconcat (_tmp17_, "/", NULL);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = _tmp23_;
+ _tmp19_ = _tmp18_;
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = filename;
+ _tmp20_ = g_strconcat (_tmp19_, filename, NULL);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = g_strconcat (_tmp24_, _tmp25_, NULL);
+ _tmp21_ = _tmp20_;
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = _tmp26_;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = g_file_new_for_path (_tmp27_);
+ _tmp22_ = g_file_new_for_path (_tmp21_);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = _tmp28_;
+ _tmp23_ = _tmp22_;
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp29_, &_inner_error_);
+ media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp23_, &_inner_error_);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp29_);
+ _g_object_unref0 (_tmp23_);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp27_);
+ _g_free0 (_tmp21_);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp24_);
+ _g_free0 (_tmp19_);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp22_);
+ _g_free0 (_tmp17_);
#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1372 "GPhoto.c"
+#line 1567 "GPhoto.c"
goto __catch69_g_error;
}
}
@@ -1383,7 +1578,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
_media_metadata_unref0 (metadata);
#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
metadata = NULL;
-#line 1387 "GPhoto.c"
+#line 1582 "GPhoto.c"
}
__finally69:
#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1402,7 +1597,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
g_clear_error (&_inner_error_);
#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1406 "GPhoto.c"
+#line 1601 "GPhoto.c"
}
#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
@@ -1414,33 +1609,42 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
(port_info);
#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1418 "GPhoto.c"
+#line 1613 "GPhoto.c"
}
-static gpointer _g_bytes_ref0 (gpointer self) {
+static gpointer
+_g_bytes_ref0 (gpointer self)
+{
#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return self ? g_bytes_ref (self) : NULL;
-#line 1425 "GPhoto.c"
+#line 1622 "GPhoto.c"
}
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error) {
+GdkPixbuf*
+gp_load_preview (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ gchar* * preview_md5,
+ GError** error)
+{
gchar* _vala_preview_md5 = NULL;
GdkPixbuf* result = NULL;
GBytes* raw = NULL;
GBytes* out_bytes = NULL;
- GBytes* _tmp25_;
- GBytes* _tmp26_;
- GBytes* _tmp27_;
- gchar* _tmp28_;
+ GBytes* _tmp15_;
+ GBytes* _tmp16_;
+ GBytes* _tmp17_;
+ gchar* _tmp18_;
GMemoryInputStream* mins = NULL;
- GBytes* _tmp29_;
- GMemoryInputStream* _tmp30_;
- GdkPixbuf* _tmp31_ = NULL;
- GMemoryInputStream* _tmp32_;
- GdkPixbuf* _tmp33_;
- GdkPixbuf* _tmp34_;
+ GBytes* _tmp19_;
+ GMemoryInputStream* _tmp20_;
+ GdkPixbuf* _tmp21_ = NULL;
+ GMemoryInputStream* _tmp22_;
+ GdkPixbuf* _tmp23_;
+ GdkPixbuf* _tmp24_;
GError * _inner_error_ = NULL;
#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
@@ -1458,87 +1662,61 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_g_free0 (_vala_preview_md5);
#line 168 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_vala_preview_md5 = NULL;
-#line 1462 "GPhoto.c"
+#line 1666 "GPhoto.c"
{
GBytes* _tmp0_ = NULL;
- GPContext* _tmp1_;
- Camera* _tmp2_;
- const gchar* _tmp3_;
- const gchar* _tmp4_;
- GBytes* _tmp5_;
- GBytes* _tmp6_;
-#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = context;
+ GBytes* _tmp1_;
+ GBytes* _tmp2_;
#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp2_ = camera;
+ _tmp1_ = gp_load_file_into_buffer (context, camera, folder, filename, GP_FILE_TYPE_PREVIEW, &_inner_error_);
#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp3_ = folder;
-#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp4_ = filename;
-#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_PREVIEW, &_inner_error_);
-#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = _tmp5_;
+ _tmp0_ = _tmp1_;
#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1485 "GPhoto.c"
+#line 1677 "GPhoto.c"
goto __catch70_g_error;
}
#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = _tmp0_;
+ _tmp2_ = _tmp0_;
#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = NULL;
#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (raw);
#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- raw = _tmp6_;
+ raw = _tmp2_;
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (_tmp0_);
-#line 1498 "GPhoto.c"
+#line 1690 "GPhoto.c"
}
goto __finally70;
__catch70_g_error:
{
PhotoMetadata* metadata = NULL;
- Camera* _tmp7_;
- GPContext* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
- PhotoMetadata* _tmp11_;
- PhotoMetadata* _tmp12_;
- PhotoMetadata* _tmp13_;
- guint _tmp14_;
+ PhotoMetadata* _tmp3_;
+ PhotoMetadata* _tmp4_;
+ PhotoMetadata* _tmp5_;
PhotoPreview* preview = NULL;
- PhotoMetadata* _tmp15_;
- PhotoMetadata* _tmp16_;
- guint _tmp17_;
- PhotoPreview* _tmp18_;
- GBytes* _tmp19_ = NULL;
- PhotoPreview* _tmp20_;
- GBytes* _tmp21_;
- GBytes* _tmp22_;
- GBytes* _tmp23_;
- gchar* _tmp24_;
+ PhotoMetadata* _tmp6_;
+ PhotoMetadata* _tmp7_;
+ PhotoPreview* _tmp8_;
+ GBytes* _tmp9_ = NULL;
+ PhotoPreview* _tmp10_;
+ GBytes* _tmp11_;
+ GBytes* _tmp12_;
+ GBytes* _tmp13_;
+ gchar* _tmp14_;
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = NULL;
#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = camera;
+ _tmp3_ = gp_get_fallback_metadata (camera, context, folder, filename);
#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = context;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = folder;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = filename;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- metadata = _tmp11_;
+ metadata = _tmp3_;
#line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = metadata;
+ _tmp4_ = metadata;
#line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (NULL == _tmp12_) {
+ if (NULL == _tmp4_) {
#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1551,22 +1729,20 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (preview_md5) {
#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*preview_md5 = _vala_preview_md5;
-#line 1555 "GPhoto.c"
+#line 1733 "GPhoto.c"
} else {
#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_vala_preview_md5);
-#line 1559 "GPhoto.c"
+#line 1737 "GPhoto.c"
}
#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1563 "GPhoto.c"
+#line 1741 "GPhoto.c"
}
#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = metadata;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = photo_metadata_get_preview_count (_tmp13_);
+ _tmp5_ = metadata;
#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (((guint) 0) == _tmp14_) {
+ if (((guint) 0) == photo_metadata_get_preview_count (_tmp5_)) {
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1579,64 +1755,62 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (preview_md5) {
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*preview_md5 = _vala_preview_md5;
-#line 1583 "GPhoto.c"
+#line 1759 "GPhoto.c"
} else {
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_vala_preview_md5);
-#line 1587 "GPhoto.c"
+#line 1763 "GPhoto.c"
}
#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1591 "GPhoto.c"
+#line 1767 "GPhoto.c"
}
#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = metadata;
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = metadata;
+ _tmp6_ = metadata;
#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = photo_metadata_get_preview_count (_tmp16_);
+ _tmp7_ = metadata;
#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = photo_metadata_get_preview (_tmp15_, _tmp17_ - 1);
+ _tmp8_ = photo_metadata_get_preview (_tmp6_, photo_metadata_get_preview_count (_tmp7_) - 1);
#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- preview = _tmp18_;
+ preview = _tmp8_;
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = preview;
+ _tmp10_ = preview;
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = photo_preview_flatten (_tmp20_, &_inner_error_);
+ _tmp11_ = photo_preview_flatten (_tmp10_, &_inner_error_);
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = _tmp21_;
+ _tmp9_ = _tmp11_;
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_photo_preview_unref0 (preview);
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 1615 "GPhoto.c"
+#line 1789 "GPhoto.c"
goto __finally70;
}
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp22_ = _tmp19_;
+ _tmp12_ = _tmp9_;
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = NULL;
+ _tmp9_ = NULL;
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (raw);
#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- raw = _tmp22_;
+ raw = _tmp12_;
#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = raw;
+ _tmp13_ = raw;
#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp23_);
+ _tmp14_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp13_);
#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_vala_preview_md5);
#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_preview_md5 = _tmp24_;
+ _vala_preview_md5 = _tmp14_;
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_bytes_unref0 (_tmp19_);
+ _g_bytes_unref0 (_tmp9_);
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_photo_preview_unref0 (preview);
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_media_metadata_unref0 (metadata);
-#line 1640 "GPhoto.c"
+#line 1814 "GPhoto.c"
}
__finally70:
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1649,36 +1823,36 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_g_bytes_unref0 (raw);
#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1653 "GPhoto.c"
+#line 1827 "GPhoto.c"
}
#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = raw;
+ _tmp15_ = raw;
#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = _g_bytes_ref0 (_tmp25_);
+ _tmp16_ = _g_bytes_ref0 (_tmp15_);
#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (out_bytes);
#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- out_bytes = _tmp26_;
+ out_bytes = _tmp16_;
#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = out_bytes;
+ _tmp17_ = out_bytes;
#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp27_);
+ _tmp18_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp17_);
#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_vala_preview_md5);
#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _vala_preview_md5 = _tmp28_;
+ _vala_preview_md5 = _tmp18_;
#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = raw;
+ _tmp19_ = raw;
#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp29_);
+ _tmp20_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp19_);
#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- mins = _tmp30_;
+ mins = _tmp20_;
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = mins;
+ _tmp22_ = mins;
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp33_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+ _tmp23_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = _tmp33_;
+ _tmp21_ = _tmp23_;
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1691,16 +1865,16 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
_g_bytes_unref0 (raw);
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1695 "GPhoto.c"
+#line 1869 "GPhoto.c"
}
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp34_ = _tmp31_;
+ _tmp24_ = _tmp21_;
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = NULL;
+ _tmp21_ = NULL;
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp34_;
+ result = _tmp24_;
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp31_);
+ _g_object_unref0 (_tmp21_);
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (mins);
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1711,31 +1885,33 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
if (preview_md5) {
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
*preview_md5 = _vala_preview_md5;
-#line 1715 "GPhoto.c"
+#line 1889 "GPhoto.c"
} else {
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_free0 (_vala_preview_md5);
-#line 1719 "GPhoto.c"
+#line 1893 "GPhoto.c"
}
#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1723 "GPhoto.c"
+#line 1897 "GPhoto.c"
}
-GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
+GdkPixbuf*
+gp_load_image (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ GError** error)
+{
GdkPixbuf* result = NULL;
GInputStream* ins = NULL;
- GPContext* _tmp0_;
- Camera* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
- GInputStream* _tmp4_;
- GInputStream* _tmp5_;
- GdkPixbuf* _tmp6_ = NULL;
- GInputStream* _tmp7_;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
+ GInputStream* _tmp0_;
+ GInputStream* _tmp1_;
+ GdkPixbuf* _tmp2_ = NULL;
+ GInputStream* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ GdkPixbuf* _tmp5_;
GError * _inner_error_ = NULL;
#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
@@ -1746,43 +1922,35 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (filename != NULL, NULL);
#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = context;
-#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = camera;
-#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp2_ = folder;
+ _tmp0_ = gp_load_file_into_stream (context, camera, folder, filename, GP_FILE_TYPE_NORMAL, &_inner_error_);
#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp3_ = filename;
-#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp4_ = gp_load_file_into_stream (_tmp0_, _tmp1_, _tmp2_, _tmp3_, GP_FILE_TYPE_NORMAL, &_inner_error_);
-#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- ins = _tmp4_;
+ ins = _tmp0_;
#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1767 "GPhoto.c"
+#line 1935 "GPhoto.c"
}
#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp5_ = ins;
+ _tmp1_ = ins;
#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp5_ == NULL) {
+ if (_tmp1_ == NULL) {
#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1779 "GPhoto.c"
+#line 1947 "GPhoto.c"
}
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = ins;
+ _tmp3_ = ins;
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = gdk_pixbuf_new_from_stream (_tmp7_, NULL, &_inner_error_);
+ _tmp4_ = gdk_pixbuf_new_from_stream (_tmp3_, NULL, &_inner_error_);
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = _tmp8_;
+ _tmp2_ = _tmp4_;
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1791,45 +1959,45 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
_g_object_unref0 (ins);
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 1795 "GPhoto.c"
+#line 1963 "GPhoto.c"
}
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = _tmp6_;
+ _tmp5_ = _tmp2_;
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = NULL;
+ _tmp2_ = NULL;
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp9_;
+ result = _tmp5_;
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp2_);
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (ins);
#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 1809 "GPhoto.c"
+#line 1977 "GPhoto.c"
}
-void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error) {
+void
+gp_save_image (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ GFile* dest_file,
+ GError** error)
+{
gint fd = 0;
- GFile* _tmp0_;
+ gchar* _tmp0_;
gchar* _tmp1_;
- gchar* _tmp2_;
+ gint _tmp2_;
gint _tmp3_;
- gint _tmp4_;
- gint _tmp5_;
CameraFile* camera_file = NULL;
int res = 0;
- gint _tmp12_;
- CameraFile* _tmp13_ = NULL;
- int _tmp14_;
- int _tmp15_;
- Camera* _tmp20_;
- const gchar* _tmp21_;
- const gchar* _tmp22_;
- CameraFile* _tmp23_;
- GPContext* _tmp24_;
- int _tmp25_;
- int _tmp26_;
+ gint _tmp9_;
+ CameraFile* _tmp10_ = NULL;
+ int _tmp11_;
+ int _tmp12_;
+ CameraFile* _tmp17_;
+ int _tmp18_;
GError * _inner_error_ = NULL;
#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (context != NULL);
@@ -1842,166 +2010,148 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_if_fail (G_IS_FILE (dest_file));
#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = dest_file;
-#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = g_file_get_path (_tmp0_);
-#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp2_ = _tmp1_;
+ _tmp0_ = g_file_get_path (dest_file);
#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp3_ = creat (_tmp2_, (mode_t) 0640);
+ _tmp1_ = _tmp0_;
#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = creat (_tmp1_, (mode_t) 0640);
#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp2_);
+ _g_free0 (_tmp1_);
#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- fd = _tmp4_;
+ fd = _tmp2_;
#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp5_ = fd;
+ _tmp3_ = fd;
#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp5_ < 0) {
-#line 1863 "GPhoto.c"
- gint _tmp6_;
- GFile* _tmp7_;
- gchar* _tmp8_;
- gchar* _tmp9_;
- GError* _tmp10_;
- GError* _tmp11_;
-#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = errno;
+ if (_tmp3_ < 0) {
+#line 2027 "GPhoto.c"
+ gint _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ GError* _tmp7_;
+ GError* _tmp8_;
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = dest_file;
+ _tmp4_ = errno;
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = g_file_get_path (_tmp7_);
+ _tmp5_ = g_file_get_path (dest_file);
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_);
+ _tmp7_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp4_, _tmp6_);
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = _tmp10_;
+ _tmp8_ = _tmp7_;
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp6_);
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp11_;
+ _inner_error_ = _tmp8_;
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1890 "GPhoto.c"
+#line 2051 "GPhoto.c"
}
#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = fd;
+ _tmp9_ = fd;
#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
+ _tmp11_ = gp_file_new_from_fd (&_tmp10_, _tmp9_);
#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_file = _tmp13_;
+ camera_file = _tmp10_;
#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp14_;
+ res = _tmp11_;
#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = res;
+ _tmp12_ = res;
#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp15_ != GP_OK) {
-#line 1906 "GPhoto.c"
- int _tmp16_;
- int _tmp17_;
- const gchar* _tmp18_;
- GError* _tmp19_;
+ if (_tmp12_ != GP_OK) {
+#line 2067 "GPhoto.c"
+ int _tmp13_;
+ int _tmp14_;
+ const gchar* _tmp15_;
+ GError* _tmp16_;
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = res;
+ _tmp13_ = res;
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = res;
+ _tmp14_ = res;
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = gp_port_result_as_string (_tmp17_);
+ _tmp15_ = gp_port_result_as_string (_tmp14_);
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp16_, _tmp18_);
+ _tmp16_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp13_, _tmp15_);
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp19_;
+ _inner_error_ = _tmp16_;
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1927 "GPhoto.c"
+#line 2088 "GPhoto.c"
}
#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = camera;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = folder;
+ _tmp17_ = camera_file;
#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp22_ = filename;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = camera_file;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = context;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = gp_camera_file_get (_tmp20_, _tmp21_, _tmp22_, GP_FILE_TYPE_NORMAL, _tmp23_, _tmp24_);
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp25_;
+ res = gp_camera_file_get (camera, folder, filename, GP_FILE_TYPE_NORMAL, _tmp17_, context);
#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = res;
+ _tmp18_ = res;
#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp26_ != GP_OK) {
-#line 1947 "GPhoto.c"
- int _tmp27_;
- const gchar* _tmp28_;
- const gchar* _tmp29_;
- int _tmp30_;
- const gchar* _tmp31_;
- GError* _tmp32_;
+ if (_tmp18_ != GP_OK) {
+#line 2098 "GPhoto.c"
+ int _tmp19_;
+ int _tmp20_;
+ const gchar* _tmp21_;
+ GError* _tmp22_;
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = res;
+ _tmp19_ = res;
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = folder;
+ _tmp20_ = res;
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = filename;
+ _tmp21_ = gp_port_result_as_string (_tmp20_);
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = res;
+ _tmp22_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp19_, folder, filename, _tmp21_);
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = gp_port_result_as_string (_tmp30_);
-#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp27_, _tmp28_, _tmp29_, _tmp31_);
-#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp32_;
+ _inner_error_ = _tmp22_;
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return;
-#line 1974 "GPhoto.c"
+#line 2119 "GPhoto.c"
}
#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
-#line 1978 "GPhoto.c"
+#line 2123 "GPhoto.c"
}
-static gint _vala_g_bytes_get_length (GBytes* self) {
+static gint
+_vala_g_bytes_get_length (GBytes* self)
+{
gint result;
- gsize _tmp0_;
-#line 5013 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 5049 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = g_bytes_get_size (self);
-#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gint) _tmp0_;
-#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 5051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gint) g_bytes_get_size (self);
+#line 5051 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 1993 "GPhoto.c"
+#line 2137 "GPhoto.c"
}
-PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
+PhotoMetadata*
+gp_load_metadata (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ GError** error)
+{
PhotoMetadata* result = NULL;
GBytes* camera_raw = NULL;
- gboolean _tmp12_ = FALSE;
- GBytes* _tmp13_;
+ gboolean _tmp4_ = FALSE;
+ GBytes* _tmp5_;
PhotoMetadata* metadata = NULL;
- PhotoMetadata* _tmp17_;
- PhotoMetadata* _tmp18_;
- GBytes* _tmp19_;
+ PhotoMetadata* _tmp9_;
+ PhotoMetadata* _tmp10_;
+ GBytes* _tmp11_;
GError * _inner_error_ = NULL;
#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
@@ -2013,73 +2163,49 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
g_return_val_if_fail (filename != NULL, NULL);
#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
camera_raw = NULL;
-#line 2017 "GPhoto.c"
+#line 2167 "GPhoto.c"
{
GBytes* _tmp0_ = NULL;
- GPContext* _tmp1_;
- Camera* _tmp2_;
- const gchar* _tmp3_;
- const gchar* _tmp4_;
- GBytes* _tmp5_;
- GBytes* _tmp6_;
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp1_ = context;
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp2_ = camera;
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp3_ = folder;
-#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp4_ = filename;
+ GBytes* _tmp1_;
+ GBytes* _tmp2_;
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_inner_error_);
+ _tmp1_ = gp_load_file_into_buffer (context, camera, folder, filename, GP_FILE_TYPE_EXIF, &_inner_error_);
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp0_ = _tmp5_;
+ _tmp0_ = _tmp1_;
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2040 "GPhoto.c"
+#line 2178 "GPhoto.c"
goto __catch71_g_error;
}
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp6_ = _tmp0_;
+ _tmp2_ = _tmp0_;
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp0_ = NULL;
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (camera_raw);
#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- camera_raw = _tmp6_;
+ camera_raw = _tmp2_;
#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (_tmp0_);
-#line 2053 "GPhoto.c"
+#line 2191 "GPhoto.c"
}
goto __finally71;
__catch71_g_error:
{
- Camera* _tmp7_;
- GPContext* _tmp8_;
- const gchar* _tmp9_;
- const gchar* _tmp10_;
- PhotoMetadata* _tmp11_;
+ PhotoMetadata* _tmp3_;
#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_clear_error (&_inner_error_);
#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_inner_error_ = NULL;
#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = camera;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = context;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = folder;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = filename;
+ _tmp3_ = gp_get_fallback_metadata (camera, context, folder, filename);
#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp11_;
+ result = _tmp3_;
#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (camera_raw);
#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2083 "GPhoto.c"
+#line 2209 "GPhoto.c"
}
__finally71:
#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2090,49 +2216,49 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
_g_bytes_unref0 (camera_raw);
#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2094 "GPhoto.c"
+#line 2220 "GPhoto.c"
}
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = camera_raw;
+ _tmp5_ = camera_raw;
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp13_ == NULL) {
+ if (_tmp5_ == NULL) {
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = TRUE;
-#line 2102 "GPhoto.c"
+ _tmp4_ = TRUE;
+#line 2228 "GPhoto.c"
} else {
- GBytes* _tmp14_;
- gint _tmp15_;
- gint _tmp16_;
+ GBytes* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = camera_raw;
+ _tmp6_ = camera_raw;
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = _vala_g_bytes_get_length (_tmp14_);
+ _tmp7_ = _vala_g_bytes_get_length (_tmp6_);
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = _tmp15_;
+ _tmp8_ = _tmp7_;
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = _tmp16_ == 0;
-#line 2115 "GPhoto.c"
+ _tmp4_ = _tmp8_ == 0;
+#line 2241 "GPhoto.c"
}
#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp12_) {
+ if (_tmp4_) {
#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = NULL;
#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (camera_raw);
#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2125 "GPhoto.c"
+#line 2251 "GPhoto.c"
}
#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = photo_metadata_new ();
+ _tmp9_ = photo_metadata_new ();
#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- metadata = _tmp17_;
+ metadata = _tmp9_;
#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = metadata;
+ _tmp10_ = metadata;
#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = camera_raw;
+ _tmp11_ = camera_raw;
#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- photo_metadata_read_from_app1_segment (_tmp18_, _tmp19_, &_inner_error_);
+ photo_metadata_read_from_app1_segment (_tmp10_, _tmp11_, &_inner_error_);
#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2143,7 +2269,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
_g_bytes_unref0 (camera_raw);
#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2147 "GPhoto.c"
+#line 2273 "GPhoto.c"
}
#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
result = metadata;
@@ -2151,42 +2277,41 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
_g_bytes_unref0 (camera_raw);
#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2155 "GPhoto.c"
+#line 2281 "GPhoto.c"
}
-GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error) {
+GInputStream*
+gp_load_file_into_stream (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ CameraFileType filetype,
+ GError** error)
+{
GInputStream* result = NULL;
CameraFile* camera_file = NULL;
int res = 0;
CameraFile* _tmp0_ = NULL;
int _tmp1_;
int _tmp2_;
- Camera* _tmp7_;
- const gchar* _tmp8_;
- const gchar* _tmp9_;
- CameraFileType _tmp10_;
- GPContext* _tmp11_;
- int _tmp12_;
- int _tmp13_;
+ int _tmp7_;
GBytes* bytes = NULL;
- GPContext* _tmp20_;
- GBytes* _tmp21_;
- GBytes* _tmp22_;
+ GBytes* _tmp12_;
+ GBytes* _tmp13_;
GFile* temp = NULL;
- GFile* _tmp25_;
- GFile* _tmp26_;
- GFile* _tmp27_;
- GFile* _tmp28_;
- GFile* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
- int _tmp32_;
- int _tmp33_;
- GFileInputStream* _tmp44_ = NULL;
- GFile* _tmp45_;
- GFileInputStream* _tmp46_;
- GFileInputStream* _tmp47_;
+ GFile* _tmp16_;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ GFile* _tmp19_;
+ GFile* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ int _tmp23_;
+ GFileInputStream* _tmp32_ = NULL;
+ GFile* _tmp33_;
+ GFileInputStream* _tmp34_;
+ GFileInputStream* _tmp35_;
GError * _inner_error_ = NULL;
#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
@@ -2208,7 +2333,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_tmp2_ = res;
#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2212 "GPhoto.c"
+#line 2337 "GPhoto.c"
int _tmp3_;
int _tmp4_;
const gchar* _tmp5_;
@@ -2229,145 +2354,117 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2233 "GPhoto.c"
+#line 2358 "GPhoto.c"
}
#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = camera;
-#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = folder;
-#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = filename;
-#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = filetype;
-#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = context;
-#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp12_;
+ res = gp_camera_file_get (camera, folder, filename, filetype, camera_file, context);
#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = res;
+ _tmp7_ = res;
#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp13_ != GP_OK) {
-#line 2253 "GPhoto.c"
- int _tmp14_;
- const gchar* _tmp15_;
- const gchar* _tmp16_;
- int _tmp17_;
- const gchar* _tmp18_;
- GError* _tmp19_;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = res;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = folder;
+ if (_tmp7_ != GP_OK) {
+#line 2366 "GPhoto.c"
+ int _tmp8_;
+ int _tmp9_;
+ const gchar* _tmp10_;
+ GError* _tmp11_;
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = filename;
+ _tmp8_ = res;
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = res;
+ _tmp9_ = res;
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = gp_port_result_as_string (_tmp17_);
+ _tmp10_ = gp_port_result_as_string (_tmp9_);
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
+ _tmp11_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp8_, folder, filename, _tmp10_);
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp19_;
+ _inner_error_ = _tmp11_;
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2280 "GPhoto.c"
+#line 2387 "GPhoto.c"
}
#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = context;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = gp_camera_file_to_bytes (_tmp20_, camera_file);
+ _tmp12_ = gp_camera_file_to_bytes (context, camera_file);
#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- bytes = _tmp21_;
+ bytes = _tmp12_;
#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp22_ = bytes;
+ _tmp13_ = bytes;
#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp22_ != NULL) {
-#line 2292 "GPhoto.c"
- GBytes* _tmp23_;
- GMemoryInputStream* _tmp24_;
+ if (_tmp13_ != NULL) {
+#line 2397 "GPhoto.c"
+ GBytes* _tmp14_;
+ GMemoryInputStream* _tmp15_;
#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = bytes;
+ _tmp14_ = bytes;
#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp24_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp23_);
+ _tmp15_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp14_);
#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, g_input_stream_get_type (), GInputStream);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, g_input_stream_get_type (), GInputStream);
#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_bytes_unref0 (bytes);
#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2307 "GPhoto.c"
+#line 2412 "GPhoto.c"
}
#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp25_ = app_dirs_get_temp_dir ();
+ _tmp16_ = app_dirs_get_temp_dir ();
#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp26_ = _tmp25_;
+ _tmp17_ = _tmp16_;
#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp27_ = g_file_get_child (_tmp26_, "import.tmp");
+ _tmp18_ = g_file_get_child (_tmp17_, "import.tmp");
#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp28_ = _tmp27_;
+ _tmp19_ = _tmp18_;
#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp26_);
+ _g_object_unref0 (_tmp17_);
#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- temp = _tmp28_;
+ temp = _tmp19_;
#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp29_ = temp;
+ _tmp20_ = temp;
#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp30_ = g_file_get_path (_tmp29_);
+ _tmp21_ = g_file_get_path (_tmp20_);
#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp31_ = _tmp30_;
+ _tmp22_ = _tmp21_;
#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp32_ = gp_file_save (camera_file, _tmp31_);
+ res = gp_file_save (camera_file, _tmp22_);
#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp32_;
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp22_);
#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp33_ = res;
+ _tmp23_ = res;
#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp33_ != GP_OK) {
-#line 2337 "GPhoto.c"
- int _tmp34_;
- const gchar* _tmp35_;
- const gchar* _tmp36_;
- GFile* _tmp37_;
- gchar* _tmp38_;
- gchar* _tmp39_;
- int _tmp40_;
- const gchar* _tmp41_;
- GError* _tmp42_;
- GError* _tmp43_;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp34_ = res;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp35_ = folder;
+ if (_tmp23_ != GP_OK) {
+#line 2440 "GPhoto.c"
+ int _tmp24_;
+ GFile* _tmp25_;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
+ int _tmp28_;
+ const gchar* _tmp29_;
+ GError* _tmp30_;
+ GError* _tmp31_;
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp36_ = filename;
+ _tmp24_ = res;
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp37_ = temp;
+ _tmp25_ = temp;
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp38_ = g_file_get_path (_tmp37_);
+ _tmp26_ = g_file_get_path (_tmp25_);
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp39_ = _tmp38_;
+ _tmp27_ = _tmp26_;
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp40_ = res;
+ _tmp28_ = res;
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp41_ = gp_port_result_as_string (_tmp40_);
+ _tmp29_ = gp_port_result_as_string (_tmp28_);
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp42_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp34_, _tmp35_, _tmp36_, _tmp39_, _tmp41_);
+ _tmp30_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp24_, folder, filename, _tmp27_, _tmp29_);
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp43_ = _tmp42_;
+ _tmp31_ = _tmp30_;
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_free0 (_tmp39_);
+ _g_free0 (_tmp27_);
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp43_;
+ _inner_error_ = _tmp31_;
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2378,14 +2475,14 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2382 "GPhoto.c"
+#line 2479 "GPhoto.c"
}
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp45_ = temp;
+ _tmp33_ = temp;
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp46_ = g_file_read (_tmp45_, NULL, &_inner_error_);
+ _tmp34_ = g_file_read (_tmp33_, NULL, &_inner_error_);
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp44_ = _tmp46_;
+ _tmp32_ = _tmp34_;
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2398,16 +2495,16 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2402 "GPhoto.c"
+#line 2499 "GPhoto.c"
}
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp47_ = _tmp44_;
+ _tmp35_ = _tmp32_;
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp44_ = NULL;
+ _tmp32_ = NULL;
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, g_input_stream_get_type (), GInputStream);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, g_input_stream_get_type (), GInputStream);
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _g_object_unref0 (_tmp44_);
+ _g_object_unref0 (_tmp32_);
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (temp);
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2416,28 +2513,28 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
_gp_file_unref0 (camera_file);
#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2420 "GPhoto.c"
+#line 2517 "GPhoto.c"
}
-GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error) {
+GBytes*
+gp_load_file_into_buffer (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ CameraFileType filetype,
+ GError** error)
+{
GBytes* result = NULL;
CameraFile* camera_file = NULL;
int res = 0;
CameraFile* _tmp0_ = NULL;
int _tmp1_;
int _tmp2_;
- Camera* _tmp7_;
- const gchar* _tmp8_;
- const gchar* _tmp9_;
- CameraFileType _tmp10_;
- CameraFile* _tmp11_;
- GPContext* _tmp12_;
- int _tmp13_;
- int _tmp14_;
- GPContext* _tmp21_;
- CameraFile* _tmp22_;
- GBytes* _tmp23_;
+ CameraFile* _tmp7_;
+ int _tmp8_;
+ CameraFile* _tmp13_;
+ GBytes* _tmp14_;
GError * _inner_error_ = NULL;
#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_return_val_if_fail (context != NULL, NULL);
@@ -2459,7 +2556,7 @@ GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_tmp2_ = res;
#line 276 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
if (_tmp2_ != GP_OK) {
-#line 2463 "GPhoto.c"
+#line 2560 "GPhoto.c"
int _tmp3_;
int _tmp4_;
const gchar* _tmp5_;
@@ -2480,70 +2577,50 @@ GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
_gp_file_unref0 (camera_file);
#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2484 "GPhoto.c"
+#line 2581 "GPhoto.c"
}
#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp7_ = camera;
-#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp8_ = folder;
-#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp9_ = filename;
-#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp10_ = filetype;
-#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp11_ = camera_file;
+ _tmp7_ = camera_file;
#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp12_ = context;
-#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- res = _tmp13_;
+ res = gp_camera_file_get (camera, folder, filename, filetype, _tmp7_, context);
#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp14_ = res;
+ _tmp8_ = res;
#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- if (_tmp14_ != GP_OK) {
-#line 2506 "GPhoto.c"
- int _tmp15_;
- const gchar* _tmp16_;
- const gchar* _tmp17_;
- int _tmp18_;
- const gchar* _tmp19_;
- GError* _tmp20_;
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp15_ = res;
+ if (_tmp8_ != GP_OK) {
+#line 2591 "GPhoto.c"
+ int _tmp9_;
+ int _tmp10_;
+ const gchar* _tmp11_;
+ GError* _tmp12_;
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp16_ = folder;
+ _tmp9_ = res;
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp17_ = filename;
+ _tmp10_ = res;
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp18_ = res;
+ _tmp11_ = gp_port_result_as_string (_tmp10_);
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp19_ = gp_port_result_as_string (_tmp18_);
+ _tmp12_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp9_, folder, filename, _tmp11_);
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _inner_error_ = _tmp20_;
+ _inner_error_ = _tmp12_;
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
g_propagate_error (error, _inner_error_);
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return NULL;
-#line 2533 "GPhoto.c"
+#line 2612 "GPhoto.c"
}
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp21_ = context;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp22_ = camera_file;
+ _tmp13_ = camera_file;
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp23_ = gp_camera_file_to_bytes (_tmp21_, _tmp22_);
+ _tmp14_ = gp_camera_file_to_bytes (context, _tmp13_);
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = _tmp23_;
+ result = _tmp14_;
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_gp_file_unref0 (camera_file);
#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
return result;
-#line 2547 "GPhoto.c"
+#line 2624 "GPhoto.c"
}
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index a1593ef..7287f44 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.36.6, the Vala compiler
+/* ImportPage.c generated by valac 0.40.4, the Vala compiler
* generated from ImportPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -166,6 +167,11 @@ typedef struct _ThumbnailSourcePrivate ThumbnailSourcePrivate;
typedef struct _Indexable Indexable;
typedef struct _IndexableIface IndexableIface;
typedef struct _ImportSourcePrivate ImportSourcePrivate;
+enum {
+ IMPORT_SOURCE_0_PROPERTY,
+ IMPORT_SOURCE_NUM_PROPERTIES
+};
+static GParamSpec* import_source_properties[IMPORT_SOURCE_NUM_PROPERTIES];
#define _g_free0(var) (var = (g_free (var), NULL))
#define _gp_camera_unref0(var) ((var == NULL) ? NULL : (var = (gp_camera_unref (var), NULL)))
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -201,6 +207,11 @@ typedef struct _GPContextWrapperPrivate GPContextWrapperPrivate;
typedef struct _VideoImportSource VideoImportSource;
typedef struct _VideoImportSourceClass VideoImportSourceClass;
typedef struct _VideoImportSourcePrivate VideoImportSourcePrivate;
+enum {
+ VIDEO_IMPORT_SOURCE_0_PROPERTY,
+ VIDEO_IMPORT_SOURCE_NUM_PROPERTIES
+};
+static GParamSpec* video_import_source_properties[VIDEO_IMPORT_SOURCE_NUM_PROPERTIES];
#define TYPE_PHOTO_IMPORT_SOURCE (photo_import_source_get_type ())
#define PHOTO_IMPORT_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource))
@@ -232,6 +243,11 @@ typedef struct _MediaMetadataClass MediaMetadataClass;
typedef struct _PhotoMetadata PhotoMetadata;
typedef struct _PhotoMetadataClass PhotoMetadataClass;
+enum {
+ PHOTO_IMPORT_SOURCE_0_PROPERTY,
+ PHOTO_IMPORT_SOURCE_NUM_PROPERTIES
+};
+static GParamSpec* photo_import_source_properties[PHOTO_IMPORT_SOURCE_NUM_PROPERTIES];
#define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
#define TYPE_METADATA_DATE_TIME (metadata_date_time_get_type ())
@@ -312,6 +328,11 @@ typedef struct _ImportPreviewPrivate ImportPreviewPrivate;
typedef struct _DuplicatedFile DuplicatedFile;
typedef struct _DuplicatedFileClass DuplicatedFileClass;
+enum {
+ IMPORT_PREVIEW_0_PROPERTY,
+ IMPORT_PREVIEW_NUM_PROPERTIES
+};
+static GParamSpec* import_preview_properties[IMPORT_PREVIEW_NUM_PROPERTIES];
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define TYPE_ORIENTATION (orientation_get_type ())
@@ -463,6 +484,15 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
typedef struct _CoreTrackerAccumulator CoreTrackerAccumulator;
typedef struct _CoreTrackerAccumulatorIface CoreTrackerAccumulatorIface;
typedef struct _CameraAccumulatorPrivate CameraAccumulatorPrivate;
+enum {
+ CAMERA_ACCUMULATOR_0_PROPERTY,
+ CAMERA_ACCUMULATOR_TOTAL_PROPERTY,
+ CAMERA_ACCUMULATOR_PHOTOS_PROPERTY,
+ CAMERA_ACCUMULATOR_VIDEOS_PROPERTY,
+ CAMERA_ACCUMULATOR_RAW_PROPERTY,
+ CAMERA_ACCUMULATOR_NUM_PROPERTIES
+};
+static GParamSpec* camera_accumulator_properties[CAMERA_ACCUMULATOR_NUM_PROPERTIES];
#define TYPE_PAGE (page_get_type ())
#define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page))
@@ -571,6 +601,11 @@ typedef struct _ImportPageImportPageSearchViewFilterClass ImportPageImportPageSe
typedef struct _ImportPageHideImportedViewFilter ImportPageHideImportedViewFilter;
typedef struct _ImportPageHideImportedViewFilterClass ImportPageHideImportedViewFilterClass;
+enum {
+ IMPORT_PAGE_0_PROPERTY,
+ IMPORT_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* import_page_properties[IMPORT_PAGE_NUM_PROPERTIES];
#define IMPORT_PAGE_TYPE_REFRESH_RESULT (import_page_refresh_result_get_type ())
#define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
@@ -1533,17 +1568,29 @@ static gpointer import_page_hide_imported_view_filter_parent_class = NULL;
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType data_object_get_type (void) G_GNUC_CONST;
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
GType marker_get_type (void) G_GNUC_CONST;
@@ -1551,46 +1598,70 @@ GType source_collection_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
gpointer source_backlink_ref (gpointer instance);
void source_backlink_unref (gpointer instance);
-GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_backlink (GValue* value, gpointer v_object);
-void value_take_source_backlink (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_backlink (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_backlink (GValue* value,
+ gpointer v_object);
+void value_take_source_backlink (GValue* value,
+ gpointer v_object);
gpointer value_get_source_backlink (const GValue* value);
GType source_backlink_get_type (void) G_GNUC_CONST;
GType import_source_collection_get_type (void) G_GNUC_CONST;
-enum {
- IMPORT_SOURCE_COLLECTION_DUMMY_PROPERTY
-};
ImportSourceCollection* import_source_collection_new (const gchar* name);
-ImportSourceCollection* import_source_collection_construct (GType object_type, const gchar* name);
-SourceCollection* source_collection_construct (GType object_type, const gchar* name);
-static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source);
+ImportSourceCollection* import_source_collection_construct (GType object_type,
+ const gchar* name);
+SourceCollection* source_collection_construct (GType object_type,
+ const gchar* name);
+static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base,
+ DataSource* source);
GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType import_source_get_type (void) G_GNUC_CONST;
gpointer source_holding_tank_ref (gpointer instance);
void source_holding_tank_unref (gpointer instance);
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_holding_tank (GValue* value, gpointer v_object);
-void value_take_source_holding_tank (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_holding_tank (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_holding_tank (GValue* value,
+ gpointer v_object);
+void value_take_source_holding_tank (GValue* value,
+ gpointer v_object);
gpointer value_get_source_holding_tank (const GValue* value);
GType source_holding_tank_get_type (void) G_GNUC_CONST;
gpointer source_snapshot_ref (gpointer instance);
void source_snapshot_unref (gpointer instance);
-GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_snapshot (GValue* value, gpointer v_object);
-void value_take_source_snapshot (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_snapshot (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_source_snapshot (GValue* value,
+ gpointer v_object);
+void value_take_source_snapshot (GValue* value,
+ gpointer v_object);
gpointer value_get_source_snapshot (const GValue* value);
GType source_snapshot_get_type (void) G_GNUC_CONST;
GType photo_file_format_get_type (void) G_GNUC_CONST;
GType indexable_get_type (void) G_GNUC_CONST;
#define IMPORT_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_SOURCE, ImportSourcePrivate))
-enum {
- IMPORT_SOURCE_DUMMY_PROPERTY
-};
-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* 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);
#define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1)
-ThumbnailSource* thumbnail_source_construct (GType object_type, gint64 object_id);
+ThumbnailSource* thumbnail_source_construct (GType object_type,
+ gint64 object_id);
gchar* indexable_prepare_indexable_string (const gchar* str);
-void import_source_set_preview (ImportSource* self, GdkPixbuf* preview);
+void import_source_set_preview (ImportSource* self,
+ GdkPixbuf* preview);
gchar* import_source_get_camera_name (ImportSource* self);
Camera* import_source_get_camera (ImportSource* self);
gint import_source_get_fsid (ImportSource* self);
@@ -1603,55 +1674,104 @@ static GdkPixbuf* import_source_real_get_preview (ImportSource* self);
time_t import_source_get_exposure_time (ImportSource* self);
static time_t import_source_real_get_exposure_time (ImportSource* self);
gchar* import_source_get_fulldir (ImportSource* self);
-gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint fsid, const gchar* folder);
+gchar* import_page_get_fulldir (Camera* camera,
+ const gchar* camera_name,
+ gint fsid,
+ const gchar* folder);
static gchar* import_source_real_to_string (DataObject* base);
-static gboolean import_source_real_internal_delete_backing (DataSource* base, GError** error);
+static gboolean import_source_real_internal_delete_backing (DataSource* base,
+ GError** error);
gchar* data_object_to_string (DataObject* self);
-gboolean data_source_internal_delete_backing (DataSource* self, GError** error);
+gboolean data_source_internal_delete_backing (DataSource* self,
+ GError** error);
gpointer gp_context_wrapper_ref (gpointer instance);
void gp_context_wrapper_unref (gpointer instance);
-GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void gp_value_set_context_wrapper (GValue* value, gpointer v_object);
-void gp_value_take_context_wrapper (GValue* value, gpointer v_object);
+GParamSpec* gp_param_spec_context_wrapper (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void gp_value_set_context_wrapper (GValue* value,
+ gpointer v_object);
+void gp_value_take_context_wrapper (GValue* value,
+ gpointer v_object);
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);
GType video_import_source_get_type (void) G_GNUC_CONST;
-enum {
- VIDEO_IMPORT_SOURCE_DUMMY_PROPERTY
-};
-VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time);
-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);
-static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error);
-GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self, gint scale, GError** error);
-static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error);
-GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
+VideoImportSource* video_import_source_new (const gchar* camera_name,
+ Camera* camera,
+ gint fsid,
+ const gchar* folder,
+ const gchar* filename,
+ gulong file_size,
+ time_t modification_time);
+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);
+static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error);
+GdkPixbuf* thumbnail_source_create_thumbnail (ThumbnailSource* self,
+ gint scale,
+ GError** error);
+static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error);
+GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf,
+ gint scale,
+ GdkInterpType interp,
+ gboolean scale_up);
static gchar* video_import_source_real_get_typename (DataSource* base);
static gint64 video_import_source_real_get_instance_id (DataSource* base);
gint64 data_object_get_object_id (DataObject* self);
static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base);
PhotoFileFormat photo_file_format_get_system_default_format (void);
static gchar* video_import_source_real_get_name (DataObject* base);
-void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview);
+void video_import_source_update (VideoImportSource* self,
+ GdkPixbuf* preview);
GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void);
GType photo_import_source_get_type (void) G_GNUC_CONST;
gpointer media_metadata_ref (gpointer instance);
void media_metadata_unref (gpointer instance);
-GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_metadata (GValue* value, gpointer v_object);
-void value_take_media_metadata (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_metadata (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_media_metadata (GValue* value,
+ gpointer v_object);
+void value_take_media_metadata (GValue* value,
+ gpointer v_object);
gpointer value_get_media_metadata (const GValue* value);
GType media_metadata_get_type (void) G_GNUC_CONST;
GType photo_metadata_get_type (void) G_GNUC_CONST;
#define PHOTO_IMPORT_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSourcePrivate))
-enum {
- PHOTO_IMPORT_SOURCE_DUMMY_PROPERTY
-};
#define PHOTO_IMPORT_SOURCE_INTERP GDK_INTERP_BILINEAR
-PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format);
-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* photo_import_source_new (const gchar* camera_name,
+ Camera* camera,
+ gint fsid,
+ const gchar* folder,
+ const gchar* filename,
+ gulong file_size,
+ time_t modification_time,
+ PhotoFileFormat file_format);
+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);
static gchar* photo_import_source_real_get_name (DataObject* base);
gchar* photo_import_source_get_title (PhotoImportSource* self);
gboolean is_string_empty (const gchar* s);
@@ -1659,14 +1779,26 @@ static gchar* photo_import_source_real_get_typename (DataSource* base);
static gint64 photo_import_source_real_get_instance_id (DataSource* base);
static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base);
gboolean photo_file_format_can_write (PhotoFileFormat self);
-static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error);
-void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, const gchar* preview_md5, PhotoMetadata* metadata, const gchar* exif_md5);
+static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error);
+void photo_import_source_update (PhotoImportSource* self,
+ GdkPixbuf* preview,
+ const gchar* preview_md5,
+ PhotoMetadata* metadata,
+ const gchar* exif_md5);
static time_t photo_import_source_real_get_exposure_time (ImportSource* base);
gpointer metadata_date_time_ref (gpointer instance);
void metadata_date_time_unref (gpointer instance);
-GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_metadata_date_time (GValue* value, gpointer v_object);
-void value_take_metadata_date_time (GValue* value, gpointer v_object);
+GParamSpec* param_spec_metadata_date_time (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_metadata_date_time (GValue* value,
+ gpointer v_object);
+void value_take_metadata_date_time (GValue* value,
+ gpointer v_object);
gpointer value_get_metadata_date_time (const GValue* value);
GType metadata_date_time_get_type (void) G_GNUC_CONST;
MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self);
@@ -1674,12 +1806,16 @@ time_t metadata_date_time_get_timestamp (MetadataDateTime* self);
gchar* media_metadata_get_title (MediaMetadata* self);
PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self);
static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base);
-static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error);
+static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error);
PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self);
gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self);
-void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated);
+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 gboolean photo_import_source_real_internal_delete_backing (DataSource* base,
+ GError** error);
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;
@@ -1691,107 +1827,163 @@ GType media_source_item_get_type (void) G_GNUC_CONST;
GType import_preview_get_type (void) G_GNUC_CONST;
GType duplicated_file_get_type (void) G_GNUC_CONST;
#define IMPORT_PREVIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_PREVIEW, ImportPreviewPrivate))
-enum {
- IMPORT_PREVIEW_DUMMY_PROPERTY
-};
#define IMPORT_PREVIEW_MAX_SCALE 128
ImportPreview* import_preview_new (ImportSource* source);
-ImportPreview* import_preview_construct (GType object_type, ImportSource* source);
-void dimensions_init (Dimensions *self, gint width, gint height);
+ImportPreview* import_preview_construct (GType object_type,
+ ImportSource* source);
+void dimensions_init (Dimensions *self,
+ gint width,
+ gint height);
gchar* data_object_get_name (DataObject* self);
-MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment);
-MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment);
-void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean enable_sprockets);
-GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error);
+MediaSourceItem* media_source_item_new (ThumbnailSource* source,
+ Dimensions* initial_pixbuf_dim,
+ const gchar* title,
+ const gchar* comment,
+ gboolean marked_up,
+ PangoAlignment alignment);
+MediaSourceItem* media_source_item_construct (GType object_type,
+ ThumbnailSource* source,
+ Dimensions* initial_pixbuf_dim,
+ const gchar* title,
+ const gchar* comment,
+ gboolean marked_up,
+ PangoAlignment alignment);
+void media_source_item_set_enable_sprockets (MediaSourceItem* self,
+ gboolean enable_sprockets);
+GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self,
+ gint scale,
+ GError** error);
GdkPixbuf* get_placeholder_pixbuf (void);
GType orientation_get_type (void) G_GNUC_CONST;
Orientation photo_metadata_get_orientation (PhotoMetadata* self);
-GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf);
-void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment);
-void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf);
+GdkPixbuf* orientation_rotate_pixbuf (Orientation self,
+ GdkPixbuf* pixbuf);
+void checkerboard_item_set_subtitle (CheckerboardItem* self,
+ const gchar* text,
+ gboolean marked_up,
+ PangoAlignment alignment);
+void checkerboard_item_set_image (CheckerboardItem* self,
+ GdkPixbuf* pixbuf);
gboolean import_preview_is_already_imported (ImportPreview* self);
ImportSource* import_preview_get_import_source (ImportPreview* self);
-gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format);
+gboolean library_photo_has_nontrash_duplicate (GFile* file,
+ const gchar* thumbnail_md5,
+ const gchar* full_md5,
+ PhotoFileFormat file_format);
GType photo_id_get_type (void) G_GNUC_CONST;
PhotoID* photo_id_dup (const PhotoID* self);
void photo_id_free (PhotoID* self);
DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id);
-void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, PhotoID* result);
+void library_photo_get_nontrash_duplicate (GFile* file,
+ const gchar* thumbnail_md5,
+ const gchar* full_md5,
+ PhotoFileFormat file_format,
+ PhotoID* result);
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType media_source_collection_get_type (void) G_GNUC_CONST;
GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
-void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result);
+void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self,
+ const gchar* basename,
+ gint64 filesize,
+ PhotoID* result);
gboolean photo_id_is_valid (PhotoID *self);
GType media_source_get_type (void) G_GNUC_CONST;
GType photo_source_get_type (void) G_GNUC_CONST;
GType photo_get_type (void) G_GNUC_CONST;
GType library_photo_get_type (void) G_GNUC_CONST;
-LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self, PhotoID* photo_id);
+LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollection* self,
+ PhotoID* photo_id);
time_t media_source_get_exposure_time (MediaSource* self);
GType video_source_collection_get_type (void) G_GNUC_CONST;
-gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize);
+gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCollection* self,
+ const gchar* basename,
+ guint64 filesize);
GType video_id_get_type (void) G_GNUC_CONST;
VideoID* video_id_dup (const VideoID* self);
void video_id_free (VideoID* self);
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);
+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);
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);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+ gpointer v_object);
+void core_value_take_tracker (GValue* value,
+ gpointer v_object);
gpointer core_value_get_tracker (const GValue* value);
GType core_tracker_get_type (void) G_GNUC_CONST;
GType core_view_tracker_get_type (void) G_GNUC_CONST;
GType camera_view_tracker_get_type (void) G_GNUC_CONST;
GType camera_accumulator_get_type (void) G_GNUC_CONST;
-enum {
- CAMERA_VIEW_TRACKER_DUMMY_PROPERTY
-};
CameraAccumulator* camera_accumulator_new (void);
CameraAccumulator* camera_accumulator_construct (GType object_type);
GType view_collection_get_type (void) G_GNUC_CONST;
CameraViewTracker* camera_view_tracker_new (ViewCollection* collection);
-CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollection* collection);
+CameraViewTracker* camera_view_tracker_construct (GType object_type,
+ ViewCollection* collection);
CoreViewTracker* core_view_tracker_new (ViewCollection* collection);
-CoreViewTracker* core_view_tracker_construct (GType object_type, 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);
+void core_view_tracker_start (CoreViewTracker* self,
+ CoreTrackerAccumulator* all,
+ CoreTrackerAccumulator* visible,
+ CoreTrackerAccumulator* selected);
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_PROPERTY,
- CAMERA_ACCUMULATOR_PHOTOS_PROPERTY,
- CAMERA_ACCUMULATOR_VIDEOS_PROPERTY,
- CAMERA_ACCUMULATOR_RAW_PROPERTY
-};
-static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object);
+static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base,
+ DataObject* object);
gint camera_accumulator_get_total (CameraAccumulator* self);
-static void camera_accumulator_set_total (CameraAccumulator* self, gint value);
+static void camera_accumulator_set_total (CameraAccumulator* self,
+ gint value);
gint camera_accumulator_get_photos (CameraAccumulator* self);
-static void camera_accumulator_set_photos (CameraAccumulator* self, gint value);
+static void camera_accumulator_set_photos (CameraAccumulator* self,
+ gint value);
gint camera_accumulator_get_raw (CameraAccumulator* self);
-static void camera_accumulator_set_raw (CameraAccumulator* self, gint value);
+static void camera_accumulator_set_raw (CameraAccumulator* self,
+ gint value);
gint camera_accumulator_get_videos (CameraAccumulator* self);
-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);
+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 _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);
+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;
GType page_window_get_type (void) G_GNUC_CONST;
GType fullscreen_window_get_type (void) G_GNUC_CONST;
gpointer injection_group_ref (gpointer instance);
void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_injection_group (GValue* value,
+ gpointer v_object);
+void value_take_injection_group (GValue* value,
+ gpointer v_object);
gpointer value_get_injection_group (const GValue* value);
GType injection_group_get_type (void) G_GNUC_CONST;
GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -1801,9 +1993,15 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con
void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self);
gpointer view_filter_ref (gpointer instance);
void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_filter (GValue* value,
+ gpointer v_object);
+void value_take_view_filter (GValue* value,
+ gpointer v_object);
gpointer value_get_view_filter (const GValue* value);
GType view_filter_get_type (void) G_GNUC_CONST;
GType search_view_filter_get_type (void) G_GNUC_CONST;
@@ -1811,11 +2009,11 @@ GType import_page_get_type (void) G_GNUC_CONST;
static GType import_page_import_page_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
static GType import_page_hide_imported_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define IMPORT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_PAGE, ImportPagePrivate))
-enum {
- IMPORT_PAGE_DUMMY_PROPERTY
-};
static void import_page_on_media_added_removed (ImportPage* self);
-static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self);
+static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self);
GType import_page_refresh_result_get_type (void) G_GNUC_CONST;
static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void);
static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type);
@@ -1824,57 +2022,121 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_c
#define IMPORT_PAGE_UNMOUNT_FAILED_MSG _ ("Unable to unmount camera. Try unmounting the camera from the file mana" \
"ger.")
static void import_page_on_import_selected (ImportPage* self);
-static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void import_page_on_import_all (ImportPage* self);
-static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
-static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value);
-static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
-ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
-CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
+static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
+void page_on_action_toggle (Page* self,
+ GAction* action,
+ GVariant* value);
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
+static void import_page_on_display_titles (ImportPage* self,
+ GSimpleAction* action,
+ GVariant* value);
+static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self);
+ImportPage* import_page_new (Camera* camera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon);
+ImportPage* import_page_construct (GType object_type,
+ Camera* camera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon);
+CheckerboardPage* checkerboard_page_construct (GType object_type,
+ const gchar* page_name);
ViewCollection* page_get_view (Page* self);
-void page_set_page_name (Page* self, const gchar* page_name);
+void page_set_page_name (Page* self,
+ const gchar* page_name);
GPContextWrapper* gp_context_wrapper_new (void);
GPContextWrapper* gp_context_wrapper_construct (GType object_type);
GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void);
GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type);
gpointer view_manager_ref (gpointer instance);
void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_manager (GValue* value,
+ gpointer v_object);
+void value_take_view_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_view_manager (const GValue* value);
GType view_manager_get_type (void) G_GNUC_CONST;
gpointer view_collection_monitor_ref (gpointer instance);
void view_collection_monitor_unref (gpointer instance);
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void view_collection_value_set_monitor (GValue* value, gpointer v_object);
-void view_collection_value_take_monitor (GValue* value, gpointer v_object);
+GParamSpec* view_collection_param_spec_monitor (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void view_collection_value_set_monitor (GValue* value,
+ gpointer v_object);
+void view_collection_value_take_monitor (GValue* value,
+ gpointer v_object);
gpointer view_collection_value_get_monitor (const GValue* value);
GType view_collection_monitor_get_type (void) G_GNUC_CONST;
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+ SourceCollection* sources,
+ ViewManager* manager,
+ Alteration* prereq,
+ GeeCollection* initial,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner);
-static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type, ImportPage* owner);
+static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type,
+ ImportPage* owner);
static GType import_page_import_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target);
-static gint64 import_page_preview_comparator (void* a, void* b);
-static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpointer self);
-static gboolean import_page_preview_comparator_predicate (DataObject* object, Alteration* alteration);
-static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self);
+void data_collection_set_comparator (DataCollection* self,
+ Comparator comparator,
+ void* comparator_target,
+ ComparatorPredicate predicate,
+ void* predicate_target);
+static gint64 import_page_preview_comparator (void* a,
+ void* b);
+static gint64 _import_page_preview_comparator_comparator (void* a,
+ void* b,
+ gpointer self);
+static gboolean import_page_preview_comparator_predicate (DataObject* object,
+ Alteration* alteration);
+static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object,
+ Alteration* alteration,
+ gpointer self);
static void import_page_on_view_changed (ImportPage* self);
-static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self);
-static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self);
-static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self);
-void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target);
+static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender,
+ GeeIterable* changed,
+ gpointer self);
+static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self);
+static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender,
+ GeeCollection* changed,
+ gpointer self);
+void data_collection_set_property (DataCollection* self,
+ const gchar* name,
+ GValue* val,
+ ValueEqualFunc value_equals,
+ void* value_equals_target);
#define CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES "show-subtitles"
-void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path);
-void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path);
+void checkerboard_page_init_item_context_menu (CheckerboardPage* self,
+ const gchar* path);
+void checkerboard_page_init_page_context_menu (CheckerboardPage* self,
+ const gchar* path);
static GtkToolbar* import_page_real_get_toolbar (Page* base);
GtkToolbar* page_get_toolbar (Page* self);
static void import_page_on_hide_imported (ImportPage* self);
-static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender,
+ gpointer self);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
ConfigFacade* config_facade_get_instance (void);
@@ -1883,171 +2145,344 @@ static void import_page_update_toolbar_state (ImportPage* self);
static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base);
static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base);
static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* base);
-gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail);
-static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void* b);
+gboolean alteration_has_detail (Alteration* self,
+ const gchar* subject,
+ const gchar* detail);
+static gint64 import_page_import_job_comparator (ImportPage* self,
+ void* a,
+ void* b);
gpointer batch_import_job_ref (gpointer instance);
void batch_import_job_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_job (GValue* value, gpointer v_object);
-void value_take_batch_import_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_job (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_job (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_job (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_job (const GValue* value);
GType batch_import_job_get_type (void) G_GNUC_CONST;
static GType import_page_camera_import_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self);
-static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void import_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-GAction* page_get_action (Page* self, const gchar* name);
+static void import_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+ GeeList* ui_filenames);
+static void import_page_real_add_actions (Page* base,
+ GActionMap* map);
+void page_add_actions (Page* self,
+ GActionMap* map);
+GAction* page_get_action (Page* self,
+ const gchar* name);
gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self);
static GVariant* _variant_new15 (gboolean value);
-static void import_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
+static void import_page_real_remove_actions (Page* base,
+ GActionMap* map);
+void page_remove_actions (Page* self,
+ GActionMap* map);
Camera* import_page_get_camera (ImportPage* self);
gchar* import_page_get_uri (ImportPage* self);
gboolean import_page_is_busy (ImportPage* self);
-static void import_page_real_init_actions (Page* base, gint selected_count, gint count);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_init_actions (Page* self, gint selected_count, gint count);
+static void import_page_real_init_actions (Page* base,
+ gint selected_count,
+ gint count);
+void page_set_action_sensitive (Page* self,
+ const gchar* name,
+ gboolean sensitive);
+void page_init_actions (Page* self,
+ gint selected_count,
+ gint count);
gboolean import_page_is_refreshed (ImportPage* self);
gchar* import_page_get_refresh_message (ImportPage* self);
-static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed);
+static void import_page_update_status (ImportPage* self,
+ gboolean busy,
+ gboolean refreshed);
gint view_collection_get_unfiltered_count (ViewCollection* self);
gint view_collection_get_selected_count (ViewCollection* self);
gint data_collection_get_count (DataCollection* self);
-void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display);
-void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display);
+void checkerboard_page_set_display_titles (CheckerboardPage* self,
+ gboolean display);
+void configuration_facade_set_display_photo_titles (ConfigurationFacade* self,
+ gboolean display);
static void import_page_real_switched_to (Page* base);
void page_switched_to (Page* self);
static void import_page_real_ready (Page* base);
-static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked);
+static void import_page_try_refreshing_camera (ImportPage* self,
+ gboolean fail_on_locked);
static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+void app_window_error_message (const gchar* message,
+ GtkWindow* parent);
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
#define RESOURCES_APP_TITLE "Shotwell"
-void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* message);
-gboolean import_page_unmount_camera (ImportPage* self, GMount* mount);
-static void import_page_on_unmounted (ImportPage* self, GMount* mount);
-static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self);
-static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GAsyncResult* aresult);
-static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
+void checkerboard_page_set_page_message (CheckerboardPage* self,
+ const gchar* message);
+gboolean import_page_unmount_camera (ImportPage* self,
+ GMount* mount);
+static void import_page_on_unmounted (ImportPage* self,
+ GMount* mount);
+static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender,
+ gpointer self);
+static void import_page_on_unmount_finished (ImportPage* self,
+ GObject* source,
+ GAsyncResult* aresult);
+static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object,
+ GAsyncResult* res,
+ gpointer self);
static void import_page_clear_all_import_sources (ImportPage* self);
Marker* data_collection_start_marking (DataCollection* self);
void marker_mark_all (Marker* self);
-gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
-static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target);
+gint source_collection_destroy_marked (SourceCollection* self,
+ Marker* marker,
+ gboolean delete_backing,
+ ProgressMonitor monitor,
+ void* monitor_target,
+ GeeList* not_removed);
+static gboolean import_page_check_directory_exists (ImportPage* self,
+ gint fsid,
+ const gchar* dir,
+ const gchar* search_target);
static gboolean ____lambda18_ (ImportPage* self);
static gboolean _____lambda18__gsource_func (gpointer self);
-static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list);
-static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list);
-static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list);
+static gboolean import_page_enumerate_files (ImportPage* self,
+ gint fsid,
+ const gchar* dir,
+ GeeArrayList* import_list);
+static void import_page_auto_match_raw_jpeg (ImportPage* self,
+ GeeArrayList* import_list);
+static void import_page_load_previews_and_metadata (ImportPage* self,
+ GeeList* import_list);
gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self);
-static gchar* import_page_chomp_ch (const gchar* str, gchar ch);
-gchar* import_page_append_path (const gchar* basepath, const gchar* addition);
-gchar* import_page_get_fs_basedir (Camera* camera, gint fsid);
+static gchar* import_page_chomp_ch (const gchar* str,
+ gchar ch);
+gchar* import_page_append_path (const gchar* basepath,
+ const gchar* addition);
+gchar* import_page_get_fs_basedir (Camera* camera,
+ gint fsid);
#define GP_MAX_BASEDIR_LENGTH 255
-gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error);
+gboolean gp_get_info (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ CameraFileInfo* info,
+ GError** error);
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);
-PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
+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);
gchar* photo_metadata_exif_hash (PhotoMetadata* self);
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
-void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
-void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f);
-void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported);
-static void import_page_import (ImportPage* self, GeeIterable* items);
+GdkPixbuf* gp_load_preview (GPContext* context,
+ Camera* camera,
+ const gchar* folder,
+ const gchar* filename,
+ gchar* * preview_md5,
+ GError** error);
+gboolean data_collection_add (DataCollection* self,
+ DataObject* object);
+void view_collection_install_view_filter (ViewCollection* self,
+ ViewFilter* f);
+void view_collection_remove_view_filter (ViewCollection* self,
+ ViewFilter* f);
+void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self,
+ gboolean hide_imported);
+static void import_page_import (ImportPage* self,
+ GeeIterable* items);
GeeList* view_collection_get_selected (ViewCollection* self);
GeeCollection* data_collection_get_all (DataCollection* self);
GType sorted_list_get_type (void) G_GNUC_CONST;
-static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, gpointer self);
-SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target);
-SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target);
-static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file);
-static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type, GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file);
-void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated);
+static gint64 _import_page_import_job_comparator_comparator (void* a,
+ void* b,
+ gpointer self);
+SortedList* sorted_list_new (GType g_type,
+ GBoxedCopyFunc g_dup_func,
+ GDestroyNotify g_destroy_func,
+ Comparator cmp,
+ void* cmp_target);
+SortedList* sorted_list_construct (GType object_type,
+ GType g_type,
+ GBoxedCopyFunc g_dup_func,
+ GDestroyNotify g_destroy_func,
+ Comparator cmp,
+ void* cmp_target);
+static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context,
+ ImportSource* import_file,
+ DuplicatedFile* duplicated_file);
+static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type,
+ GPContextWrapper* context,
+ ImportSource* import_file,
+ DuplicatedFile* duplicated_file);
+void batch_import_job_set_associated (BatchImportJob* self,
+ BatchImportJob* associated);
GType batch_import_get_type (void) G_GNUC_CONST;
gpointer import_manifest_ref (gpointer instance);
void import_manifest_unref (gpointer instance);
-GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_import_manifest (GValue* value, gpointer v_object);
-void value_take_import_manifest (GValue* value, gpointer v_object);
+GParamSpec* param_spec_import_manifest (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_import_manifest (GValue* value,
+ gpointer v_object);
+void value_take_import_manifest (GValue* value,
+ gpointer v_object);
gpointer value_get_import_manifest (const GValue* value);
GType import_manifest_get_type (void) G_GNUC_CONST;
-static void import_page_import_reporter (ImportPage* self, ImportManifest* manifest);
+static void import_page_import_reporter (ImportPage* self,
+ ImportManifest* manifest);
gpointer batch_import_roll_ref (gpointer instance);
void batch_import_roll_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_roll (GValue* value, gpointer v_object);
-void value_take_batch_import_roll (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_roll (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_roll (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_roll (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_roll (const GValue* value);
GType batch_import_roll_get_type (void) G_GNUC_CONST;
-static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self);
-BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
-BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
+static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self);
+BatchImport* batch_import_new (GeeIterable* jobs,
+ const gchar* name,
+ BatchImportImportReporter reporter,
+ void* reporter_target,
+ GeeArrayList* prefailed,
+ GeeArrayList* pre_already_imported,
+ GCancellable* cancellable,
+ BatchImportRoll* import_roll,
+ ImportManifest* skip_manifest);
+BatchImport* batch_import_construct (GType object_type,
+ GeeIterable* jobs,
+ const gchar* name,
+ BatchImportImportReporter reporter,
+ void* reporter_target,
+ GeeArrayList* prefailed,
+ GeeArrayList* pre_already_imported,
+ GCancellable* cancellable,
+ BatchImportRoll* import_roll,
+ ImportManifest* skip_manifest);
gpointer batch_import_result_ref (gpointer instance);
void batch_import_result_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_result (GValue* value, gpointer v_object);
-void value_take_batch_import_result (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_result (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_result (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_result (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_result (const GValue* value);
GType batch_import_result_get_type (void) G_GNUC_CONST;
-static void import_page_on_import_job_failed (ImportPage* self, BatchImportResult* _result_);
-static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self);
+static void import_page_on_import_job_failed (ImportPage* self,
+ BatchImportResult* _result_);
+static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender,
+ BatchImportResult* _result_,
+ gpointer self);
static void import_page_close_import (ImportPage* self);
-static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self);
+static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender,
+ ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self);
GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
-void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
+void library_window_enqueue_batch_import (LibraryWindow* self,
+ BatchImport* batch_import,
+ gboolean allow_user_cancel);
void library_window_switch_to_import_queue_page (LibraryWindow* self);
-ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported);
-ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported);
+ImportManifest* import_manifest_new (GeeList* prefailed,
+ GeeList* pre_already_imported);
+ImportManifest* import_manifest_construct (GType object_type,
+ GeeList* prefailed,
+ GeeList* pre_already_imported);
GType import_result_get_type (void) G_GNUC_CONST;
-gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, const gchar* photos_msg, const gchar* videos_msg, const gchar* both_msg, const gchar* neither_msg);
+gchar* import_ui_get_media_specific_string (GeeCollection* import_collection,
+ const gchar* photos_msg,
+ const gchar* videos_msg,
+ const gchar* both_msg,
+ const gchar* neither_msg);
gpointer import_ui_question_params_ref (gpointer instance);
void import_ui_question_params_unref (gpointer instance);
-GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void import_ui_value_set_question_params (GValue* value, gpointer v_object);
-void import_ui_value_take_question_params (GValue* value, gpointer v_object);
+GParamSpec* import_ui_param_spec_question_params (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void import_ui_value_set_question_params (GValue* value,
+ gpointer v_object);
+void import_ui_value_take_question_params (GValue* value,
+ gpointer v_object);
gpointer import_ui_value_get_question_params (const GValue* value);
GType import_ui_question_params_get_type (void) G_GNUC_CONST;
#define RESOURCES_DELETE_LABEL _ ("_Delete")
-ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button);
-ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, const gchar* question, const gchar* yes_button, const gchar* no_button);
-gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question);
-void marker_mark (Marker* self, DataObject* object);
+ImportUIQuestionParams* import_ui_question_params_new (const gchar* question,
+ const gchar* yes_button,
+ const gchar* no_button);
+ImportUIQuestionParams* import_ui_question_params_construct (GType object_type,
+ const gchar* question,
+ const gchar* yes_button,
+ const gchar* no_button);
+gboolean import_ui_report_manifest (ImportManifest* manifest,
+ gboolean show_dest_id,
+ ImportUIQuestionParams* question);
+void marker_mark (Marker* self,
+ DataObject* object);
static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraImportJob* self);
GType progress_dialog_get_type (void) G_GNUC_CONST;
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
+ProgressDialog* progress_dialog_new (GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable);
+ProgressDialog* progress_dialog_construct (GType object_type,
+ GtkWindow* owner,
+ const gchar* text,
+ GCancellable* cancellable);
+gboolean progress_dialog_monitor (ProgressDialog* self,
+ guint64 count,
+ guint64 total,
+ gboolean do_event_loop);
+static gboolean _progress_dialog_monitor_progress_monitor (guint64 current,
+ guint64 total,
+ gboolean do_event_loop,
+ gpointer self);
void progress_dialog_close (ProgressDialog* self);
-static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display);
-void page_set_action_active (Page* self, const gchar* name, gboolean active);
+static void import_page_real_set_display_titles (CheckerboardPage* base,
+ gboolean display);
+void page_set_action_active (Page* self,
+ const gchar* name,
+ gboolean active);
static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPage* base);
#define IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManagerPrivate))
-enum {
- IMPORT_PAGE_IMPORT_VIEW_MANAGER_DUMMY_PROPERTY
-};
ViewManager* view_manager_construct (GType object_type);
-static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source);
+static DataView* import_page_import_view_manager_real_create_view (ViewManager* base,
+ DataSource* source);
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);
-void value_set_backing_photo_row (GValue* value, gpointer v_object);
-void value_take_backing_photo_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_backing_photo_row (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_backing_photo_row (GValue* value,
+ gpointer v_object);
+void value_take_backing_photo_row (GValue* value,
+ gpointer v_object);
gpointer value_get_backing_photo_row (const GValue* value);
GType backing_photo_row_get_type (void) G_GNUC_CONST;
#define IMPORT_PAGE_CAMERA_IMPORT_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJobPrivate))
-enum {
- IMPORT_PAGE_CAMERA_IMPORT_JOB_DUMMY_PROPERTY
-};
BatchImportJob* batch_import_job_construct (GType object_type);
static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base);
static time_t import_page_camera_import_job_real_get_exposure_time_override (BatchImportJob* base);
@@ -2055,99 +2490,123 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor
static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base);
static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* base);
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 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);
-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);
+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);
void library_monitor_unblacklist_file (GFile* file);
GType raw_developer_get_type (void) G_GNUC_CONST;
-BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error);
+BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self,
+ const gchar* raw_filepath,
+ const gchar* camera_development_filename,
+ GError** error);
gchar* batch_import_job_get_basename (BatchImportJob* self);
GType backing_photo_id_get_type (void) G_GNUC_CONST;
BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
void backing_photo_id_free (BackingPhotoID* self);
static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base);
static void import_page_camera_import_job_finalize (BatchImportJob * obj);
-enum {
- IMPORT_PAGE_IMPORT_PAGE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
static guint import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base);
GType search_filter_criteria_get_type (void) G_GNUC_CONST;
-static gboolean import_page_import_page_search_view_filter_real_predicate (ViewFilter* base, DataView* view);
+static gboolean import_page_import_page_search_view_filter_real_predicate (ViewFilter* base,
+ DataView* view);
guint search_view_filter_get_criteria (SearchViewFilter* self);
gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self);
gboolean search_view_filter_get_show_media_video (SearchViewFilter* self);
gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self);
gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self);
const gchar* indexable_get_indexable_keywords (Indexable* self);
-gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1);
+gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self,
+ int* result_length1);
SearchViewFilter* search_view_filter_construct (GType object_type);
-enum {
- IMPORT_PAGE_HIDE_IMPORTED_VIEW_FILTER_DUMMY_PROPERTY
-};
-static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter* base, DataView* view);
+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 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*
+import_source_collection_construct (GType object_type,
+ const gchar* name)
+{
ImportSourceCollection* self = 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"
- _tmp0_ = name;
-#line 9 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self = (ImportSourceCollection*) source_collection_construct (object_type, _tmp0_);
+ self = (ImportSourceCollection*) source_collection_construct (object_type, name);
#line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 2108 "ImportPage.c"
+#line 2559 "ImportPage.c"
}
-ImportSourceCollection* import_source_collection_new (const gchar* name) {
+ImportSourceCollection*
+import_source_collection_new (const gchar* name)
+{
#line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_source_collection_construct (TYPE_IMPORT_SOURCE_COLLECTION, name);
-#line 2115 "ImportPage.c"
+#line 2568 "ImportPage.c"
}
-static gboolean import_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) {
+static gboolean
+import_source_collection_real_holds_type_of_source (SourceCollection* base,
+ DataSource* source)
+{
ImportSourceCollection * self;
gboolean result = FALSE;
- 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"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
#line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = source;
-#line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_IMPORT_SOURCE);
+ result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_IMPORT_SOURCE);
#line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2133 "ImportPage.c"
+#line 2586 "ImportPage.c"
}
-static void import_source_collection_class_init (ImportSourceCollectionClass * klass) {
+static void
+import_source_collection_class_init (ImportSourceCollectionClass * klass)
+{
#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;
-#line 2142 "ImportPage.c"
+#line 2597 "ImportPage.c"
}
-static void import_source_collection_instance_init (ImportSourceCollection * self) {
+static void
+import_source_collection_instance_init (ImportSourceCollection * self)
+{
}
-GType import_source_collection_get_type (void) {
+GType
+import_source_collection_get_type (void)
+{
static volatile gsize import_source_collection_type_id__volatile = 0;
if (g_once_init_enter (&import_source_collection_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportSourceCollection), 0, (GInstanceInitFunc) import_source_collection_instance_init, NULL };
@@ -2159,28 +2618,31 @@ GType import_source_collection_get_type (void) {
}
-static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
+static gpointer
+_GPHOTO_REF_CAMERA0 (gpointer self)
+{
#line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 2165 "ImportPage.c"
+#line 2626 "ImportPage.c"
}
-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*
+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_;
- 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_;
+ gchar* _tmp0_;
+ Camera* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#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"
@@ -2192,90 +2654,78 @@ ImportSource* import_source_construct (GType object_type, const gchar* camera_na
#line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportSource*) thumbnail_source_construct (object_type, DATA_OBJECT_INVALID_OBJECT_ID);
#line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = camera_name;
-#line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (camera_name);
#line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
#line 30 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera_name = _tmp1_;
-#line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = camera;
+ self->priv->camera_name = _tmp0_;
#line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _GPHOTO_REF_CAMERA0 (_tmp2_);
+ _tmp1_ = _GPHOTO_REF_CAMERA0 (camera);
#line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_camera_unref0 (self->priv->camera);
#line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera = _tmp3_;
-#line 32 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = fsid;
+ self->priv->camera = _tmp1_;
#line 32 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->fsid = _tmp4_;
-#line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = folder;
+ self->priv->fsid = fsid;
#line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp2_ = g_strdup (folder);
#line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->folder);
#line 33 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->folder = _tmp6_;
-#line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = filename;
+ self->priv->folder = _tmp2_;
#line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp3_ = g_strdup (filename);
#line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->filename);
#line 34 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->filename = _tmp8_;
+ self->priv->filename = _tmp3_;
#line 35 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = file_size;
-#line 35 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->file_size = _tmp9_;
-#line 36 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = modification_time;
+ self->priv->file_size = file_size;
#line 36 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->modification_time = _tmp10_;
+ self->priv->modification_time = modification_time;
#line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = filename;
-#line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = indexable_prepare_indexable_string (_tmp11_);
+ _tmp4_ = indexable_prepare_indexable_string (filename);
#line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->indexable_keywords);
#line 37 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->indexable_keywords = _tmp12_;
+ self->priv->indexable_keywords = _tmp4_;
#line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 2248 "ImportPage.c"
+#line 2694 "ImportPage.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 2255 "ImportPage.c"
+#line 2703 "ImportPage.c"
}
-void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) {
+void
+import_source_set_preview (ImportSource* self,
+ GdkPixbuf* preview)
+{
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"
g_return_if_fail ((preview == NULL) || GDK_IS_PIXBUF (preview));
#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = preview;
-#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (preview);
#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->preview);
#line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->preview = _tmp1_;
-#line 2274 "ImportPage.c"
+ self->priv->preview = _tmp0_;
+#line 2722 "ImportPage.c"
}
-gchar* import_source_get_camera_name (ImportSource* self) {
+gchar*
+import_source_get_camera_name (ImportSource* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -2289,11 +2739,13 @@ gchar* import_source_get_camera_name (ImportSource* self) {
result = _tmp1_;
#line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2292 "ImportPage.c"
+#line 2742 "ImportPage.c"
}
-Camera* import_source_get_camera (ImportSource* self) {
+Camera*
+import_source_get_camera (ImportSource* self)
+{
Camera* result = NULL;
Camera* _tmp0_;
Camera* _tmp1_;
@@ -2307,11 +2759,13 @@ Camera* import_source_get_camera (ImportSource* self) {
result = _tmp1_;
#line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2310 "ImportPage.c"
+#line 2762 "ImportPage.c"
}
-gint import_source_get_fsid (ImportSource* self) {
+gint
+import_source_get_fsid (ImportSource* self)
+{
gint result = 0;
gint _tmp0_;
#line 52 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2322,11 +2776,13 @@ gint import_source_get_fsid (ImportSource* self) {
result = _tmp0_;
#line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2325 "ImportPage.c"
+#line 2779 "ImportPage.c"
}
-gchar* import_source_get_folder (ImportSource* self) {
+gchar*
+import_source_get_folder (ImportSource* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -2340,11 +2796,13 @@ gchar* import_source_get_folder (ImportSource* self) {
result = _tmp1_;
#line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2343 "ImportPage.c"
+#line 2799 "ImportPage.c"
}
-gchar* import_source_get_filename (ImportSource* self) {
+gchar*
+import_source_get_filename (ImportSource* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -2358,11 +2816,13 @@ gchar* import_source_get_filename (ImportSource* self) {
result = _tmp1_;
#line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2361 "ImportPage.c"
+#line 2819 "ImportPage.c"
}
-gulong import_source_get_filesize (ImportSource* self) {
+gulong
+import_source_get_filesize (ImportSource* self)
+{
gulong result = 0UL;
gulong _tmp0_;
#line 64 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2373,11 +2833,13 @@ gulong import_source_get_filesize (ImportSource* self) {
result = _tmp0_;
#line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2376 "ImportPage.c"
+#line 2836 "ImportPage.c"
}
-time_t import_source_get_modification_time (ImportSource* self) {
+time_t
+import_source_get_modification_time (ImportSource* self)
+{
time_t result = 0;
time_t _tmp0_;
#line 68 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2388,11 +2850,13 @@ time_t import_source_get_modification_time (ImportSource* self) {
result = _tmp0_;
#line 69 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2391 "ImportPage.c"
+#line 2853 "ImportPage.c"
}
-static GdkPixbuf* import_source_real_get_preview (ImportSource* self) {
+static GdkPixbuf*
+import_source_real_get_preview (ImportSource* self)
+{
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_;
GdkPixbuf* _tmp1_;
@@ -2404,52 +2868,56 @@ static GdkPixbuf* import_source_real_get_preview (ImportSource* self) {
result = _tmp1_;
#line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2407 "ImportPage.c"
+#line 2871 "ImportPage.c"
}
-GdkPixbuf* import_source_get_preview (ImportSource* self) {
+GdkPixbuf*
+import_source_get_preview (ImportSource* self)
+{
#line 72 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
#line 72 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return IMPORT_SOURCE_GET_CLASS (self)->get_preview (self);
-#line 2416 "ImportPage.c"
+#line 2882 "ImportPage.c"
}
-static time_t import_source_real_get_exposure_time (ImportSource* self) {
+static time_t
+import_source_real_get_exposure_time (ImportSource* self)
+{
time_t result = 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"
- result = _tmp0_;
+ result = import_source_get_modification_time (self);
#line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2429 "ImportPage.c"
+#line 2894 "ImportPage.c"
}
-time_t import_source_get_exposure_time (ImportSource* self) {
+time_t
+import_source_get_exposure_time (ImportSource* self)
+{
#line 76 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0);
#line 76 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return IMPORT_SOURCE_GET_CLASS (self)->get_exposure_time (self);
-#line 2438 "ImportPage.c"
+#line 2905 "ImportPage.c"
}
-gchar* import_source_get_fulldir (ImportSource* self) {
+gchar*
+import_source_get_fulldir (ImportSource* self)
+{
gchar* result = NULL;
Camera* _tmp0_;
Camera* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
- gint _tmp4_;
+ gchar* _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"
@@ -2461,30 +2929,30 @@ gchar* import_source_get_fulldir (ImportSource* self) {
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = _tmp2_;
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = import_source_get_fsid (self);
-#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = import_source_get_folder (self);
+ _tmp4_ = import_source_get_folder (self);
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = import_page_get_fulldir (_tmp1_, _tmp3_, _tmp4_, _tmp6_);
+ _tmp6_ = import_page_get_fulldir (_tmp1_, _tmp3_, import_source_get_fsid (self), _tmp5_);
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp6_);
+ _g_free0 (_tmp5_);
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp3_);
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_camera_unref0 (_tmp1_);
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp8_;
+ result = _tmp7_;
#line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2483 "ImportPage.c"
+#line 2949 "ImportPage.c"
}
-static gchar* import_source_real_to_string (DataObject* base) {
+static gchar*
+import_source_real_to_string (DataObject* base)
+{
ImportSource * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -2523,11 +2991,13 @@ static gchar* import_source_real_to_string (DataObject* base) {
result = _tmp7_;
#line 85 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2526 "ImportPage.c"
+#line 2994 "ImportPage.c"
}
-static gchar* gp_result_to_full_string (int self) {
+static gchar*
+gp_result_to_full_string (int self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -2539,11 +3009,14 @@ static gchar* gp_result_to_full_string (int self) {
result = _tmp1_;
#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
return result;
-#line 2542 "ImportPage.c"
+#line 3012 "ImportPage.c"
}
-static gboolean import_source_real_internal_delete_backing (DataSource* base, GError** error) {
+static gboolean
+import_source_real_internal_delete_backing (DataSource* base,
+ GError** error)
+{
ImportSource * self;
gboolean result = FALSE;
gchar* _tmp0_;
@@ -2553,19 +3026,17 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
gchar* _tmp3_;
const gchar* _tmp4_;
int _result_ = 0;
+ Camera* _tmp10_;
Camera* _tmp11_;
- Camera* _tmp12_;
- const gchar* _tmp13_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
gchar* _tmp14_;
- gchar* _tmp15_;
- GPSpinIdleWrapper* _tmp16_;
- GPContext* _tmp17_;
+ GPSpinIdleWrapper* _tmp15_;
+ GPContext* _tmp16_;
+ int _tmp17_;
int _tmp18_;
- int _tmp19_;
- int _tmp20_;
- gboolean _tmp27_ = FALSE;
- gboolean _tmp28_ = FALSE;
- gboolean _tmp29_;
+ gboolean _tmp25_ = FALSE;
+ gboolean _tmp26_ = FALSE;
GError * _inner_error_ = NULL;
#line 88 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_SOURCE, ImportSource);
@@ -2587,12 +3058,11 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_tmp4_ = fulldir;
#line 92 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp4_ == NULL) {
-#line 2590 "ImportPage.c"
+#line 3061 "ImportPage.c"
gchar* _tmp5_;
gchar* _tmp6_;
const gchar* _tmp7_;
gboolean _tmp8_ = 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"
@@ -2604,20 +3074,18 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
#line 93 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp6_);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _tmp9_;
+ _tmp8_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2612 "ImportPage.c"
- gboolean _tmp10_ = FALSE;
+#line 3080 "ImportPage.c"
+ gboolean _tmp9_ = FALSE;
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return _tmp10_;
-#line 2620 "ImportPage.c"
+ return _tmp9_;
+#line 3088 "ImportPage.c"
}
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp8_;
@@ -2625,104 +3093,102 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
_g_free0 (fulldir);
#line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2628 "ImportPage.c"
+#line 3096 "ImportPage.c"
}
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = import_source_get_camera (self);
+ _tmp10_ = import_source_get_camera (self);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = _tmp11_;
-#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = fulldir;
+ _tmp11_ = _tmp10_;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = import_source_get_filename (self);
+ _tmp12_ = fulldir;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = _tmp14_;
+ _tmp13_ = import_source_get_filename (self);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = import_page_spin_idle_context;
+ _tmp14_ = _tmp13_;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp15_ = import_page_spin_idle_context;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = gp_camera_file_delete (_tmp12_, _tmp13_, _tmp15_, _tmp17_);
+ _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = gp_camera_file_delete (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp14_);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _gp_camera_unref0 (_tmp12_);
+ _gp_camera_unref0 (_tmp11_);
#line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _result_ = _tmp19_;
+ _result_ = _tmp17_;
#line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = _result_;
+ _tmp18_ = _result_;
#line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp20_ != GP_OK) {
-#line 2658 "ImportPage.c"
- gchar* _tmp21_;
- gchar* _tmp22_;
- const gchar* _tmp23_;
- int _tmp24_;
- gchar* _tmp25_;
- gchar* _tmp26_;
+ if (_tmp18_ != GP_OK) {
+#line 3124 "ImportPage.c"
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ const gchar* _tmp21_;
+ int _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
#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));
+ _tmp19_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = self->priv->camera_name;
+ _tmp21_ = self->priv->camera_name;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = _result_;
+ _tmp22_ = _result_;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = gp_result_to_full_string (_tmp24_);
+ _tmp23_ = gp_result_to_full_string (_tmp22_);
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = _tmp25_;
+ _tmp24_ = _tmp23_;
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp22_, _tmp23_, _tmp26_);
+ g_warning ("ImportPage.vala:101: Error deleting %s from %s: %s", _tmp20_, _tmp21_, _tmp24_);
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp26_);
+ _g_free0 (_tmp24_);
#line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp22_);
-#line 2683 "ImportPage.c"
+ _g_free0 (_tmp20_);
+#line 3149 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = _tmp29_;
+ _tmp26_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2691 "ImportPage.c"
- gboolean _tmp30_ = FALSE;
+#line 3155 "ImportPage.c"
+ gboolean _tmp27_ = FALSE;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return _tmp30_;
-#line 2699 "ImportPage.c"
+ return _tmp27_;
+#line 3163 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp28_) {
-#line 2703 "ImportPage.c"
- int _tmp31_;
+ if (_tmp26_) {
+#line 3167 "ImportPage.c"
+ int _tmp28_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = _result_;
+ _tmp28_ = _result_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = _tmp31_ == GP_OK;
-#line 2709 "ImportPage.c"
+ _tmp25_ = _tmp28_ == GP_OK;
+#line 3173 "ImportPage.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = FALSE;
-#line 2713 "ImportPage.c"
+ _tmp25_ = FALSE;
+#line 3177 "ImportPage.c"
}
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp27_;
+ result = _tmp25_;
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2721 "ImportPage.c"
+#line 3185 "ImportPage.c"
}
-static const gchar* import_source_real_get_indexable_keywords (Indexable* base) {
+static const gchar*
+import_source_real_get_indexable_keywords (Indexable* base)
+{
ImportSource * self;
const gchar* result = NULL;
const gchar* _tmp0_;
@@ -2734,11 +3200,13 @@ static const gchar* import_source_real_get_indexable_keywords (Indexable* base)
result = _tmp0_;
#line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2737 "ImportPage.c"
+#line 3203 "ImportPage.c"
}
-static void import_source_class_init (ImportSourceClass * klass) {
+static void
+import_source_class_init (ImportSourceClass * klass)
+{
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_source_parent_class = g_type_class_peek_parent (klass);
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2753,31 +3221,37 @@ static void import_source_class_init (ImportSourceClass * klass) {
((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) import_source_real_internal_delete_backing;
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = import_source_finalize;
-#line 2756 "ImportPage.c"
+#line 3224 "ImportPage.c"
}
-static void import_source_indexable_interface_init (IndexableIface * iface) {
+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;
-#line 2765 "ImportPage.c"
+#line 3235 "ImportPage.c"
}
-static void import_source_instance_init (ImportSource * self) {
+static void
+import_source_instance_init (ImportSource * self)
+{
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = IMPORT_SOURCE_GET_PRIVATE (self);
#line 25 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->preview = NULL;
#line 26 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->indexable_keywords = NULL;
-#line 2776 "ImportPage.c"
+#line 3248 "ImportPage.c"
}
-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);
@@ -2795,11 +3269,13 @@ static void import_source_finalize (GObject * obj) {
_g_free0 (self->priv->indexable_keywords);
#line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (import_source_parent_class)->finalize (obj);
-#line 2798 "ImportPage.c"
+#line 3272 "ImportPage.c"
}
-GType import_source_get_type (void) {
+GType
+import_source_get_type (void)
+{
static volatile gsize import_source_type_id__volatile = 0;
if (g_once_init_enter (&import_source_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportSource), 0, (GInstanceInitFunc) import_source_instance_init, NULL };
@@ -2813,15 +3289,17 @@ 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*
+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_;
- 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"
@@ -2831,80 +3309,78 @@ VideoImportSource* video_import_source_construct (GType object_type, const gchar
#line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (filename != NULL, NULL);
#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = camera_name;
-#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = camera;
-#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = fsid;
-#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = folder;
-#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = filename;
-#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = file_size;
-#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = modification_time;
-#line 114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self = (VideoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
+ self = (VideoImportSource*) import_source_construct (object_type, camera_name, camera, fsid, folder, filename, file_size, modification_time);
#line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 2851 "ImportPage.c"
+#line 3315 "ImportPage.c"
}
-VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
+VideoImportSource*
+video_import_source_new (const gchar* camera_name,
+ Camera* camera,
+ gint fsid,
+ const gchar* folder,
+ const gchar* filename,
+ gulong file_size,
+ time_t modification_time)
+{
#line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return video_import_source_construct (TYPE_VIDEO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time);
-#line 2858 "ImportPage.c"
+#line 3330 "ImportPage.c"
}
-static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
+static GdkPixbuf*
+video_import_source_real_get_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error)
+{
VideoImportSource * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_ = NULL;
- gint _tmp1_;
+ GdkPixbuf* _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);
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = scale;
+ _tmp1_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), scale, &_inner_error_);
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = thumbnail_source_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp2_;
+ _tmp0_ = _tmp1_;
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return NULL;
-#line 2884 "ImportPage.c"
+#line 3357 "ImportPage.c"
}
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp0_;
+ _tmp2_ = _tmp0_;
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = NULL;
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
#line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2896 "ImportPage.c"
+#line 3369 "ImportPage.c"
}
-static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
+static GdkPixbuf*
+video_import_source_real_create_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error)
+{
VideoImportSource * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_;
GdkPixbuf* _tmp1_;
gboolean _tmp2_;
GdkPixbuf* _tmp3_ = NULL;
- 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"
@@ -2921,51 +3397,48 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
result = NULL;
#line 123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2924 "ImportPage.c"
+#line 3400 "ImportPage.c"
}
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = scale;
-#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp4_ > 0) {
-#line 2930 "ImportPage.c"
+ if (scale > 0) {
+#line 3404 "ImportPage.c"
+ GdkPixbuf* _tmp4_;
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"
- _tmp6_ = _tmp5_;
+ _tmp4_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = scale;
+ _tmp5_ = _tmp4_;
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = scale_pixbuf (_tmp6_, _tmp7_, GDK_INTERP_BILINEAR, TRUE);
+ _tmp6_ = scale_pixbuf (_tmp5_, scale, GDK_INTERP_BILINEAR, TRUE);
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp8_;
+ _tmp3_ = _tmp6_;
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp6_);
-#line 2949 "ImportPage.c"
+ _g_object_unref0 (_tmp5_);
+#line 3420 "ImportPage.c"
} else {
- GdkPixbuf* _tmp9_;
+ GdkPixbuf* _tmp7_;
#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));
+ _tmp7_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
#line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp9_;
-#line 2958 "ImportPage.c"
+ _tmp3_ = _tmp7_;
+#line 3429 "ImportPage.c"
}
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp3_;
#line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2964 "ImportPage.c"
+#line 3435 "ImportPage.c"
}
-static gchar* video_import_source_real_get_typename (DataSource* base) {
+static gchar*
+video_import_source_real_get_typename (DataSource* base)
+{
VideoImportSource * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -2977,43 +3450,43 @@ static gchar* video_import_source_real_get_typename (DataSource* base) {
result = _tmp0_;
#line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2980 "ImportPage.c"
+#line 3453 "ImportPage.c"
}
-static gint64 video_import_source_real_get_instance_id (DataSource* base) {
+static gint64
+video_import_source_real_get_instance_id (DataSource* base)
+{
VideoImportSource * self;
gint64 result = 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"
- _tmp0_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp0_;
+ result = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 2996 "ImportPage.c"
+#line 3468 "ImportPage.c"
}
-static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) {
+static PhotoFileFormat
+video_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base)
+{
VideoImportSource * self;
PhotoFileFormat result = 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"
- _tmp0_ = photo_file_format_get_system_default_format ();
-#line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp0_;
+ result = photo_file_format_get_system_default_format ();
#line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3012 "ImportPage.c"
+#line 3483 "ImportPage.c"
}
-static gchar* video_import_source_real_get_name (DataObject* base) {
+static gchar*
+video_import_source_real_get_name (DataObject* base)
+{
VideoImportSource * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -3025,52 +3498,51 @@ static gchar* video_import_source_real_get_name (DataObject* base) {
result = _tmp0_;
#line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3028 "ImportPage.c"
+#line 3501 "ImportPage.c"
}
-void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
+void
+video_import_source_update (VideoImportSource* self,
+ GdkPixbuf* preview)
+{
GdkPixbuf* _tmp0_ = 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"
g_return_if_fail ((preview == NULL) || GDK_IS_PIXBUF (preview));
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = preview;
+ if (preview != NULL) {
+#line 3516 "ImportPage.c"
+ GdkPixbuf* _tmp1_;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp1_ != NULL) {
-#line 3043 "ImportPage.c"
- 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"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (preview);
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp3_;
-#line 3054 "ImportPage.c"
+ _tmp0_ = _tmp1_;
+#line 3524 "ImportPage.c"
} else {
- GdkPixbuf* _tmp4_;
+ GdkPixbuf* _tmp2_;
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = resources_get_noninterpretable_badge_pixbuf ();
+ _tmp2_ = resources_get_noninterpretable_badge_pixbuf ();
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp4_;
-#line 3063 "ImportPage.c"
+ _tmp0_ = _tmp2_;
+#line 3533 "ImportPage.c"
}
#line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_);
#line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
-#line 3069 "ImportPage.c"
+#line 3539 "ImportPage.c"
}
-static void video_import_source_class_init (VideoImportSourceClass * klass) {
+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"
@@ -3085,15 +3557,19 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) {
((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) video_import_source_real_get_preferred_thumbnail_format;
#line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) video_import_source_real_get_name;
-#line 3088 "ImportPage.c"
+#line 3560 "ImportPage.c"
}
-static void video_import_source_instance_init (VideoImportSource * self) {
+static void
+video_import_source_instance_init (VideoImportSource * self)
+{
}
-GType video_import_source_get_type (void) {
+GType
+video_import_source_get_type (void)
+{
static volatile gsize video_import_source_type_id__volatile = 0;
if (g_once_init_enter (&video_import_source_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (VideoImportSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) video_import_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (VideoImportSource), 0, (GInstanceInitFunc) video_import_source_instance_init, NULL };
@@ -3105,16 +3581,18 @@ 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*
+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_;
- 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"
@@ -3124,46 +3602,40 @@ PhotoImportSource* photo_import_source_construct (GType object_type, const gchar
#line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (filename != NULL, NULL);
#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = camera_name;
-#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = camera;
-#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = fsid;
-#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = folder;
-#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = filename;
-#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = file_size;
-#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = modification_time;
-#line 163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self = (PhotoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = file_format;
+ self = (PhotoImportSource*) import_source_construct (object_type, camera_name, camera, fsid, folder, filename, file_size, modification_time);
#line 164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->file_format = _tmp7_;
+ self->priv->file_format = file_format;
#line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 3148 "ImportPage.c"
+#line 3610 "ImportPage.c"
}
-PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) {
+PhotoImportSource*
+photo_import_source_new (const gchar* camera_name,
+ Camera* camera,
+ gint fsid,
+ const gchar* folder,
+ const gchar* filename,
+ gulong file_size,
+ time_t modification_time,
+ PhotoFileFormat file_format)
+{
#line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return photo_import_source_construct (TYPE_PHOTO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time, file_format);
-#line 3155 "ImportPage.c"
+#line 3626 "ImportPage.c"
}
-static gchar* photo_import_source_real_get_name (DataObject* base) {
+static gchar*
+photo_import_source_real_get_name (DataObject* base)
+{
PhotoImportSource * self;
gchar* result = NULL;
gchar* title = NULL;
gchar* _tmp0_;
gchar* _tmp1_ = NULL;
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"
@@ -3173,30 +3645,28 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = title;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = is_string_empty (_tmp2_);
-#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp3_) {
-#line 3179 "ImportPage.c"
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ if (!is_string_empty (_tmp2_)) {
+#line 3649 "ImportPage.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = title;
+ _tmp3_ = title;
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp4_ = g_strdup (_tmp3_);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp1_);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _tmp5_;
-#line 3190 "ImportPage.c"
+ _tmp1_ = _tmp4_;
+#line 3660 "ImportPage.c"
} else {
- gchar* _tmp6_;
+ gchar* _tmp5_;
#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));
+ _tmp5_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp1_);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _tmp6_;
-#line 3199 "ImportPage.c"
+ _tmp1_ = _tmp5_;
+#line 3669 "ImportPage.c"
}
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp1_;
@@ -3204,11 +3674,13 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
_g_free0 (title);
#line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3207 "ImportPage.c"
+#line 3677 "ImportPage.c"
}
-static gchar* photo_import_source_real_get_typename (DataSource* base) {
+static gchar*
+photo_import_source_real_get_typename (DataSource* base)
+{
PhotoImportSource * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -3220,71 +3692,69 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) {
result = _tmp0_;
#line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3223 "ImportPage.c"
+#line 3695 "ImportPage.c"
}
-static gint64 photo_import_source_real_get_instance_id (DataSource* base) {
+static gint64
+photo_import_source_real_get_instance_id (DataSource* base)
+{
PhotoImportSource * self;
gint64 result = 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"
- _tmp0_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp0_;
+ result = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3239 "ImportPage.c"
+#line 3710 "ImportPage.c"
}
-static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base) {
+static PhotoFileFormat
+photo_import_source_real_get_preferred_thumbnail_format (ThumbnailSource* base)
+{
PhotoImportSource * self;
PhotoFileFormat result = 0;
PhotoFileFormat _tmp0_ = 0;
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"
_tmp1_ = self->priv->file_format;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = photo_file_format_can_write (_tmp1_);
+ if (photo_file_format_can_write (_tmp1_)) {
+#line 3727 "ImportPage.c"
+ PhotoFileFormat _tmp2_;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp2_) {
-#line 3257 "ImportPage.c"
- PhotoFileFormat _tmp3_;
-#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = self->priv->file_format;
+ _tmp2_ = self->priv->file_format;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp3_;
-#line 3263 "ImportPage.c"
+ _tmp0_ = _tmp2_;
+#line 3733 "ImportPage.c"
} else {
- PhotoFileFormat _tmp4_;
-#line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = photo_file_format_get_system_default_format ();
#line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp4_;
-#line 3270 "ImportPage.c"
+ _tmp0_ = photo_file_format_get_system_default_format ();
+#line 3737 "ImportPage.c"
}
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
#line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3276 "ImportPage.c"
+#line 3743 "ImportPage.c"
}
-static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
+static GdkPixbuf*
+photo_import_source_real_create_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error)
+{
PhotoImportSource * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_;
GdkPixbuf* _tmp1_;
gboolean _tmp2_;
GdkPixbuf* _tmp3_ = NULL;
- 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"
@@ -3301,65 +3771,64 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
result = NULL;
#line 188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3304 "ImportPage.c"
+#line 3774 "ImportPage.c"
}
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = scale;
-#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp4_ > 0) {
-#line 3310 "ImportPage.c"
+ if (scale > 0) {
+#line 3778 "ImportPage.c"
+ GdkPixbuf* _tmp4_;
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));
+ _tmp4_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp5_;
-#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = scale;
+ _tmp5_ = _tmp4_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = scale_pixbuf (_tmp6_, _tmp7_, PHOTO_IMPORT_SOURCE_INTERP, TRUE);
+ _tmp6_ = scale_pixbuf (_tmp5_, scale, PHOTO_IMPORT_SOURCE_INTERP, TRUE);
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp8_;
+ _tmp3_ = _tmp6_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp6_);
-#line 3329 "ImportPage.c"
+ _g_object_unref0 (_tmp5_);
+#line 3794 "ImportPage.c"
} else {
- GdkPixbuf* _tmp9_;
+ GdkPixbuf* _tmp7_;
#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));
+ _tmp7_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp9_;
-#line 3338 "ImportPage.c"
+ _tmp3_ = _tmp7_;
+#line 3803 "ImportPage.c"
}
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp3_;
#line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3344 "ImportPage.c"
+#line 3809 "ImportPage.c"
}
-static gpointer _media_metadata_ref0 (gpointer self) {
+static gpointer
+_media_metadata_ref0 (gpointer self)
+{
#line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? media_metadata_ref (self) : NULL;
-#line 3351 "ImportPage.c"
+#line 3818 "ImportPage.c"
}
-void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, const gchar* preview_md5, PhotoMetadata* metadata, const gchar* exif_md5) {
- GdkPixbuf* _tmp0_;
- const gchar* _tmp1_;
+void
+photo_import_source_update (PhotoImportSource* self,
+ GdkPixbuf* preview,
+ const gchar* preview_md5,
+ PhotoMetadata* metadata,
+ const gchar* exif_md5)
+{
+ gchar* _tmp0_;
+ PhotoMetadata* _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"
@@ -3367,101 +3836,87 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co
#line 196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
#line 197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = preview;
-#line 197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_);
-#line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = preview_md5;
+ import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), preview);
#line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = g_strdup (_tmp1_);
+ _tmp0_ = g_strdup (preview_md5);
#line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->preview_md5);
#line 198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->preview_md5 = _tmp2_;
+ self->priv->preview_md5 = _tmp0_;
#line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = metadata;
-#line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _media_metadata_ref0 (_tmp3_);
+ _tmp1_ = _media_metadata_ref0 (metadata);
#line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (self->priv->metadata);
#line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->metadata = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = exif_md5;
+ self->priv->metadata = _tmp1_;
#line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp2_ = g_strdup (exif_md5);
#line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->exif_md5);
#line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->exif_md5 = _tmp6_;
-#line 3397 "ImportPage.c"
+ self->priv->exif_md5 = _tmp2_;
+#line 3858 "ImportPage.c"
}
-static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
+static time_t
+photo_import_source_real_get_exposure_time (ImportSource* base)
+{
PhotoImportSource * self;
time_t result = 0;
PhotoMetadata* _tmp0_;
MetadataDateTime* date_time = NULL;
- PhotoMetadata* _tmp2_;
- MetadataDateTime* _tmp3_;
- time_t _tmp4_ = 0;
- MetadataDateTime* _tmp5_;
+ PhotoMetadata* _tmp1_;
+ MetadataDateTime* _tmp2_;
+ time_t _tmp3_ = 0;
+ MetadataDateTime* _tmp4_;
#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"
_tmp0_ = self->priv->metadata;
#line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ == NULL) {
-#line 3416 "ImportPage.c"
- time_t _tmp1_;
-#line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp1_;
+ result = 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"
return result;
-#line 3424 "ImportPage.c"
+#line 3883 "ImportPage.c"
}
#line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = self->priv->metadata;
+ _tmp1_ = self->priv->metadata;
#line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_);
+ _tmp2_ = photo_metadata_get_exposure_date_time (_tmp1_);
#line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- date_time = _tmp3_;
-#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = date_time;
+ date_time = _tmp2_;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp5_ != NULL) {
-#line 3436 "ImportPage.c"
- MetadataDateTime* _tmp6_;
- time_t _tmp7_;
+ _tmp4_ = date_time;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = date_time;
+ if (_tmp4_ != NULL) {
+#line 3895 "ImportPage.c"
+ MetadataDateTime* _tmp5_;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = metadata_date_time_get_timestamp (_tmp6_);
+ _tmp5_ = date_time;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _tmp7_;
-#line 3445 "ImportPage.c"
+ _tmp3_ = metadata_date_time_get_timestamp (_tmp5_);
+#line 3901 "ImportPage.c"
} else {
- time_t _tmp8_;
-#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _tmp8_;
-#line 3452 "ImportPage.c"
+ _tmp3_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
+#line 3905 "ImportPage.c"
}
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_metadata_date_time_unref0 (date_time);
#line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3460 "ImportPage.c"
+#line 3913 "ImportPage.c"
}
-gchar* photo_import_source_get_title (PhotoImportSource* self) {
+gchar*
+photo_import_source_get_title (PhotoImportSource* self)
+{
gchar* result = NULL;
gchar* _tmp0_ = NULL;
PhotoMetadata* _tmp1_;
@@ -3471,7 +3926,7 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
_tmp1_ = self->priv->metadata;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_ != NULL) {
-#line 3474 "ImportPage.c"
+#line 3929 "ImportPage.c"
PhotoMetadata* _tmp2_;
gchar* _tmp3_;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3482,23 +3937,25 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
_g_free0 (_tmp0_);
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp3_;
-#line 3485 "ImportPage.c"
+#line 3940 "ImportPage.c"
} else {
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp0_);
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = NULL;
-#line 3491 "ImportPage.c"
+#line 3946 "ImportPage.c"
}
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
#line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3497 "ImportPage.c"
+#line 3952 "ImportPage.c"
}
-PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
+PhotoMetadata*
+photo_import_source_get_metadata (PhotoImportSource* self)
+{
PhotoMetadata* result = NULL;
PhotoImportSource* _tmp0_;
PhotoMetadata* _tmp3_;
@@ -3509,7 +3966,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
_tmp0_ = self->priv->associated;
#line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 3512 "ImportPage.c"
+#line 3969 "ImportPage.c"
PhotoImportSource* _tmp1_;
PhotoMetadata* _tmp2_;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3520,7 +3977,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
result = _tmp2_;
#line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3523 "ImportPage.c"
+#line 3980 "ImportPage.c"
}
#line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->metadata;
@@ -3530,11 +3987,13 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
result = _tmp4_;
#line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3533 "ImportPage.c"
+#line 3990 "ImportPage.c"
}
-static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
+static GdkPixbuf*
+photo_import_source_real_get_preview (ImportSource* base)
+{
PhotoImportSource * self;
GdkPixbuf* result = NULL;
PhotoImportSource* _tmp0_;
@@ -3547,7 +4006,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
_tmp0_ = self->priv->associated;
#line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 3550 "ImportPage.c"
+#line 4009 "ImportPage.c"
PhotoImportSource* _tmp1_;
GdkPixbuf* _tmp2_;
#line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3558,7 +4017,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
result = _tmp2_;
#line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3561 "ImportPage.c"
+#line 4020 "ImportPage.c"
}
#line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3570,7 +4029,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
_g_object_unref0 (_tmp4_);
#line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp5_) {
-#line 3573 "ImportPage.c"
+#line 4032 "ImportPage.c"
GdkPixbuf* _tmp6_;
#line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3578,24 +4037,27 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
result = _tmp6_;
#line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3581 "ImportPage.c"
+#line 4040 "ImportPage.c"
}
#line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
#line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3587 "ImportPage.c"
+#line 4046 "ImportPage.c"
}
-static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) {
+static GdkPixbuf*
+photo_import_source_real_get_thumbnail (ThumbnailSource* base,
+ gint scale,
+ GError** error)
+{
PhotoImportSource * self;
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_;
GdkPixbuf* _tmp1_;
gboolean _tmp2_;
GdkPixbuf* _tmp3_ = NULL;
- 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"
@@ -3612,51 +4074,48 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
result = NULL;
#line 235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3615 "ImportPage.c"
+#line 4077 "ImportPage.c"
}
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = scale;
-#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp4_ > 0) {
-#line 3621 "ImportPage.c"
+ if (scale > 0) {
+#line 4081 "ImportPage.c"
+ GdkPixbuf* _tmp4_;
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));
+ _tmp4_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp5_;
-#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = scale;
+ _tmp5_ = _tmp4_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = scale_pixbuf (_tmp6_, _tmp7_, PHOTO_IMPORT_SOURCE_INTERP, TRUE);
+ _tmp6_ = scale_pixbuf (_tmp5_, scale, PHOTO_IMPORT_SOURCE_INTERP, TRUE);
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp8_;
+ _tmp3_ = _tmp6_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp6_);
-#line 3640 "ImportPage.c"
+ _g_object_unref0 (_tmp5_);
+#line 4097 "ImportPage.c"
} else {
- GdkPixbuf* _tmp9_;
+ GdkPixbuf* _tmp7_;
#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));
+ _tmp7_ = import_source_get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp9_;
-#line 3649 "ImportPage.c"
+ _tmp3_ = _tmp7_;
+#line 4106 "ImportPage.c"
}
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp3_;
#line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3655 "ImportPage.c"
+#line 4112 "ImportPage.c"
}
-PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
+PhotoFileFormat
+photo_import_source_get_file_format (PhotoImportSource* self)
+{
PhotoFileFormat result = 0;
PhotoFileFormat _tmp0_;
#line 240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3667,11 +4126,13 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
result = _tmp0_;
#line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3670 "ImportPage.c"
+#line 4129 "ImportPage.c"
}
-gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
+gchar*
+photo_import_source_get_preview_md5 (PhotoImportSource* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -3685,30 +4146,32 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
result = _tmp1_;
#line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3688 "ImportPage.c"
+#line 4149 "ImportPage.c"
}
-void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSource* associated) {
+void
+photo_import_source_set_associated (PhotoImportSource* self,
+ PhotoImportSource* associated)
+{
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"
g_return_if_fail ((associated == NULL) || IS_PHOTO_IMPORT_SOURCE (associated));
#line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = associated;
-#line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (associated);
#line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->associated);
#line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->associated = _tmp1_;
-#line 3707 "ImportPage.c"
+ self->priv->associated = _tmp0_;
+#line 4168 "ImportPage.c"
}
-PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self) {
+PhotoImportSource*
+photo_import_source_get_associated (PhotoImportSource* self)
+{
PhotoImportSource* result = NULL;
PhotoImportSource* _tmp0_;
PhotoImportSource* _tmp1_;
@@ -3722,73 +4185,72 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self)
result = _tmp1_;
#line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3725 "ImportPage.c"
+#line 4188 "ImportPage.c"
}
-static gboolean photo_import_source_real_internal_delete_backing (DataSource* base, GError** error) {
+static gboolean
+photo_import_source_real_internal_delete_backing (DataSource* base,
+ GError** error)
+{
PhotoImportSource * self;
gboolean result = FALSE;
gboolean ret = FALSE;
- gboolean _tmp0_;
- PhotoImportSource* _tmp2_;
+ PhotoImportSource* _tmp1_;
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);
#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = DATA_SOURCE_CLASS (photo_import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ret = _tmp0_;
+ ret = DATA_SOURCE_CLASS (photo_import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3744 "ImportPage.c"
- gboolean _tmp1_ = FALSE;
+#line 4207 "ImportPage.c"
+ gboolean _tmp0_ = FALSE;
#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return _tmp1_;
-#line 3750 "ImportPage.c"
+ return _tmp0_;
+#line 4213 "ImportPage.c"
}
#line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = self->priv->associated;
+ _tmp1_ = self->priv->associated;
#line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp2_ != NULL) {
-#line 3756 "ImportPage.c"
- gboolean _tmp3_ = FALSE;
- PhotoImportSource* _tmp4_;
+ if (_tmp1_ != NULL) {
+#line 4219 "ImportPage.c"
+ gboolean _tmp2_ = FALSE;
+ PhotoImportSource* _tmp3_;
gboolean _tmp5_;
- gboolean _tmp7_;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = self->priv->associated;
+ _tmp3_ = self->priv->associated;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp5_;
+ _tmp2_ = data_source_internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource), &_inner_error_);
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3769 "ImportPage.c"
- gboolean _tmp6_ = FALSE;
+#line 4229 "ImportPage.c"
+ gboolean _tmp4_ = FALSE;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return _tmp6_;
-#line 3775 "ImportPage.c"
+ return _tmp4_;
+#line 4235 "ImportPage.c"
}
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = ret;
+ _tmp5_ = ret;
#line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ret = _tmp7_ & _tmp3_;
-#line 3781 "ImportPage.c"
+ ret = _tmp5_ & _tmp2_;
+#line 4241 "ImportPage.c"
}
#line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = ret;
#line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 3787 "ImportPage.c"
+#line 4247 "ImportPage.c"
}
-static void photo_import_source_class_init (PhotoImportSourceClass * klass) {
+static void
+photo_import_source_class_init (PhotoImportSourceClass * klass)
+{
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source_parent_class = g_type_class_peek_parent (klass);
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3813,11 +4275,13 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) {
((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) photo_import_source_real_internal_delete_backing;
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = photo_import_source_finalize;
-#line 3816 "ImportPage.c"
+#line 4278 "ImportPage.c"
}
-static void photo_import_source_instance_init (PhotoImportSource * self) {
+static void
+photo_import_source_instance_init (PhotoImportSource * self)
+{
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = PHOTO_IMPORT_SOURCE_GET_PRIVATE (self);
#line 156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3828,11 +4292,13 @@ static void photo_import_source_instance_init (PhotoImportSource * self) {
self->priv->exif_md5 = NULL;
#line 159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->associated = NULL;
-#line 3831 "ImportPage.c"
+#line 4295 "ImportPage.c"
}
-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);
@@ -3846,11 +4312,13 @@ static void photo_import_source_finalize (GObject * obj) {
_g_object_unref0 (self->priv->associated);
#line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (photo_import_source_parent_class)->finalize (obj);
-#line 3849 "ImportPage.c"
+#line 4315 "ImportPage.c"
}
-GType photo_import_source_get_type (void) {
+GType
+photo_import_source_get_type (void)
+{
static volatile gsize photo_import_source_type_id__volatile = 0;
if (g_once_init_enter (&photo_import_source_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PhotoImportSourceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_import_source_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoImportSource), 0, (GInstanceInitFunc) photo_import_source_instance_init, NULL };
@@ -3862,110 +4330,99 @@ GType photo_import_source_get_type (void) {
}
-ImportPreview* import_preview_construct (GType object_type, ImportSource* source) {
+ImportPreview*
+import_preview_construct (GType object_type,
+ ImportSource* source)
+{
ImportPreview * self = NULL;
- ImportSource* _tmp0_;
- Dimensions _tmp1_ = {0};
- ImportSource* _tmp2_;
- gchar* _tmp3_;
- gchar* _tmp4_;
- ImportSource* _tmp5_;
+ Dimensions _tmp0_ = {0};
+ gchar* _tmp1_;
+ gchar* _tmp2_;
GdkPixbuf* pixbuf = NULL;
gboolean using_placeholder = FALSE;
- GdkPixbuf* _tmp14_;
- GdkPixbuf* _tmp15_;
- gboolean _tmp22_ = FALSE;
- GdkPixbuf* _tmp23_;
- gint _tmp24_;
- ImportSource* _tmp29_;
- GdkPixbuf* _tmp49_;
+ GdkPixbuf* _tmp10_;
+ GdkPixbuf* _tmp11_;
+ gboolean _tmp18_ = FALSE;
+ GdkPixbuf* _tmp19_;
+ GdkPixbuf* _tmp40_;
GError * _inner_error_ = NULL;
#line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_SOURCE (source), NULL);
#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = source;
-#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dimensions_init (&_tmp1_, 0, 0);
-#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = source;
+ dimensions_init (&_tmp0_, 0, 0);
#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
+ _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));
#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _tmp3_;
+ _tmp2_ = _tmp1_;
#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self = (ImportPreview*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp1_, _tmp4_, NULL, FALSE, PANGO_ALIGN_LEFT);
+ self = (ImportPreview*) media_source_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp0_, _tmp2_, NULL, FALSE, PANGO_ALIGN_LEFT);
#line 272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp2_);
#line 274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->duplicated_file);
#line 274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->duplicated_file = NULL;
#line 277 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = source;
-#line 277 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO_IMPORT_SOURCE)) {
#line 278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TRUE);
-#line 3909 "ImportPage.c"
+#line 4369 "ImportPage.c"
}
#line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
pixbuf = NULL;
-#line 3913 "ImportPage.c"
+#line 4373 "ImportPage.c"
{
- GdkPixbuf* _tmp6_ = NULL;
- ImportSource* _tmp7_;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_;
-#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = source;
+ GdkPixbuf* _tmp3_ = NULL;
+ GdkPixbuf* _tmp4_;
+ GdkPixbuf* _tmp5_;
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), 0, &_inner_error_);
+ _tmp4_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), 0, &_inner_error_);
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp8_;
+ _tmp3_ = _tmp4_;
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3927 "ImportPage.c"
+#line 4384 "ImportPage.c"
goto __catch72_g_error;
}
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp6_;
+ _tmp5_ = _tmp3_;
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = NULL;
+ _tmp3_ = NULL;
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (pixbuf);
#line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- pixbuf = _tmp9_;
+ pixbuf = _tmp5_;
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp6_);
-#line 3940 "ImportPage.c"
+ _g_object_unref0 (_tmp3_);
+#line 4397 "ImportPage.c"
}
goto __finally72;
__catch72_g_error:
{
GError* err = NULL;
- gchar* _tmp10_;
- gchar* _tmp11_;
- GError* _tmp12_;
- const gchar* _tmp13_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ GError* _tmp8_;
+ const gchar* _tmp9_;
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
+ _tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
#line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = err;
+ _tmp8_ = err;
#line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = _tmp12_->message;
+ _tmp9_ = _tmp8_->message;
#line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:285: Unable to fetch loaded import preview for %s: %s", _tmp11_, _tmp13_);
+ g_warning ("ImportPage.vala:285: Unable to fetch loaded import preview for %s: %s", _tmp7_, _tmp9_);
#line 285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp7_);
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 3968 "ImportPage.c"
+#line 4425 "ImportPage.c"
}
__finally72:
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3978,220 +4435,211 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return NULL;
-#line 3981 "ImportPage.c"
+#line 4438 "ImportPage.c"
}
#line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = pixbuf;
+ _tmp10_ = pixbuf;
#line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- using_placeholder = _tmp14_ == NULL;
+ using_placeholder = _tmp10_ == NULL;
#line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = pixbuf;
+ _tmp11_ = pixbuf;
#line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp15_ == NULL) {
-#line 3991 "ImportPage.c"
+ if (_tmp11_ == NULL) {
+#line 4448 "ImportPage.c"
+ GdkPixbuf* _tmp12_;
GdkPixbuf* _tmp16_;
- GdkPixbuf* _tmp20_;
- GdkPixbuf* _tmp21_;
+ GdkPixbuf* _tmp17_;
#line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = import_preview_placeholder_preview;
+ _tmp12_ = import_preview_placeholder_preview;
#line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp16_ == NULL) {
-#line 3999 "ImportPage.c"
- GdkPixbuf* _tmp17_;
- GdkPixbuf* _tmp18_;
- GdkPixbuf* _tmp19_;
+ if (_tmp12_ == NULL) {
+#line 4456 "ImportPage.c"
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
#line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = get_placeholder_pixbuf ();
+ _tmp13_ = get_placeholder_pixbuf ();
#line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_preview_placeholder_preview);
#line 292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_preview_placeholder_preview = _tmp17_;
+ import_preview_placeholder_preview = _tmp13_;
#line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = import_preview_placeholder_preview;
+ _tmp14_ = import_preview_placeholder_preview;
#line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = scale_pixbuf (_tmp18_, IMPORT_PREVIEW_MAX_SCALE, GDK_INTERP_BILINEAR, TRUE);
+ _tmp15_ = scale_pixbuf (_tmp14_, IMPORT_PREVIEW_MAX_SCALE, GDK_INTERP_BILINEAR, TRUE);
#line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_preview_placeholder_preview);
#line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_preview_placeholder_preview = _tmp19_;
-#line 4017 "ImportPage.c"
+ import_preview_placeholder_preview = _tmp15_;
+#line 4474 "ImportPage.c"
}
#line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = import_preview_placeholder_preview;
+ _tmp16_ = import_preview_placeholder_preview;
#line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = _g_object_ref0 (_tmp20_);
+ _tmp17_ = _g_object_ref0 (_tmp16_);
#line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (pixbuf);
#line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- pixbuf = _tmp21_;
-#line 4027 "ImportPage.c"
+ pixbuf = _tmp17_;
+#line 4484 "ImportPage.c"
}
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = pixbuf;
+ _tmp19_ = pixbuf;
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = gdk_pixbuf_get_width (_tmp23_);
+ if (gdk_pixbuf_get_width (_tmp19_) > IMPORT_PREVIEW_MAX_SCALE) {
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp24_ > IMPORT_PREVIEW_MAX_SCALE) {
-#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = TRUE;
-#line 4037 "ImportPage.c"
+ _tmp18_ = TRUE;
+#line 4492 "ImportPage.c"
} else {
- GdkPixbuf* _tmp25_;
- gint _tmp26_;
-#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = pixbuf;
+ GdkPixbuf* _tmp20_;
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = gdk_pixbuf_get_height (_tmp25_);
+ _tmp20_ = pixbuf;
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = _tmp26_ > IMPORT_PREVIEW_MAX_SCALE;
-#line 4047 "ImportPage.c"
+ _tmp18_ = gdk_pixbuf_get_height (_tmp20_) > IMPORT_PREVIEW_MAX_SCALE;
+#line 4499 "ImportPage.c"
}
#line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp22_) {
-#line 4051 "ImportPage.c"
- GdkPixbuf* _tmp27_;
- GdkPixbuf* _tmp28_;
+ if (_tmp18_) {
+#line 4503 "ImportPage.c"
+ GdkPixbuf* _tmp21_;
+ GdkPixbuf* _tmp22_;
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = pixbuf;
+ _tmp21_ = pixbuf;
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = scale_pixbuf (_tmp27_, IMPORT_PREVIEW_MAX_SCALE, PHOTO_IMPORT_SOURCE_INTERP, FALSE);
+ _tmp22_ = scale_pixbuf (_tmp21_, IMPORT_PREVIEW_MAX_SCALE, PHOTO_IMPORT_SOURCE_INTERP, FALSE);
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (pixbuf);
#line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- pixbuf = _tmp28_;
-#line 4062 "ImportPage.c"
+ pixbuf = _tmp22_;
+#line 4514 "ImportPage.c"
}
#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = source;
-#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 4068 "ImportPage.c"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 4518 "ImportPage.c"
PhotoImportSource* photo_import_source = NULL;
- ImportSource* _tmp30_;
- PhotoImportSource* _tmp31_;
- gboolean _tmp32_ = FALSE;
- gboolean _tmp33_;
- PhotoImportSource* _tmp43_;
- PhotoImportSource* _tmp44_;
- PhotoImportSource* _tmp45_;
- gboolean _tmp46_;
+ PhotoImportSource* _tmp23_;
+ gboolean _tmp24_ = FALSE;
+ gboolean _tmp25_;
+ PhotoImportSource* _tmp34_;
+ PhotoImportSource* _tmp35_;
+ PhotoImportSource* _tmp36_;
+ gboolean _tmp37_;
#line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = source;
+ _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) source) : NULL);
#line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp30_) : NULL);
-#line 306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source = _tmp31_;
+ photo_import_source = _tmp23_;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = using_placeholder;
+ _tmp25_ = using_placeholder;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp33_) {
-#line 4088 "ImportPage.c"
- PhotoImportSource* _tmp34_;
- PhotoMetadata* _tmp35_;
- PhotoMetadata* _tmp36_;
+ if (!_tmp25_) {
+#line 4535 "ImportPage.c"
+ PhotoImportSource* _tmp26_;
+ PhotoMetadata* _tmp27_;
+ PhotoMetadata* _tmp28_;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = photo_import_source;
+ _tmp26_ = photo_import_source;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = photo_import_source_get_metadata (_tmp34_);
+ _tmp27_ = photo_import_source_get_metadata (_tmp26_);
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp28_ = _tmp27_;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = _tmp36_ != NULL;
+ _tmp24_ = _tmp28_ != NULL;
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _media_metadata_unref0 (_tmp36_);
-#line 4102 "ImportPage.c"
+ _media_metadata_unref0 (_tmp28_);
+#line 4549 "ImportPage.c"
} else {
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = FALSE;
-#line 4106 "ImportPage.c"
+ _tmp24_ = FALSE;
+#line 4553 "ImportPage.c"
}
#line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp32_) {
-#line 4110 "ImportPage.c"
- 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;
+ if (_tmp24_) {
+#line 4557 "ImportPage.c"
+ PhotoImportSource* _tmp29_;
+ PhotoMetadata* _tmp30_;
+ PhotoMetadata* _tmp31_;
+ GdkPixbuf* _tmp32_;
+ GdkPixbuf* _tmp33_;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = photo_import_source_get_metadata (_tmp37_);
+ _tmp29_ = photo_import_source;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = _tmp38_;
+ _tmp30_ = photo_import_source_get_metadata (_tmp29_);
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = photo_metadata_get_orientation (_tmp39_);
+ _tmp31_ = _tmp30_;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = pixbuf;
+ _tmp32_ = pixbuf;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = orientation_rotate_pixbuf (_tmp40_, _tmp41_);
+ _tmp33_ = orientation_rotate_pixbuf (photo_metadata_get_orientation (_tmp31_), _tmp32_);
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (pixbuf);
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- pixbuf = _tmp42_;
+ pixbuf = _tmp33_;
#line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _media_metadata_unref0 (_tmp39_);
-#line 4135 "ImportPage.c"
+ _media_metadata_unref0 (_tmp31_);
+#line 4579 "ImportPage.c"
}
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = photo_import_source;
+ _tmp34_ = photo_import_source;
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = photo_import_source_get_associated (_tmp43_);
+ _tmp35_ = photo_import_source_get_associated (_tmp34_);
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = _tmp44_;
+ _tmp36_ = _tmp35_;
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = _tmp45_ != NULL;
+ _tmp37_ = _tmp36_ != NULL;
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp45_);
+ _g_object_unref0 (_tmp36_);
#line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp46_) {
-#line 4149 "ImportPage.c"
- gchar* _tmp47_;
- gchar* _tmp48_;
+ if (_tmp37_) {
+#line 4593 "ImportPage.c"
+ gchar* _tmp38_;
+ gchar* _tmp39_;
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = g_strdup_printf ("<small>%s</small>", _ ("RAW+JPEG"));
+ _tmp38_ = g_strdup_printf ("<small>%s</small>", _ ("RAW+JPEG"));
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = _tmp47_;
+ _tmp39_ = _tmp38_;
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp48_, TRUE, PANGO_ALIGN_LEFT);
+ checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp39_, TRUE, PANGO_ALIGN_LEFT);
#line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp48_);
-#line 4160 "ImportPage.c"
+ _g_free0 (_tmp39_);
+#line 4604 "ImportPage.c"
}
#line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo_import_source);
-#line 4164 "ImportPage.c"
+#line 4608 "ImportPage.c"
}
#line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = pixbuf;
+ _tmp40_ = 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), _tmp49_);
+ checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp40_);
#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 4174 "ImportPage.c"
+#line 4618 "ImportPage.c"
}
-ImportPreview* import_preview_new (ImportSource* source) {
+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 4181 "ImportPage.c"
+#line 4627 "ImportPage.c"
}
-gboolean import_preview_is_already_imported (ImportPreview* self) {
+gboolean
+import_preview_is_already_imported (ImportPreview* self)
+{
gboolean result = FALSE;
PhotoImportSource* photo_import_source = NULL;
ImportSource* _tmp0_;
PhotoImportSource* _tmp1_;
PhotoImportSource* _tmp2_;
VideoImportSource* video_import_source = NULL;
- ImportSource* _tmp49_;
- VideoImportSource* _tmp50_;
- VideoImportSource* _tmp51_;
+ ImportSource* _tmp42_;
+ VideoImportSource* _tmp43_;
+ VideoImportSource* _tmp44_;
#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"
@@ -4202,7 +4650,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 4205 "ImportPage.c"
+#line 4653 "ImportPage.c"
}
#line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
photo_import_source = _tmp1_;
@@ -4210,17 +4658,15 @@ 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 4213 "ImportPage.c"
+#line 4661 "ImportPage.c"
gchar* preview_md5 = NULL;
PhotoImportSource* _tmp3_;
gchar* _tmp4_;
PhotoFileFormat file_format = 0;
PhotoImportSource* _tmp5_;
- PhotoFileFormat _tmp6_;
- gboolean _tmp7_ = FALSE;
- const gchar* _tmp8_;
- gboolean _tmp9_;
- PhotoFileFormat _tmp17_;
+ gboolean _tmp6_ = FALSE;
+ const gchar* _tmp7_;
+ PhotoFileFormat _tmp14_;
#line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = photo_import_source;
#line 321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4230,52 +4676,45 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
#line 322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = photo_import_source;
#line 322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = photo_import_source_get_file_format (_tmp5_);
-#line 322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- file_format = _tmp6_;
-#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = preview_md5;
+ file_format = photo_import_source_get_file_format (_tmp5_);
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = is_string_empty (_tmp8_);
+ _tmp7_ = preview_md5;
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp9_) {
-#line 4242 "ImportPage.c"
- const gchar* _tmp10_;
- PhotoFileFormat _tmp11_;
- gboolean _tmp12_;
+ if (!is_string_empty (_tmp7_)) {
+#line 4684 "ImportPage.c"
+ const gchar* _tmp8_;
+ PhotoFileFormat _tmp9_;
#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = preview_md5;
-#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = file_format;
+ _tmp8_ = preview_md5;
#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = library_photo_has_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_);
+ _tmp9_ = file_format;
#line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp12_;
-#line 4254 "ImportPage.c"
+ _tmp6_ = library_photo_has_nontrash_duplicate (NULL, _tmp8_, NULL, _tmp9_);
+#line 4693 "ImportPage.c"
} else {
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = FALSE;
-#line 4258 "ImportPage.c"
+ _tmp6_ = FALSE;
+#line 4697 "ImportPage.c"
}
#line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp7_) {
-#line 4262 "ImportPage.c"
- const gchar* _tmp13_;
- PhotoFileFormat _tmp14_;
- PhotoID _tmp15_ = {0};
- DuplicatedFile* _tmp16_;
+ if (_tmp6_) {
+#line 4701 "ImportPage.c"
+ const gchar* _tmp10_;
+ PhotoFileFormat _tmp11_;
+ PhotoID _tmp12_ = {0};
+ DuplicatedFile* _tmp13_;
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = preview_md5;
+ _tmp10_ = preview_md5;
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = file_format;
+ _tmp11_ = file_format;
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_photo_get_nontrash_duplicate (NULL, _tmp13_, NULL, _tmp14_, &_tmp15_);
+ library_photo_get_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_, &_tmp12_);
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = duplicated_file_create_from_photo_id (&_tmp15_);
+ _tmp13_ = duplicated_file_create_from_photo_id (&_tmp12_);
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->duplicated_file);
#line 328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->duplicated_file = _tmp16_;
+ self->priv->duplicated_file = _tmp13_;
#line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
#line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4284,144 +4723,132 @@ 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 4287 "ImportPage.c"
+#line 4726 "ImportPage.c"
}
#line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = file_format;
+ _tmp14_ = file_format;
#line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4293 "ImportPage.c"
+ if (_tmp14_ == PHOTO_FILE_FORMAT_RAW) {
+#line 4732 "ImportPage.c"
guint64 filesize = 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);
+ ImportSource* _tmp15_;
+ ImportSource* _tmp16_;
+ guint64 _tmp17_;
+ guint64 _tmp18_;
#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp15_ = import_preview_get_import_source (self);
#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = import_source_get_filesize (_tmp19_);
+ _tmp16_ = _tmp15_;
#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = (guint64) _tmp20_;
+ _tmp17_ = (guint64) import_source_get_filesize (_tmp16_);
#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp19_);
+ _g_object_unref0 (_tmp16_);
#line 338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- filesize = _tmp21_;
+ filesize = _tmp17_;
#line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = filesize;
+ _tmp18_ = filesize;
#line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp22_ <= ((guint64) G_MAXINT64)) {
-#line 4316 "ImportPage.c"
+ if (_tmp18_ <= ((guint64) G_MAXINT64)) {
+#line 4752 "ImportPage.c"
PhotoID duplicated_photo_id = {0};
- LibraryPhotoSourceCollection* _tmp23_;
- ImportSource* _tmp24_;
- ImportSource* _tmp25_;
- gchar* _tmp26_;
- gchar* _tmp27_;
- guint64 _tmp28_;
- PhotoID _tmp29_ = {0};
- PhotoID _tmp30_;
- gboolean _tmp31_;
+ LibraryPhotoSourceCollection* _tmp19_;
+ ImportSource* _tmp20_;
+ ImportSource* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
+ guint64 _tmp24_;
+ PhotoID _tmp25_ = {0};
+ PhotoID _tmp26_;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = library_photo_global;
+ _tmp19_ = library_photo_global;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = import_preview_get_import_source (self);
+ _tmp20_ = import_preview_get_import_source (self);
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = _tmp24_;
+ _tmp21_ = _tmp20_;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = import_source_get_filename (_tmp25_);
+ _tmp22_ = import_source_get_filename (_tmp21_);
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = _tmp26_;
+ _tmp23_ = _tmp22_;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = filesize;
+ _tmp24_ = filesize;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_photo_source_collection_get_basename_filesize_duplicate (_tmp23_, _tmp27_, (gint64) _tmp28_, &_tmp29_);
+ library_photo_source_collection_get_basename_filesize_duplicate (_tmp19_, _tmp23_, (gint64) _tmp24_, &_tmp25_);
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = _tmp29_;
+ _tmp26_ = _tmp25_;
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp27_);
+ _g_free0 (_tmp23_);
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp25_);
+ _g_object_unref0 (_tmp21_);
#line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- duplicated_photo_id = _tmp30_;
+ duplicated_photo_id = _tmp26_;
#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = photo_id_is_valid (&duplicated_photo_id);
-#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp31_) {
-#line 4353 "ImportPage.c"
+ if (photo_id_is_valid (&duplicated_photo_id)) {
+#line 4786 "ImportPage.c"
LibraryPhoto* duplicated_photo = NULL;
- LibraryPhotoSourceCollection* _tmp32_;
- PhotoID _tmp33_;
- LibraryPhoto* _tmp34_;
+ LibraryPhotoSourceCollection* _tmp27_;
+ PhotoID _tmp28_;
+ LibraryPhoto* _tmp29_;
time_t photo_exposure_time = 0;
- PhotoImportSource* _tmp35_;
- time_t _tmp36_;
+ PhotoImportSource* _tmp30_;
time_t duplicated_photo_exposure_time = 0;
- LibraryPhoto* _tmp37_;
- time_t _tmp38_;
- time_t _tmp39_;
- time_t _tmp40_;
+ LibraryPhoto* _tmp31_;
+ time_t _tmp32_;
+ time_t _tmp33_;
#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = library_photo_global;
+ _tmp27_ = library_photo_global;
#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = duplicated_photo_id;
+ _tmp28_ = duplicated_photo_id;
#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = library_photo_source_collection_fetch (_tmp32_, &_tmp33_);
+ _tmp29_ = library_photo_source_collection_fetch (_tmp27_, &_tmp28_);
#line 346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- duplicated_photo = _tmp34_;
+ duplicated_photo = _tmp29_;
#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = photo_import_source;
+ _tmp30_ = photo_import_source;
#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_exposure_time = _tmp36_;
-#line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = duplicated_photo;
+ photo_exposure_time = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_IMPORT_SOURCE, ImportSource));
#line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp31_ = duplicated_photo;
#line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- duplicated_photo_exposure_time = _tmp38_;
+ duplicated_photo_exposure_time = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE, MediaSource));
#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = photo_exposure_time;
+ _tmp32_ = photo_exposure_time;
#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = duplicated_photo_exposure_time;
+ _tmp33_ = duplicated_photo_exposure_time;
#line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp39_ == _tmp40_) {
-#line 4392 "ImportPage.c"
- LibraryPhotoSourceCollection* _tmp41_;
- ImportSource* _tmp42_;
- ImportSource* _tmp43_;
- gchar* _tmp44_;
- gchar* _tmp45_;
- guint64 _tmp46_;
- PhotoID _tmp47_ = {0};
- DuplicatedFile* _tmp48_;
+ if (_tmp32_ == _tmp33_) {
+#line 4819 "ImportPage.c"
+ LibraryPhotoSourceCollection* _tmp34_;
+ ImportSource* _tmp35_;
+ ImportSource* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ guint64 _tmp39_;
+ PhotoID _tmp40_ = {0};
+ DuplicatedFile* _tmp41_;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = library_photo_global;
+ _tmp34_ = library_photo_global;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_preview_get_import_source (self);
+ _tmp35_ = import_preview_get_import_source (self);
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = _tmp42_;
+ _tmp36_ = _tmp35_;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = import_source_get_filename (_tmp43_);
+ _tmp37_ = import_source_get_filename (_tmp36_);
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = _tmp44_;
+ _tmp38_ = _tmp37_;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = filesize;
+ _tmp39_ = filesize;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_photo_source_collection_get_basename_filesize_duplicate (_tmp41_, _tmp45_, (gint64) _tmp46_, &_tmp47_);
+ library_photo_source_collection_get_basename_filesize_duplicate (_tmp34_, _tmp38_, (gint64) _tmp39_, &_tmp40_);
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = duplicated_file_create_from_photo_id (&_tmp47_);
+ _tmp41_ = duplicated_file_create_from_photo_id (&_tmp40_);
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->duplicated_file);
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->duplicated_file = _tmp48_;
+ self->priv->duplicated_file = _tmp41_;
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp45_);
+ _g_free0 (_tmp38_);
#line 351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp43_);
+ _g_object_unref0 (_tmp36_);
#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
#line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4432,11 +4859,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 4435 "ImportPage.c"
+#line 4862 "ImportPage.c"
}
#line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (duplicated_photo);
-#line 4439 "ImportPage.c"
+#line 4866 "ImportPage.c"
}
}
}
@@ -4448,84 +4875,75 @@ 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 4451 "ImportPage.c"
+#line 4878 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = import_preview_get_import_source (self);
+ _tmp42_ = import_preview_get_import_source (self);
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp49_) : NULL;
+ _tmp43_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp42_) : NULL;
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp50_ == NULL) {
+ if (_tmp43_ == NULL) {
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp49_);
-#line 4461 "ImportPage.c"
+ _g_object_unref0 (_tmp42_);
+#line 4888 "ImportPage.c"
}
#line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- video_import_source = _tmp50_;
+ video_import_source = _tmp43_;
#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = video_import_source;
+ _tmp44_ = video_import_source;
#line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp51_ != NULL) {
-#line 4469 "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"
- _tmp53_ = video_import_source;
+ if (_tmp44_ != NULL) {
+#line 4896 "ImportPage.c"
+ VideoSourceCollection* _tmp45_;
+ VideoImportSource* _tmp46_;
+ gchar* _tmp47_;
+ gchar* _tmp48_;
+ VideoImportSource* _tmp49_;
+ gboolean _tmp50_;
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp45_ = video_global;
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = _tmp54_;
+ _tmp46_ = video_import_source;
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = video_import_source;
+ _tmp47_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_IMPORT_SOURCE, ImportSource));
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp48_ = _tmp47_;
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = video_source_collection_has_basename_filesize_duplicate (_tmp52_, _tmp55_, (guint64) _tmp57_);
+ _tmp49_ = video_import_source;
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = _tmp58_;
+ _tmp50_ = video_source_collection_has_basename_filesize_duplicate (_tmp45_, _tmp48_, (guint64) import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource)));
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp55_);
+ _g_free0 (_tmp48_);
#line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp59_) {
-#line 4498 "ImportPage.c"
- VideoSourceCollection* _tmp60_;
- VideoImportSource* _tmp61_;
- gchar* _tmp62_;
- gchar* _tmp63_;
- VideoImportSource* _tmp64_;
- gulong _tmp65_;
- VideoID _tmp66_ = {0};
- DuplicatedFile* _tmp67_;
-#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = video_global;
+ if (_tmp50_) {
+#line 4919 "ImportPage.c"
+ VideoSourceCollection* _tmp51_;
+ VideoImportSource* _tmp52_;
+ gchar* _tmp53_;
+ gchar* _tmp54_;
+ VideoImportSource* _tmp55_;
+ VideoID _tmp56_ = {0};
+ DuplicatedFile* _tmp57_;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = video_import_source;
+ _tmp51_ = video_global;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp52_ = video_import_source;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = _tmp62_;
+ _tmp53_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_IMPORT_SOURCE, ImportSource));
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = video_import_source;
+ _tmp54_ = _tmp53_;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp55_ = video_import_source;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- video_source_collection_get_basename_filesize_duplicate (_tmp60_, _tmp63_, (guint64) _tmp65_, &_tmp66_);
+ video_source_collection_get_basename_filesize_duplicate (_tmp51_, _tmp54_, (guint64) import_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource)), &_tmp56_);
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = duplicated_file_create_from_video_id (&_tmp66_);
+ _tmp57_ = duplicated_file_create_from_video_id (&_tmp56_);
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->duplicated_file);
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->duplicated_file = _tmp67_;
+ self->priv->duplicated_file = _tmp57_;
#line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp63_);
+ _g_free0 (_tmp54_);
#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
#line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4534,7 +4952,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 4537 "ImportPage.c"
+#line 4955 "ImportPage.c"
}
#line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4544,7 +4962,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 4547 "ImportPage.c"
+#line 4965 "ImportPage.c"
}
#line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
@@ -4554,40 +4972,41 @@ 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 4557 "ImportPage.c"
+#line 4975 "ImportPage.c"
}
-DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
+DuplicatedFile*
+import_preview_get_duplicated_file (ImportPreview* self)
+{
DuplicatedFile* result = NULL;
- gboolean _tmp0_;
+ DuplicatedFile* _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"
- _tmp0_ = import_preview_is_already_imported (self);
-#line 388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp0_) {
+ if (!import_preview_is_already_imported (self)) {
#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
#line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4576 "ImportPage.c"
+#line 4993 "ImportPage.c"
}
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = self->priv->duplicated_file;
+ _tmp0_ = self->priv->duplicated_file;
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp1_ = _g_object_ref0 (_tmp0_);
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 4586 "ImportPage.c"
+#line 5003 "ImportPage.c"
}
-ImportSource* import_preview_get_import_source (ImportPreview* self) {
+ImportSource*
+import_preview_get_import_source (ImportPreview* self)
+{
ImportSource* result = NULL;
DataSource* _tmp0_;
#line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4598,29 +5017,35 @@ 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 4601 "ImportPage.c"
+#line 5020 "ImportPage.c"
}
-static void import_preview_class_init (ImportPreviewClass * klass) {
+static void
+import_preview_class_init (ImportPreviewClass * klass)
+{
#line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_preview_parent_class = g_type_class_peek_parent (klass);
#line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
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 4612 "ImportPage.c"
+#line 5033 "ImportPage.c"
}
-static void import_preview_instance_init (ImportPreview * self) {
+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 4619 "ImportPage.c"
+#line 5042 "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);
@@ -4628,11 +5053,13 @@ 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 4631 "ImportPage.c"
+#line 5056 "ImportPage.c"
}
-GType import_preview_get_type (void) {
+GType
+import_preview_get_type (void)
+{
static volatile gsize import_preview_type_id__volatile = 0;
if (g_once_init_enter (&import_preview_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportPreviewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_preview_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPreview), 0, (GInstanceInitFunc) import_preview_instance_init, NULL };
@@ -4644,49 +5071,55 @@ GType import_preview_get_type (void) {
}
-CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollection* collection) {
+CameraViewTracker*
+camera_view_tracker_construct (GType object_type,
+ ViewCollection* collection)
+{
CameraViewTracker* self = NULL;
- ViewCollection* _tmp0_;
+ CameraAccumulator* _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"
- _tmp0_ = collection;
-#line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self = (CameraViewTracker*) core_view_tracker_construct (object_type, _tmp0_);
+ self = (CameraViewTracker*) core_view_tracker_construct (object_type, collection);
#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = self->all;
+ _tmp0_ = self->all;
#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = self->visible;
+ _tmp1_ = self->visible;
#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = self->selected;
+ _tmp2_ = self->selected;
#line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- 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));
+ core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
#line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 4669 "ImportPage.c"
+#line 5096 "ImportPage.c"
}
-CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) {
+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 4676 "ImportPage.c"
+#line 5105 "ImportPage.c"
}
-static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) {
+static void
+camera_view_tracker_class_init (CameraViewTrackerClass * klass)
+{
#line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
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 4685 "ImportPage.c"
+#line 5116 "ImportPage.c"
}
-static void camera_view_tracker_instance_init (CameraViewTracker * self) {
+static void
+camera_view_tracker_instance_init (CameraViewTracker * self)
+{
CameraAccumulator* _tmp0_;
CameraAccumulator* _tmp1_;
CameraAccumulator* _tmp2_;
@@ -4702,11 +5135,13 @@ 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 4705 "ImportPage.c"
+#line 5138 "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);
@@ -4718,11 +5153,13 @@ 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 4721 "ImportPage.c"
+#line 5156 "ImportPage.c"
}
-GType camera_view_tracker_get_type (void) {
+GType
+camera_view_tracker_get_type (void)
+{
static volatile gsize camera_view_tracker_type_id__volatile = 0;
if (g_once_init_enter (&camera_view_tracker_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CameraViewTrackerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_view_tracker_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraViewTracker), 0, (GInstanceInitFunc) camera_view_tracker_instance_init, NULL };
@@ -4734,110 +5171,104 @@ GType camera_view_tracker_get_type (void) {
}
-static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, DataObject* object) {
+static gboolean
+camera_accumulator_real_include (CoreTrackerAccumulator* base,
+ DataObject* object)
+{
CameraAccumulator * self;
gboolean result = FALSE;
ImportSource* source = NULL;
- DataObject* _tmp0_;
- DataSource* _tmp1_;
- gint _tmp2_;
+ DataSource* _tmp0_;
+ gint _tmp1_;
PhotoImportSource* photo = NULL;
- ImportSource* _tmp3_;
- PhotoImportSource* _tmp4_;
- gboolean _tmp5_ = FALSE;
- PhotoImportSource* _tmp6_;
+ ImportSource* _tmp2_;
+ PhotoImportSource* _tmp3_;
+ gboolean _tmp4_ = FALSE;
+ PhotoImportSource* _tmp5_;
#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"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = object;
+ _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource);
+ source = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource);
#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = self->priv->_total;
+ _tmp1_ = self->priv->_total;
#line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_total (self, _tmp2_ + 1);
+ camera_accumulator_set_total (self, _tmp1_ + 1);
#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = source;
+ _tmp2_ = source;
#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL);
+ _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp2_) : NULL);
#line 422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo = _tmp4_;
-#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = photo;
+ photo = _tmp3_;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp6_ != NULL) {
-#line 4773 "ImportPage.c"
- PhotoImportSource* _tmp7_;
- PhotoFileFormat _tmp8_;
+ _tmp5_ = photo;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = photo;
+ if (_tmp5_ != NULL) {
+#line 5210 "ImportPage.c"
+ PhotoImportSource* _tmp6_;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = photo_import_source_get_file_format (_tmp7_);
+ _tmp6_ = photo;
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4782 "ImportPage.c"
+ _tmp4_ = photo_import_source_get_file_format (_tmp6_) != PHOTO_FILE_FORMAT_RAW;
+#line 5216 "ImportPage.c"
} else {
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = FALSE;
-#line 4786 "ImportPage.c"
+ _tmp4_ = FALSE;
+#line 5220 "ImportPage.c"
}
#line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp5_) {
-#line 4790 "ImportPage.c"
- gint _tmp9_;
+ if (_tmp4_) {
+#line 5224 "ImportPage.c"
+ gint _tmp7_;
#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = self->priv->_photos;
+ _tmp7_ = self->priv->_photos;
#line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_photos (self, _tmp9_ + 1);
-#line 4796 "ImportPage.c"
+ camera_accumulator_set_photos (self, _tmp7_ + 1);
+#line 5230 "ImportPage.c"
} else {
- gboolean _tmp10_ = FALSE;
- PhotoImportSource* _tmp11_;
-#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = photo;
+ gboolean _tmp8_ = FALSE;
+ PhotoImportSource* _tmp9_;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp11_ != NULL) {
-#line 4804 "ImportPage.c"
- PhotoImportSource* _tmp12_;
- PhotoFileFormat _tmp13_;
+ _tmp9_ = photo;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = photo;
+ if (_tmp9_ != NULL) {
+#line 5238 "ImportPage.c"
+ PhotoImportSource* _tmp10_;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = photo_import_source_get_file_format (_tmp12_);
+ _tmp10_ = photo;
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 4813 "ImportPage.c"
+ _tmp8_ = photo_import_source_get_file_format (_tmp10_) == PHOTO_FILE_FORMAT_RAW;
+#line 5244 "ImportPage.c"
} else {
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = FALSE;
-#line 4817 "ImportPage.c"
+ _tmp8_ = FALSE;
+#line 5248 "ImportPage.c"
}
#line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp10_) {
-#line 4821 "ImportPage.c"
- gint _tmp14_;
+ if (_tmp8_) {
+#line 5252 "ImportPage.c"
+ gint _tmp11_;
#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = self->priv->_raw;
+ _tmp11_ = self->priv->_raw;
#line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_raw (self, _tmp14_ + 1);
-#line 4827 "ImportPage.c"
+ camera_accumulator_set_raw (self, _tmp11_ + 1);
+#line 5258 "ImportPage.c"
} else {
- ImportSource* _tmp15_;
+ ImportSource* _tmp12_;
#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = source;
+ _tmp12_ = source;
#line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4834 "ImportPage.c"
- gint _tmp16_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 5265 "ImportPage.c"
+ gint _tmp13_;
#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = self->priv->_videos;
+ _tmp13_ = self->priv->_videos;
#line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_videos (self, _tmp16_ + 1);
-#line 4840 "ImportPage.c"
+ camera_accumulator_set_videos (self, _tmp13_ + 1);
+#line 5271 "ImportPage.c"
}
}
}
@@ -4849,129 +5280,123 @@ 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 4852 "ImportPage.c"
+#line 5283 "ImportPage.c"
}
-static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base, DataObject* object) {
+static gboolean
+camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
+ DataObject* object)
+{
CameraAccumulator * self;
gboolean result = FALSE;
ImportSource* source = NULL;
- DataObject* _tmp0_;
- DataSource* _tmp1_;
- gint _tmp2_;
+ DataSource* _tmp0_;
+ gint _tmp1_;
PhotoImportSource* photo = NULL;
- ImportSource* _tmp3_;
- PhotoImportSource* _tmp4_;
- gboolean _tmp5_ = FALSE;
- PhotoImportSource* _tmp6_;
+ ImportSource* _tmp2_;
+ PhotoImportSource* _tmp3_;
+ gboolean _tmp4_ = FALSE;
+ PhotoImportSource* _tmp5_;
#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"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = object;
+ _tmp0_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_DATA_VIEW, DataView));
#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- source = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_IMPORT_SOURCE, ImportSource);
+ source = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource);
#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = self->priv->_total;
+ _tmp1_ = self->priv->_total;
#line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_total (self, _tmp2_ + 1);
+ camera_accumulator_set_total (self, _tmp1_ + 1);
#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = source;
+ _tmp2_ = source;
#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp3_) : NULL);
+ _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp2_) : NULL);
#line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo = _tmp4_;
-#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = photo;
+ photo = _tmp3_;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp6_ != NULL) {
-#line 4892 "ImportPage.c"
- PhotoImportSource* _tmp7_;
- PhotoFileFormat _tmp8_;
+ _tmp5_ = photo;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = photo;
+ if (_tmp5_ != NULL) {
+#line 5323 "ImportPage.c"
+ PhotoImportSource* _tmp6_;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = photo_import_source_get_file_format (_tmp7_);
+ _tmp6_ = photo;
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4901 "ImportPage.c"
+ _tmp4_ = photo_import_source_get_file_format (_tmp6_) != PHOTO_FILE_FORMAT_RAW;
+#line 5329 "ImportPage.c"
} else {
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = FALSE;
-#line 4905 "ImportPage.c"
+ _tmp4_ = FALSE;
+#line 5333 "ImportPage.c"
}
#line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp5_) {
-#line 4909 "ImportPage.c"
- gint _tmp9_;
- gint _tmp10_;
+ if (_tmp4_) {
+#line 5337 "ImportPage.c"
+ gint _tmp7_;
+ gint _tmp8_;
#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = self->priv->_photos;
+ _tmp7_ = self->priv->_photos;
#line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _vala_assert (_tmp9_ > 0, "photos > 0");
+ _vala_assert (_tmp7_ > 0, "photos > 0");
#line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = self->priv->_photos;
+ _tmp8_ = self->priv->_photos;
#line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_photos (self, _tmp10_ - 1);
-#line 4920 "ImportPage.c"
+ camera_accumulator_set_photos (self, _tmp8_ - 1);
+#line 5348 "ImportPage.c"
} else {
- gboolean _tmp11_ = FALSE;
- PhotoImportSource* _tmp12_;
-#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = photo;
+ gboolean _tmp9_ = FALSE;
+ PhotoImportSource* _tmp10_;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp12_ != NULL) {
-#line 4928 "ImportPage.c"
- PhotoImportSource* _tmp13_;
- PhotoFileFormat _tmp14_;
+ _tmp10_ = photo;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = photo;
+ if (_tmp10_ != NULL) {
+#line 5356 "ImportPage.c"
+ PhotoImportSource* _tmp11_;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = photo_import_source_get_file_format (_tmp13_);
+ _tmp11_ = photo;
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW;
-#line 4937 "ImportPage.c"
+ _tmp9_ = photo_import_source_get_file_format (_tmp11_) == PHOTO_FILE_FORMAT_RAW;
+#line 5362 "ImportPage.c"
} else {
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = FALSE;
-#line 4941 "ImportPage.c"
+ _tmp9_ = FALSE;
+#line 5366 "ImportPage.c"
}
#line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp11_) {
-#line 4945 "ImportPage.c"
- gint _tmp15_;
- gint _tmp16_;
+ if (_tmp9_) {
+#line 5370 "ImportPage.c"
+ gint _tmp12_;
+ gint _tmp13_;
#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = self->priv->_raw;
+ _tmp12_ = self->priv->_raw;
#line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _vala_assert (_tmp15_ > 0, "raw > 0");
+ _vala_assert (_tmp12_ > 0, "raw > 0");
#line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = self->priv->_raw;
+ _tmp13_ = self->priv->_raw;
#line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_raw (self, _tmp16_ - 1);
-#line 4956 "ImportPage.c"
+ camera_accumulator_set_raw (self, _tmp13_ - 1);
+#line 5381 "ImportPage.c"
} else {
- ImportSource* _tmp17_;
+ ImportSource* _tmp14_;
#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = source;
+ _tmp14_ = source;
#line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4963 "ImportPage.c"
- gint _tmp18_;
- gint _tmp19_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 5388 "ImportPage.c"
+ gint _tmp15_;
+ gint _tmp16_;
#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = self->priv->_videos;
+ _tmp15_ = self->priv->_videos;
#line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _vala_assert (_tmp18_ > 0, "videos > 0");
+ _vala_assert (_tmp15_ > 0, "videos > 0");
#line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = self->priv->_videos;
+ _tmp16_ = self->priv->_videos;
#line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- camera_accumulator_set_videos (self, _tmp19_ - 1);
-#line 4974 "ImportPage.c"
+ camera_accumulator_set_videos (self, _tmp16_ - 1);
+#line 5399 "ImportPage.c"
}
}
}
@@ -4983,11 +5408,15 @@ 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 4986 "ImportPage.c"
+#line 5411 "ImportPage.c"
}
-static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, DataObject* object, Alteration* alteration) {
+static gboolean
+camera_accumulator_real_altered (CoreTrackerAccumulator* base,
+ DataObject* object,
+ Alteration* alteration)
+{
CameraAccumulator * self;
gboolean result = FALSE;
#line 455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5000,11 +5429,13 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D
result = FALSE;
#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5003 "ImportPage.c"
+#line 5432 "ImportPage.c"
}
-gchar* camera_accumulator_to_string (CameraAccumulator* self) {
+gchar*
+camera_accumulator_to_string (CameraAccumulator* self)
+{
gchar* result = NULL;
gint _tmp0_;
gint _tmp1_;
@@ -5027,28 +5458,34 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
result = _tmp4_;
#line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5030 "ImportPage.c"
+#line 5461 "ImportPage.c"
}
-CameraAccumulator* camera_accumulator_construct (GType object_type) {
+CameraAccumulator*
+camera_accumulator_construct (GType object_type)
+{
CameraAccumulator * self = NULL;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (CameraAccumulator*) g_object_new (object_type, NULL);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 5040 "ImportPage.c"
+#line 5473 "ImportPage.c"
}
-CameraAccumulator* camera_accumulator_new (void) {
+CameraAccumulator*
+camera_accumulator_new (void)
+{
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR);
-#line 5047 "ImportPage.c"
+#line 5482 "ImportPage.c"
}
-gint camera_accumulator_get_total (CameraAccumulator* self) {
+gint
+camera_accumulator_get_total (CameraAccumulator* self)
+{
gint result;
gint _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5059,29 +5496,30 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
result = _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5062 "ImportPage.c"
+#line 5499 "ImportPage.c"
}
-static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
+static void
+camera_accumulator_set_total (CameraAccumulator* self,
+ gint value)
+{
#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"
if (camera_accumulator_get_total (self) != value) {
-#line 5071 "ImportPage.c"
- gint _tmp0_;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
+ self->priv->_total = value;
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_total = _tmp0_;
-#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "total");
-#line 5079 "ImportPage.c"
+ g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_TOTAL_PROPERTY]);
+#line 5515 "ImportPage.c"
}
}
-gint camera_accumulator_get_photos (CameraAccumulator* self) {
+gint
+camera_accumulator_get_photos (CameraAccumulator* self)
+{
gint result;
gint _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5092,29 +5530,30 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
result = _tmp0_;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5095 "ImportPage.c"
+#line 5533 "ImportPage.c"
}
-static void camera_accumulator_set_photos (CameraAccumulator* self, gint value) {
+static void
+camera_accumulator_set_photos (CameraAccumulator* self,
+ gint value)
+{
#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"
if (camera_accumulator_get_photos (self) != value) {
-#line 5104 "ImportPage.c"
- gint _tmp0_;
-#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_photos = _tmp0_;
+ self->priv->_photos = value;
#line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "photos");
-#line 5112 "ImportPage.c"
+ g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_PHOTOS_PROPERTY]);
+#line 5549 "ImportPage.c"
}
}
-gint camera_accumulator_get_videos (CameraAccumulator* self) {
+gint
+camera_accumulator_get_videos (CameraAccumulator* self)
+{
gint result;
gint _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5125,29 +5564,30 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
result = _tmp0_;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5128 "ImportPage.c"
+#line 5567 "ImportPage.c"
}
-static void camera_accumulator_set_videos (CameraAccumulator* self, gint value) {
+static void
+camera_accumulator_set_videos (CameraAccumulator* self,
+ gint value)
+{
#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"
if (camera_accumulator_get_videos (self) != value) {
-#line 5137 "ImportPage.c"
- gint _tmp0_;
-#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_videos = _tmp0_;
+ self->priv->_videos = value;
#line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "videos");
-#line 5145 "ImportPage.c"
+ g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_VIDEOS_PROPERTY]);
+#line 5583 "ImportPage.c"
}
}
-gint camera_accumulator_get_raw (CameraAccumulator* self) {
+gint
+camera_accumulator_get_raw (CameraAccumulator* self)
+{
gint result;
gint _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5158,29 +5598,30 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
result = _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5161 "ImportPage.c"
+#line 5601 "ImportPage.c"
}
-static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
+static void
+camera_accumulator_set_raw (CameraAccumulator* self,
+ gint value)
+{
#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"
if (camera_accumulator_get_raw (self) != value) {
-#line 5170 "ImportPage.c"
- gint _tmp0_;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
+ self->priv->_raw = value;
#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->_raw = _tmp0_;
-#line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_notify ((GObject *) self, "raw");
-#line 5178 "ImportPage.c"
+ g_object_notify_by_pspec ((GObject *) self, camera_accumulator_properties[CAMERA_ACCUMULATOR_RAW_PROPERTY]);
+#line 5617 "ImportPage.c"
}
}
-static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
+static void
+camera_accumulator_class_init (CameraAccumulatorClass * klass)
+{
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
camera_accumulator_parent_class = g_type_class_peek_parent (klass);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5192,18 +5633,20 @@ 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_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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_TOTAL_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_TOTAL_PROPERTY] = g_param_spec_int ("total", "total", "total", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | 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_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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_PHOTOS_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_PHOTOS_PROPERTY] = g_param_spec_int ("photos", "photos", "photos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | 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_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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_VIDEOS_PROPERTY] = g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 5202 "ImportPage.c"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, camera_accumulator_properties[CAMERA_ACCUMULATOR_RAW_PROPERTY] = g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
+#line 5643 "ImportPage.c"
}
-static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface) {
+static void
+camera_accumulator_core_tracker_accumulator_interface_init (CoreTrackerAccumulatorIface * iface)
+{
#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"
@@ -5212,11 +5655,13 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac
iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) camera_accumulator_real_uninclude;
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) camera_accumulator_real_altered;
-#line 5215 "ImportPage.c"
+#line 5658 "ImportPage.c"
}
-static void camera_accumulator_instance_init (CameraAccumulator * self) {
+static void
+camera_accumulator_instance_init (CameraAccumulator * self)
+{
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = CAMERA_ACCUMULATOR_GET_PRIVATE (self);
#line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5227,21 +5672,25 @@ 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 5230 "ImportPage.c"
+#line 5675 "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 5240 "ImportPage.c"
+#line 5687 "ImportPage.c"
}
-GType camera_accumulator_get_type (void) {
+GType
+camera_accumulator_get_type (void)
+{
static volatile gsize camera_accumulator_type_id__volatile = 0;
if (g_once_init_enter (&camera_accumulator_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CameraAccumulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) camera_accumulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CameraAccumulator), 0, (GInstanceInitFunc) camera_accumulator_instance_init, NULL };
@@ -5255,7 +5704,12 @@ GType camera_accumulator_get_type (void) {
}
-static void _vala_camera_accumulator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_camera_accumulator_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
CameraAccumulator * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5284,18 +5738,23 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
g_value_set_int (value, camera_accumulator_get_raw (self));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5287 "ImportPage.c"
+#line 5741 "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 5293 "ImportPage.c"
+#line 5747 "ImportPage.c"
}
}
-static void _vala_camera_accumulator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_camera_accumulator_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec)
+{
CameraAccumulator * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5324,25 +5783,32 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
camera_accumulator_set_raw (self, g_value_get_int (value));
#line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 5327 "ImportPage.c"
+#line 5786 "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 5333 "ImportPage.c"
+#line 5792 "ImportPage.c"
}
}
-static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
+static void
+_import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self)
+{
#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_media_added_removed ((ImportPage*) self);
-#line 5341 "ImportPage.c"
+#line 5805 "ImportPage.c"
}
-GType import_page_refresh_result_get_type (void) {
+GType
+import_page_refresh_result_get_type (void)
+{
static volatile gsize import_page_refresh_result_type_id__volatile = 0;
if (g_once_init_enter (&import_page_refresh_result_type_id__volatile)) {
static const GEnumValue values[] = {{IMPORT_PAGE_REFRESH_RESULT_OK, "IMPORT_PAGE_REFRESH_RESULT_OK", "ok"}, {IMPORT_PAGE_REFRESH_RESULT_BUSY, "IMPORT_PAGE_REFRESH_RESULT_BUSY", "busy"}, {IMPORT_PAGE_REFRESH_RESULT_LOCKED, "IMPORT_PAGE_REFRESH_RESULT_LOCKED", "locked"}, {IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR, "IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR", "library-error"}, {0, NULL, NULL}};
@@ -5354,115 +5820,153 @@ 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) {
+static void
+_import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_import_selected ((ImportPage*) self);
-#line 5360 "ImportPage.c"
+#line 5830 "ImportPage.c"
}
-static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_import_all ((ImportPage*) self);
-#line 5367 "ImportPage.c"
+#line 5841 "ImportPage.c"
}
-static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_on_action_toggle ((Page*) self, action, parameter);
-#line 5374 "ImportPage.c"
+#line 5852 "ImportPage.c"
}
-static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self)
+{
#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_display_titles ((ImportPage*) self, action, value);
-#line 5381 "ImportPage.c"
+#line 5863 "ImportPage.c"
}
-static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_import_page_preview_comparator_comparator (void* a,
+ void* b,
+ gpointer self)
+{
gint64 result;
result = import_page_preview_comparator (a, b);
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5390 "ImportPage.c"
+#line 5876 "ImportPage.c"
}
-static gboolean _import_page_preview_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
+static gboolean
+_import_page_preview_comparator_predicate_comparator_predicate (DataObject* object,
+ Alteration* alteration,
+ gpointer self)
+{
gboolean result;
result = import_page_preview_comparator_predicate (object, alteration);
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 5399 "ImportPage.c"
+#line 5889 "ImportPage.c"
}
-static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
+static void
+_import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender,
+ GeeIterable* changed,
+ gpointer self)
+{
#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed ((ImportPage*) self);
-#line 5406 "ImportPage.c"
+#line 5900 "ImportPage.c"
}
-static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
+static void
+_import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self)
+{
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed ((ImportPage*) self);
-#line 5413 "ImportPage.c"
+#line 5912 "ImportPage.c"
}
-static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
+static void
+_import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender,
+ GeeCollection* changed,
+ gpointer self)
+{
#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed ((ImportPage*) self);
-#line 5420 "ImportPage.c"
+#line 5923 "ImportPage.c"
}
-ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
+ImportPage*
+import_page_construct (GType object_type,
+ Camera* camera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon)
+{
ImportPage * self = NULL;
Camera* _tmp0_;
- Camera* _tmp1_;
- const gchar* _tmp2_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- const gchar* _tmp4_;
+ ImportSourceCollection* _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* _tmp6_;
+ ViewCollection* _tmp7_;
+ CameraViewTracker* _tmp8_;
+ GtkLabel* _tmp17_;
+ const gchar* _tmp18_;
+ const gchar* _tmp19_;
+ GVolumeMonitor* _tmp20_;
+ GPContextWrapper* _tmp21_;
+ GPSpinIdleWrapper* _tmp23_;
+ ViewCollection* _tmp25_;
+ ViewCollection* _tmp26_;
+ SourceCollection* _tmp27_;
+ ImportPageImportViewManager* _tmp28_;
+ ImportPageImportViewManager* _tmp29_;
+ ViewCollectionMonitor* _tmp30_;
+ ViewCollectionMonitor* _tmp31_;
ViewCollection* _tmp32_;
ViewCollection* _tmp33_;
- SourceCollection* _tmp34_;
- ImportPageImportViewManager* _tmp35_;
- ImportPageImportViewManager* _tmp36_;
- ViewCollectionMonitor* _tmp37_;
- ViewCollectionMonitor* _tmp38_;
+ ViewCollection* _tmp34_;
+ ViewCollection* _tmp35_;
+ ViewCollection* _tmp36_;
+ ViewCollection* _tmp37_;
+ ViewCollection* _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_;
+ GValue _tmp42_ = {0};
+ LibraryPhotoSourceCollection* _tmp43_;
+ VideoSourceCollection* _tmp44_;
#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5470,274 +5974,268 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportPage*) checkerboard_page_construct (object_type, _ ("Camera"));
#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = camera;
-#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
+ _tmp0_ = _GPHOTO_REF_CAMERA0 (camera);
#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_camera_unref0 (self->priv->camera);
#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera = _tmp1_;
+ self->priv->camera = _tmp0_;
#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = uri;
-#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp1_ = g_strdup (uri);
#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->uri);
#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->uri = _tmp3_;
-#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = uri;
+ self->priv->uri = _tmp1_;
#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = g_strdup_printf ("ImportSources for %s", _tmp4_);
+ _tmp2_ = g_strdup_printf ("ImportSources for %s", uri);
#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = _tmp2_;
#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = import_source_collection_new (_tmp6_);
+ _tmp4_ = import_source_collection_new (_tmp3_);
#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (self->priv->import_sources);
#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection);
+ self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection);
#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp6_);
-#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = icon;
+ _g_free0 (_tmp3_);
#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = g_strdup (_tmp8_);
+ _tmp5_ = g_strdup (icon);
#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->icon);
#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->icon = _tmp9_;
+ self->priv->icon = _tmp5_;
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = camera_view_tracker_new (_tmp11_);
+ _tmp8_ = camera_view_tracker_new (_tmp7_);
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_core_tracker_unref0 (self->priv->tracker);
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->tracker = _tmp12_;
+ self->priv->tracker = _tmp8_;
#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp11_);
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = display_name;
+ _data_collection_unref0 (_tmp7_);
#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (NULL != _tmp13_) {
-#line 5526 "ImportPage.c"
- const gchar* _tmp14_;
- gchar* _tmp15_;
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = display_name;
+ if (NULL != display_name) {
+#line 6020 "ImportPage.c"
+ gchar* _tmp9_;
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = g_strdup (_tmp14_);
+ _tmp9_ = g_strdup (display_name);
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera_name = _tmp15_;
-#line 5537 "ImportPage.c"
+ self->priv->camera_name = _tmp9_;
+#line 6028 "ImportPage.c"
} else {
CameraAbilities abilities = {0};
int res = 0;
- Camera* _tmp16_;
- CameraAbilities _tmp17_ = {0};
- int _tmp18_;
- int _tmp19_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = camera;
+ CameraAbilities _tmp10_ = {0};
+ int _tmp11_;
+ int _tmp12_;
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = gp_camera_get_abilities (_tmp16_, &_tmp17_);
+ _tmp11_ = gp_camera_get_abilities (camera, &_tmp10_);
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(abilities);
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- abilities = _tmp17_;
+ abilities = _tmp10_;
#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp18_;
+ res = _tmp11_;
#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = res;
+ _tmp12_ = res;
#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp19_ != GP_OK) {
-#line 5559 "ImportPage.c"
- int _tmp20_;
- gchar* _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
+ if (_tmp12_ != GP_OK) {
+#line 6047 "ImportPage.c"
+ int _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = res;
+ _tmp13_ = res;
#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = gp_result_to_full_string (_tmp20_);
+ _tmp14_ = gp_result_to_full_string (_tmp13_);
#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = _tmp21_;
+ _tmp15_ = _tmp14_;
#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:726: Unable to get camera abilities: %s", _tmp22_);
+ g_debug ("ImportPage.vala:726: Unable to get camera abilities: %s", _tmp15_);
#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp22_);
+ _g_free0 (_tmp15_);
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = g_strdup (_ ("Camera"));
+ _tmp16_ = g_strdup (_ ("Camera"));
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->camera_name);
#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera_name = _tmp23_;
-#line 5580 "ImportPage.c"
+ self->priv->camera_name = _tmp16_;
+#line 6068 "ImportPage.c"
}
#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(abilities);
-#line 5584 "ImportPage.c"
+#line 6072 "ImportPage.c"
}
#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = self->priv->camera_label;
+ _tmp17_ = self->priv->camera_label;
#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = self->priv->camera_name;
+ _tmp18_ = self->priv->camera_name;
#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_label_set_text (_tmp24_, _tmp25_);
+ gtk_label_set_text (_tmp17_, _tmp18_);
#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = self->priv->camera_name;
+ _tmp19_ = self->priv->camera_name;
#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp26_);
+ page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp19_);
#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = g_volume_monitor_get ();
+ _tmp20_ = g_volume_monitor_get ();
#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->volume_monitor);
#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->volume_monitor = _tmp27_;
+ self->priv->volume_monitor = _tmp20_;
#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = import_page_null_context;
+ _tmp21_ = import_page_null_context;
#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp28_ == NULL) {
-#line 5606 "ImportPage.c"
- GPContextWrapper* _tmp29_;
+ if (_tmp21_ == NULL) {
+#line 6094 "ImportPage.c"
+ GPContextWrapper* _tmp22_;
#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = gp_context_wrapper_new ();
+ _tmp22_ = gp_context_wrapper_new ();
#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_context_wrapper_unref0 (import_page_null_context);
#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_null_context = _tmp29_;
-#line 5614 "ImportPage.c"
+ import_page_null_context = _tmp22_;
+#line 6102 "ImportPage.c"
}
#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = import_page_spin_idle_context;
+ _tmp23_ = import_page_spin_idle_context;
#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp30_ == NULL) {
-#line 5620 "ImportPage.c"
- GPSpinIdleWrapper* _tmp31_;
+ if (_tmp23_ == NULL) {
+#line 6108 "ImportPage.c"
+ GPSpinIdleWrapper* _tmp24_;
#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = gp_spin_idle_wrapper_new ();
+ _tmp24_ = gp_spin_idle_wrapper_new ();
#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_context_wrapper_unref0 (import_page_spin_idle_context);
#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_spin_idle_context = _tmp31_;
-#line 5628 "ImportPage.c"
+ import_page_spin_idle_context = _tmp24_;
+#line 6116 "ImportPage.c"
}
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = _tmp32_;
+ _tmp26_ = _tmp25_;
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = self->priv->import_sources;
+ _tmp27_ = self->priv->import_sources;
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = import_page_import_view_manager_new (self);
+ _tmp28_ = import_page_import_view_manager_new (self);
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp29_ = _tmp28_;
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = view_collection_monitor_source_collection (_tmp33_, _tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
+ _tmp30_ = view_collection_monitor_source_collection (_tmp26_, _tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = _tmp37_;
+ _tmp31_ = _tmp30_;
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _view_collection_monitor_unref0 (_tmp38_);
+ _view_collection_monitor_unref0 (_tmp31_);
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _view_manager_unref0 (_tmp36_);
+ _view_manager_unref0 (_tmp29_);
#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp33_);
+ _data_collection_unref0 (_tmp26_);
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = 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 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = _tmp39_;
+ _tmp33_ = _tmp32_;
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
+ data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp40_);
+ _data_collection_unref0 (_tmp33_);
#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = _tmp41_;
+ _tmp35_ = _tmp34_;
#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp42_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
+ g_signal_connect_object (_tmp35_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp42_);
+ _data_collection_unref0 (_tmp35_);
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = _tmp43_;
+ _tmp37_ = _tmp36_;
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp44_);
+ _data_collection_unref0 (_tmp37_);
#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp38_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = _tmp45_;
+ _tmp39_ = _tmp38_;
#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp46_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
+ g_signal_connect_object (_tmp39_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp46_);
+ _data_collection_unref0 (_tmp39_);
#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = _tmp47_;
+ _tmp41_ = _tmp40_;
#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_value_init (&_tmp49_, G_TYPE_BOOLEAN);
+ g_value_init (&_tmp42_, G_TYPE_BOOLEAN);
#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_value_set_boolean (&_tmp49_, TRUE);
+ g_value_set_boolean (&_tmp42_, TRUE);
#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp49_, NULL, NULL);
+ data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp42_, NULL, NULL);
#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- G_IS_VALUE (&_tmp49_) ? (g_value_unset (&_tmp49_), NULL) : NULL;
+ G_IS_VALUE (&_tmp42_) ? (g_value_unset (&_tmp42_), NULL) : NULL;
#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp48_);
+ _data_collection_unref0 (_tmp41_);
#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = library_photo_global;
+ _tmp43_ = library_photo_global;
#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = video_global;
+ _tmp44_ = video_global;
#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
#line 762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "ImportContextMenu");
#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 5710 "ImportPage.c"
+#line 6198 "ImportPage.c"
}
-ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
+ImportPage*
+import_page_new (Camera* camera,
+ const gchar* uri,
+ const gchar* display_name,
+ const gchar* icon)
+{
#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon);
-#line 5717 "ImportPage.c"
+#line 6210 "ImportPage.c"
}
-static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender,
+ gpointer self)
+{
#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_hide_imported ((ImportPage*) self);
-#line 5724 "ImportPage.c"
+#line 6220 "ImportPage.c"
}
-static GtkToolbar* import_page_real_get_toolbar (Page* base) {
+static GtkToolbar*
+import_page_real_get_toolbar (Page* base)
+{
ImportPage * self;
GtkToolbar* result = NULL;
GtkToolbar* _tmp0_;
+ GtkToolbar* _tmp54_;
GtkToolbar* _tmp55_;
- GtkToolbar* _tmp56_;
#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ == NULL) {
-#line 5740 "ImportPage.c"
+#line 6238 "ImportPage.c"
GtkToolbar* _tmp1_;
GtkToolbar* _tmp2_;
GtkCheckButton* _tmp3_;
@@ -5747,57 +6245,56 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
GtkCheckButton* _tmp7_;
ConfigFacade* _tmp8_;
ConfigFacade* _tmp9_;
- gboolean _tmp10_;
GtkToolItem* hide_item = NULL;
+ GtkToolItem* _tmp10_;
GtkToolItem* _tmp11_;
GtkToolItem* _tmp12_;
- GtkToolItem* _tmp13_;
- GtkCheckButton* _tmp14_;
- GtkToolbar* _tmp15_;
- GtkToolItem* _tmp16_;
+ GtkCheckButton* _tmp13_;
+ GtkToolbar* _tmp14_;
+ GtkToolItem* _tmp15_;
GtkSeparatorToolItem* separator = NULL;
+ GtkSeparatorToolItem* _tmp16_;
GtkSeparatorToolItem* _tmp17_;
- GtkSeparatorToolItem* _tmp18_;
- GtkToolbar* _tmp19_;
- GtkSeparatorToolItem* _tmp20_;
+ GtkToolbar* _tmp18_;
+ GtkSeparatorToolItem* _tmp19_;
+ GtkProgressBar* _tmp20_;
GtkProgressBar* _tmp21_;
- GtkProgressBar* _tmp22_;
GtkToolItem* progress_item = NULL;
+ GtkToolItem* _tmp22_;
GtkToolItem* _tmp23_;
GtkToolItem* _tmp24_;
- GtkToolItem* _tmp25_;
+ GtkProgressBar* _tmp25_;
GtkProgressBar* _tmp26_;
- GtkProgressBar* _tmp27_;
- GtkToolbar* _tmp28_;
- GtkToolItem* _tmp29_;
+ GtkToolbar* _tmp27_;
+ GtkToolItem* _tmp28_;
GtkToggleToolButton* find_button = NULL;
+ GtkToggleToolButton* _tmp29_;
GtkToggleToolButton* _tmp30_;
GtkToggleToolButton* _tmp31_;
- GtkToggleToolButton* _tmp32_;
- GtkToolbar* _tmp33_;
- GtkToggleToolButton* _tmp34_;
- GtkToolbar* _tmp35_;
+ GtkToolbar* _tmp32_;
+ GtkToggleToolButton* _tmp33_;
+ GtkToolbar* _tmp34_;
+ GtkSeparatorToolItem* _tmp35_;
GtkSeparatorToolItem* _tmp36_;
- GtkSeparatorToolItem* _tmp37_;
GtkToolButton* import_selected_button = NULL;
+ GtkToolButton* _tmp37_;
GtkToolButton* _tmp38_;
GtkToolButton* _tmp39_;
GtkToolButton* _tmp40_;
GtkToolButton* _tmp41_;
GtkToolButton* _tmp42_;
- GtkToolButton* _tmp43_;
- GtkToolbar* _tmp44_;
- GtkToolButton* _tmp45_;
+ GtkToolbar* _tmp43_;
+ GtkToolButton* _tmp44_;
GtkToolButton* import_all_button = NULL;
+ GtkToolButton* _tmp45_;
GtkToolButton* _tmp46_;
GtkToolButton* _tmp47_;
GtkToolButton* _tmp48_;
GtkToolButton* _tmp49_;
GtkToolButton* _tmp50_;
- GtkToolButton* _tmp51_;
- GtkToolbar* _tmp52_;
- GtkToolButton* _tmp53_;
- GtkProgressBar* _tmp54_;
+ GtkToolbar* _tmp51_;
+ GtkToolButton* _tmp52_;
+ GtkProgressBar* _tmp53_;
#line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = PAGE_CLASS (import_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
#line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5831,183 +6328,181 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp9_ = _tmp8_;
#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp10_);
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp9_);
#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = gtk_tool_item_new ();
+ _tmp10_ = gtk_tool_item_new ();
#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp11_);
+ g_object_ref_sink (_tmp10_);
#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- hide_item = _tmp11_;
+ hide_item = _tmp10_;
#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = hide_item;
+ _tmp11_ = hide_item;
#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_is_important (_tmp12_, TRUE);
+ gtk_tool_item_set_is_important (_tmp11_, TRUE);
#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = hide_item;
+ _tmp12_ = hide_item;
#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = self->priv->hide_imported;
+ _tmp13_ = self->priv->hide_imported;
#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = hide_item;
+ _tmp15_ = hide_item;
#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp15_, _tmp16_, -1);
+ gtk_toolbar_insert (_tmp14_, _tmp15_, -1);
#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+ _tmp16_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp17_);
+ g_object_ref_sink (_tmp16_);
#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- separator = _tmp17_;
+ separator = _tmp16_;
#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = separator;
+ _tmp17_ = separator;
#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_separator_tool_item_set_draw (_tmp18_, FALSE);
+ gtk_separator_tool_item_set_draw (_tmp17_, FALSE);
#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = separator;
+ _tmp19_ = separator;
#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = self->priv->progress_bar;
+ _tmp20_ = self->priv->progress_bar;
#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
+ gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_orientable_get_type (), GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = self->priv->progress_bar;
+ _tmp21_ = self->priv->progress_bar;
#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = gtk_tool_item_new ();
+ _tmp22_ = gtk_tool_item_new ();
#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp23_);
+ g_object_ref_sink (_tmp22_);
#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- progress_item = _tmp23_;
+ progress_item = _tmp22_;
#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = progress_item;
+ _tmp23_ = progress_item;
#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_expand (_tmp24_, TRUE);
+ gtk_tool_item_set_expand (_tmp23_, TRUE);
#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = progress_item;
+ _tmp24_ = progress_item;
#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = self->priv->progress_bar;
+ _tmp25_ = self->priv->progress_bar;
#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
#line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = self->priv->progress_bar;
+ _tmp26_ = self->priv->progress_bar;
#line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_show_text (_tmp27_, TRUE);
+ gtk_progress_bar_set_show_text (_tmp26_, TRUE);
#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = progress_item;
+ _tmp28_ = progress_item;
#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp28_, _tmp29_, -1);
+ gtk_toolbar_insert (_tmp27_, _tmp28_, -1);
#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+ _tmp29_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp30_);
+ g_object_ref_sink (_tmp29_);
#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- find_button = _tmp30_;
+ find_button = _tmp29_;
#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = find_button;
+ _tmp30_ = find_button;
#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
+ gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = find_button;
+ _tmp31_ = find_button;
#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_actionable_get_type (), GtkActionable), "win.CommonDisplaySearchbar");
#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp32_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = find_button;
+ _tmp33_ = find_button;
#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+ _tmp35_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp36_);
+ g_object_ref_sink (_tmp35_);
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = _tmp36_;
+ _tmp36_ = _tmp35_;
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp37_);
+ _g_object_unref0 (_tmp36_);
#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+ _tmp37_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp38_);
+ g_object_ref_sink (_tmp37_);
#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_selected_button = _tmp38_;
+ import_selected_button = _tmp37_;
#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = import_selected_button;
+ _tmp38_ = import_selected_button;
#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_icon_name (_tmp39_, "import");
+ gtk_tool_button_set_icon_name (_tmp38_, "import");
#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = import_selected_button;
+ _tmp39_ = import_selected_button;
#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_label (_tmp40_, _ ("Import _Selected"));
+ gtk_tool_button_set_label (_tmp39_, _ ("Import _Selected"));
#line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = import_selected_button;
+ _tmp40_ = import_selected_button;
#line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+ gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_selected_button;
+ _tmp41_ = import_selected_button;
#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_use_underline (_tmp42_, TRUE);
+ gtk_tool_button_set_use_underline (_tmp41_, TRUE);
#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = import_selected_button;
+ _tmp42_ = import_selected_button;
#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_actionable_get_type (), GtkActionable), "win.ImportSelected");
#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = import_selected_button;
+ _tmp44_ = import_selected_button;
#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+ _tmp45_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp46_);
+ g_object_ref_sink (_tmp45_);
#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_all_button = _tmp46_;
+ import_all_button = _tmp45_;
#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = import_all_button;
+ _tmp46_ = import_all_button;
#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_icon_name (_tmp47_, "import-all");
+ gtk_tool_button_set_icon_name (_tmp46_, "import-all");
#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = import_all_button;
+ _tmp47_ = import_all_button;
#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_label (_tmp48_, _ ("Import _All"));
+ gtk_tool_button_set_label (_tmp47_, _ ("Import _All"));
#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = import_all_button;
+ _tmp48_ = import_all_button;
#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+ gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_all_button;
+ _tmp49_ = import_all_button;
#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_tool_button_set_use_underline (_tmp50_, TRUE);
+ gtk_tool_button_set_use_underline (_tmp49_, TRUE);
#line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = import_all_button;
+ _tmp50_ = import_all_button;
#line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_actionable_get_type (), GtkActionable), "win.ImportAll");
#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = import_all_button;
+ _tmp52_ = import_all_button;
#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = self->priv->progress_bar;
+ _tmp53_ = self->priv->progress_bar;
#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 837 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_toolbar_state (self);
#line 839 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6024,28 +6519,32 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
_g_object_unref0 (separator);
#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (hide_item);
-#line 6027 "ImportPage.c"
+#line 6522 "ImportPage.c"
}
#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+ _tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = _g_object_ref0 (_tmp55_);
+ _tmp55_ = _g_object_ref0 (_tmp54_);
#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp56_;
+ result = _tmp55_;
#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6037 "ImportPage.c"
+#line 6532 "ImportPage.c"
}
-static gpointer _core_tracker_ref0 (gpointer self) {
+static gpointer
+_core_tracker_ref0 (gpointer self)
+{
#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? core_tracker_ref (self) : NULL;
-#line 6044 "ImportPage.c"
+#line 6541 "ImportPage.c"
}
-static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* base) {
+static CoreViewTracker*
+import_page_real_get_view_tracker (CheckerboardPage* base)
+{
ImportPage * self;
CoreViewTracker* result = NULL;
CameraViewTracker* _tmp0_;
@@ -6060,11 +6559,13 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas
result = _tmp1_;
#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6063 "ImportPage.c"
+#line 6562 "ImportPage.c"
}
-static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
+static gchar*
+import_page_real_get_view_empty_message (CheckerboardPage* base)
+{
ImportPage * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -6076,11 +6577,13 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
result = _tmp0_;
#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6079 "ImportPage.c"
+#line 6580 "ImportPage.c"
}
-static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* base) {
+static gchar*
+import_page_real_get_filter_no_match_message (CheckerboardPage* base)
+{
ImportPage * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -6092,180 +6595,153 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba
result = _tmp0_;
#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6095 "ImportPage.c"
+#line 6598 "ImportPage.c"
}
-static gint64 import_page_preview_comparator (void* a, void* b) {
+static gint64
+import_page_preview_comparator (void* a,
+ void* b)
+{
gint64 result = 0LL;
- void* _tmp0_;
+ ImportSource* _tmp0_;
ImportSource* _tmp1_;
ImportSource* _tmp2_;
- time_t _tmp3_;
- void* _tmp4_;
- ImportSource* _tmp5_;
- ImportSource* _tmp6_;
- time_t _tmp7_;
- gint64 _tmp8_;
-#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = a;
-#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _tmp1_;
+ ImportSource* _tmp3_;
+ gint64 _tmp4_;
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = import_source_get_exposure_time (_tmp2_);
+ _tmp0_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) a, TYPE_IMPORT_PREVIEW, ImportPreview));
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = b;
+ _tmp1_ = _tmp0_;
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) _tmp4_, TYPE_IMPORT_PREVIEW, ImportPreview));
+ _tmp2_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST ((ImportPreview*) b, TYPE_IMPORT_PREVIEW, ImportPreview));
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp5_;
-#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = import_source_get_exposure_time (_tmp6_);
+ _tmp3_ = _tmp2_;
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = (gint64) (_tmp3_ - _tmp7_);
+ _tmp4_ = (gint64) (import_source_get_exposure_time (_tmp1_) - import_source_get_exposure_time (_tmp3_));
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp3_);
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp8_;
+ result = _tmp4_;
#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6136 "ImportPage.c"
+#line 6630 "ImportPage.c"
}
-static gboolean import_page_preview_comparator_predicate (DataObject* object, Alteration* alteration) {
+static gboolean
+import_page_preview_comparator_predicate (DataObject* object,
+ Alteration* alteration)
+{
gboolean result = FALSE;
- Alteration* _tmp0_;
- gboolean _tmp1_;
#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = alteration;
-#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time");
-#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp1_;
+ result = alteration_has_detail (alteration, "metadata", "exposure-time");
#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6156 "ImportPage.c"
+#line 6647 "ImportPage.c"
}
-static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void* b) {
+static gint64
+import_page_import_job_comparator (ImportPage* self,
+ void* a,
+ void* b)
+{
gint64 result = 0LL;
- void* _tmp0_;
- time_t _tmp1_;
- void* _tmp2_;
- time_t _tmp3_;
#line 866 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL);
#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = a;
-#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob));
-#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = b;
-#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) _tmp2_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob));
-#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = (gint64) (_tmp1_ - _tmp3_);
+ result = (gint64) (import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) a, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob)) - import_page_camera_import_job_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST ((ImportPageCameraImportJob*) b, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, ImportPageCameraImportJob)));
#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6180 "ImportPage.c"
+#line 6663 "ImportPage.c"
}
-static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+import_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames)
+{
ImportPage * self;
- GeeList* _tmp0_;
- GeeList* _tmp1_;
#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (GEE_IS_LIST (ui_filenames));
#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = ui_filenames;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- PAGE_CLASS (import_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = ui_filenames;
+ PAGE_CLASS (import_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames);
#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
-#line 6200 "ImportPage.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
+#line 6680 "ImportPage.c"
}
-static GVariant* _variant_new15 (gboolean value) {
+static GVariant*
+_variant_new15 (gboolean value)
+{
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6207 "ImportPage.c"
+#line 6689 "ImportPage.c"
}
-static void import_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+import_page_real_add_actions (Page* base,
+ GActionMap* map)
+{
ImportPage * self;
- GActionMap* _tmp0_;
- GActionMap* _tmp1_;
- GAction* _tmp2_;
- GAction* _tmp3_;
- ConfigFacade* _tmp4_;
- ConfigFacade* _tmp5_;
- gboolean _tmp6_;
- GVariant* _tmp7_;
+ GAction* _tmp0_;
+ GAction* _tmp1_;
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ GVariant* _tmp4_;
#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = map;
-#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = map;
+ PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_action_map_add_action_entries (_tmp1_, IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self);
-#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
-#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp2_;
+ g_action_map_add_action_entries (map, IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self);
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = config_facade_get_instance ();
+ _tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = _tmp0_;
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp2_ = config_facade_get_instance ();
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _variant_new15 (_tmp6_);
+ _tmp3_ = _tmp2_;
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_action_change_state (_tmp3_, _tmp7_);
+ _tmp4_ = _variant_new15 (configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_variant_unref0 (_tmp7_);
+ g_action_change_state (_tmp1_, _tmp4_);
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp5_);
+ _g_variant_unref0 (_tmp4_);
#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp3_);
-#line 6253 "ImportPage.c"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (_tmp1_);
+#line 6729 "ImportPage.c"
}
-static void import_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+import_page_real_remove_actions (Page* base,
+ GActionMap* map)
+{
ImportPage * self;
- GActionMap* _tmp0_;
#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = map;
-#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- PAGE_CLASS (import_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 6268 "ImportPage.c"
+ 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), map);
+#line 6744 "ImportPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -6277,31 +6753,30 @@ static void import_page_real_remove_actions (Page* base, GActionMap* map) {
entry_collection_length1 = G_N_ELEMENTS (IMPORT_PAGE_entries);
#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_PAGE_entries); entry_it = entry_it + 1) {
-#line 6280 "ImportPage.c"
+#line 6756 "ImportPage.c"
GActionEntry entry = {0};
#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
entry = entry_collection[entry_it];
-#line 6284 "ImportPage.c"
+#line 6760 "ImportPage.c"
{
- GActionMap* _tmp1_;
- GActionEntry _tmp2_;
- const gchar* _tmp3_;
-#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = map;
+ GActionEntry _tmp0_;
+ const gchar* _tmp1_;
#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = entry;
+ _tmp0_ = entry;
#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp2_.name;
+ _tmp1_ = _tmp0_.name;
#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 6297 "ImportPage.c"
+ g_action_map_remove_action (map, _tmp1_);
+#line 6770 "ImportPage.c"
}
}
}
}
-Camera* import_page_get_camera (ImportPage* self) {
+Camera*
+import_page_get_camera (ImportPage* self)
+{
Camera* result = NULL;
Camera* _tmp0_;
Camera* _tmp1_;
@@ -6315,11 +6790,13 @@ Camera* import_page_get_camera (ImportPage* self) {
result = _tmp1_;
#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6318 "ImportPage.c"
+#line 6793 "ImportPage.c"
}
-gchar* import_page_get_uri (ImportPage* self) {
+gchar*
+import_page_get_uri (ImportPage* self)
+{
gchar* result = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -6333,11 +6810,13 @@ gchar* import_page_get_uri (ImportPage* self) {
result = _tmp1_;
#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6336 "ImportPage.c"
+#line 6813 "ImportPage.c"
}
-gboolean import_page_is_busy (ImportPage* self) {
+gboolean
+import_page_is_busy (ImportPage* self)
+{
gboolean result = FALSE;
gboolean _tmp0_;
#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6348,14 +6827,16 @@ gboolean import_page_is_busy (ImportPage* self) {
result = _tmp0_;
#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6351 "ImportPage.c"
+#line 6830 "ImportPage.c"
}
-static void import_page_real_init_actions (Page* base, gint selected_count, gint count) {
+static void
+import_page_real_init_actions (Page* base,
+ gint selected_count,
+ gint count)
+{
ImportPage * self;
- gint _tmp0_;
- gint _tmp1_;
#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6365,16 +6846,14 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE);
#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = selected_count;
-#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = count;
-#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 6373 "ImportPage.c"
+ 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), selected_count, count);
+#line 6850 "ImportPage.c"
}
-gboolean import_page_is_refreshed (ImportPage* self) {
+gboolean
+import_page_is_refreshed (ImportPage* self)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_;
@@ -6384,27 +6863,29 @@ gboolean import_page_is_refreshed (ImportPage* self) {
_tmp1_ = self->priv->refreshed;
#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6387 "ImportPage.c"
+#line 6866 "ImportPage.c"
gboolean _tmp2_;
#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = !_tmp2_;
-#line 6393 "ImportPage.c"
+#line 6872 "ImportPage.c"
} else {
#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6397 "ImportPage.c"
+#line 6876 "ImportPage.c"
}
#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = _tmp0_;
#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6403 "ImportPage.c"
+#line 6882 "ImportPage.c"
}
-gchar* import_page_get_refresh_message (ImportPage* self) {
+gchar*
+import_page_get_refresh_message (ImportPage* self)
+{
gchar* result = NULL;
gchar* msg = NULL;
const gchar* _tmp0_;
@@ -6416,7 +6897,7 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_tmp0_ = self->priv->refresh_error;
#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 6419 "ImportPage.c"
+#line 6900 "ImportPage.c"
const gchar* _tmp1_;
gchar* _tmp2_;
#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6427,14 +6908,14 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_g_free0 (msg);
#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp2_;
-#line 6430 "ImportPage.c"
+#line 6911 "ImportPage.c"
} else {
int _tmp3_;
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->refresh_result;
#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp3_ == GP_OK) {
-#line 6437 "ImportPage.c"
+#line 6918 "ImportPage.c"
} else {
int _tmp4_;
gchar* _tmp5_;
@@ -6446,37 +6927,37 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
_g_free0 (msg);
#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
msg = _tmp5_;
-#line 6449 "ImportPage.c"
+#line 6930 "ImportPage.c"
}
}
#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = msg;
#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 6456 "ImportPage.c"
+#line 6937 "ImportPage.c"
}
-static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) {
- gboolean _tmp0_;
- gboolean _tmp1_;
+static void
+import_page_update_status (ImportPage* self,
+ gboolean busy,
+ gboolean refreshed)
+{
#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = busy;
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->busy = _tmp0_;
-#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = refreshed;
+ self->priv->busy = busy;
#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refreshed = _tmp1_;
+ self->priv->refreshed = refreshed;
#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 6475 "ImportPage.c"
+#line 6954 "ImportPage.c"
}
-static void import_page_update_toolbar_state (ImportPage* self) {
+static void
+import_page_update_toolbar_state (ImportPage* self)
+{
GtkCheckButton* _tmp0_;
#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -6484,182 +6965,174 @@ static void import_page_update_toolbar_state (ImportPage* self) {
_tmp0_ = self->priv->hide_imported;
#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_ != NULL) {
-#line 6487 "ImportPage.c"
+#line 6968 "ImportPage.c"
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
gboolean _tmp3_;
- GtkCheckButton* _tmp8_;
+ GtkCheckButton* _tmp7_;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->busy;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp3_) {
-#line 6496 "ImportPage.c"
+#line 6977 "ImportPage.c"
gboolean _tmp4_;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = self->priv->refreshed;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = _tmp4_;
-#line 6502 "ImportPage.c"
+#line 6983 "ImportPage.c"
} else {
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = FALSE;
-#line 6506 "ImportPage.c"
+#line 6987 "ImportPage.c"
}
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp2_) {
-#line 6510 "ImportPage.c"
+#line 6991 "ImportPage.c"
ViewCollection* _tmp5_;
ViewCollection* _tmp6_;
- gint _tmp7_;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp6_ = _tmp5_;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = view_collection_get_unfiltered_count (_tmp6_);
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _tmp7_ > 0;
+ _tmp1_ = view_collection_get_unfiltered_count (_tmp6_) > 0;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp6_);
-#line 6524 "ImportPage.c"
+#line 7002 "ImportPage.c"
} else {
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6528 "ImportPage.c"
+#line 7006 "ImportPage.c"
}
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = self->priv->hide_imported;
+ _tmp7_ = self->priv->hide_imported;
#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6534 "ImportPage.c"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp1_);
+#line 7012 "ImportPage.c"
}
}
-static void import_page_on_view_changed (ImportPage* self) {
+static void
+import_page_on_view_changed (ImportPage* self)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_;
+ gboolean _tmp6_ = FALSE;
gboolean _tmp7_ = FALSE;
- gboolean _tmp8_ = FALSE;
- gboolean _tmp9_;
- gboolean _tmp14_ = FALSE;
- gboolean _tmp15_;
+ gboolean _tmp8_;
+ gboolean _tmp12_ = FALSE;
+ gboolean _tmp13_;
#line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp2_) {
-#line 6554 "ImportPage.c"
+#line 7034 "ImportPage.c"
gboolean _tmp3_;
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp3_ = self->priv->refreshed;
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp3_;
-#line 6560 "ImportPage.c"
+#line 7040 "ImportPage.c"
} else {
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = FALSE;
-#line 6564 "ImportPage.c"
+#line 7044 "ImportPage.c"
}
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp1_) {
-#line 6568 "ImportPage.c"
+#line 7048 "ImportPage.c"
ViewCollection* _tmp4_;
ViewCollection* _tmp5_;
- gint _tmp6_;
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp5_ = _tmp4_;
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp6_ > 0;
+ _tmp0_ = view_collection_get_selected_count (_tmp5_) > 0;
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp5_);
-#line 6582 "ImportPage.c"
+#line 7059 "ImportPage.c"
} else {
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 6586 "ImportPage.c"
+#line 7063 "ImportPage.c"
}
#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = self->priv->busy;
+ _tmp8_ = self->priv->busy;
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp9_) {
-#line 6594 "ImportPage.c"
- gboolean _tmp10_;
+ if (!_tmp8_) {
+#line 7071 "ImportPage.c"
+ gboolean _tmp9_;
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = self->priv->refreshed;
+ _tmp9_ = self->priv->refreshed;
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _tmp10_;
-#line 6600 "ImportPage.c"
+ _tmp7_ = _tmp9_;
+#line 7077 "ImportPage.c"
} else {
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = FALSE;
-#line 6604 "ImportPage.c"
+ _tmp7_ = FALSE;
+#line 7081 "ImportPage.c"
}
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp8_) {
-#line 6608 "ImportPage.c"
+ if (_tmp7_) {
+#line 7085 "ImportPage.c"
+ ViewCollection* _tmp10_;
ViewCollection* _tmp11_;
- ViewCollection* _tmp12_;
- gint _tmp13_;
#line 950 "/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 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = _tmp11_;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp11_ = _tmp10_;
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp13_ > 0;
+ _tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection)) > 0;
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp12_);
-#line 6622 "ImportPage.c"
+ _data_collection_unref0 (_tmp11_);
+#line 7096 "ImportPage.c"
} else {
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = FALSE;
-#line 6626 "ImportPage.c"
+ _tmp6_ = FALSE;
+#line 7100 "ImportPage.c"
}
#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp6_);
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = self->priv->busy;
+ _tmp13_ = self->priv->busy;
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp15_) {
-#line 6634 "ImportPage.c"
- ViewCollection* _tmp16_;
- ViewCollection* _tmp17_;
- gint _tmp18_;
+ if (!_tmp13_) {
+#line 7108 "ImportPage.c"
+ ViewCollection* _tmp14_;
+ ViewCollection* _tmp15_;
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = _tmp16_;
+ _tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp15_ = _tmp14_;
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = _tmp18_ > 0;
+ _tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection)) > 0;
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp17_);
-#line 6648 "ImportPage.c"
+ _data_collection_unref0 (_tmp15_);
+#line 7119 "ImportPage.c"
} else {
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = FALSE;
-#line 6652 "ImportPage.c"
+ _tmp12_ = FALSE;
+#line 7123 "ImportPage.c"
}
#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp12_);
#line 953 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_toolbar_state (self);
-#line 6658 "ImportPage.c"
+#line 7129 "ImportPage.c"
}
-static void import_page_on_media_added_removed (ImportPage* self) {
+static void
+import_page_on_media_added_removed (ImportPage* self)
+{
ImportPageImportPageSearchViewFilter* _tmp0_;
#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -6667,53 +7140,46 @@ static void import_page_on_media_added_removed (ImportPage* self) {
_tmp0_ = self->priv->search_filter;
#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6670 "ImportPage.c"
+#line 7143 "ImportPage.c"
}
-static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value) {
+static void
+import_page_on_display_titles (ImportPage* self,
+ GSimpleAction* action,
+ GVariant* value)
+{
gboolean display = FALSE;
- GVariant* _tmp0_;
- gboolean _tmp1_;
- ConfigFacade* _tmp2_;
- ConfigFacade* _tmp3_;
- GSimpleAction* _tmp4_;
- GVariant* _tmp5_;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = value;
-#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- display = _tmp1_;
+ display = g_variant_get_boolean (value);
#line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = config_facade_get_instance ();
+ _tmp0_ = config_facade_get_instance ();
#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
+ configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp3_);
-#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = action;
-#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = value;
+ _g_object_unref0 (_tmp1_);
#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6708 "ImportPage.c"
+ g_simple_action_set_state (action, value);
+#line 7173 "ImportPage.c"
}
-static void import_page_real_switched_to (Page* base) {
+static void
+import_page_real_switched_to (Page* base)
+{
ImportPage * self;
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
- gboolean _tmp2_;
#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6721,18 +7187,18 @@ static void import_page_real_switched_to (Page* base) {
#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = _tmp0_;
#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp2_);
+ checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp1_);
#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
PAGE_CLASS (import_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 6731 "ImportPage.c"
+#line 7195 "ImportPage.c"
}
-static void import_page_real_ready (Page* base) {
+static void
+import_page_real_ready (Page* base)
+{
ImportPage * self;
ImportPageHideImportedViewFilter* _tmp0_;
#line 975 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6743,184 +7209,133 @@ static void import_page_real_ready (Page* base) {
_tmp0_ = self->priv->hide_imported_filter;
#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6746 "ImportPage.c"
+#line 7212 "ImportPage.c"
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 6769 "ImportPage.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 6777 "ImportPage.c"
+#line 7236 "ImportPage.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 6789 "ImportPage.c"
+#line 7245 "ImportPage.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 6813 "ImportPage.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 6819 "ImportPage.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 7266 "ImportPage.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 6823 "ImportPage.c"
+#line 7270 "ImportPage.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 6827 "ImportPage.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 7276 "ImportPage.c"
+ } else {
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 7286 "ImportPage.c"
+ }
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 7290 "ImportPage.c"
glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 7298 "ImportPage.c"
+ } else {
glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 7305 "ImportPage.c"
+ }
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 7309 "ImportPage.c"
glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 6839 "ImportPage.c"
- } else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 6849 "ImportPage.c"
- }
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 6855 "ImportPage.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 6869 "ImportPage.c"
- } else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 6879 "ImportPage.c"
- }
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 6885 "ImportPage.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 6894 "ImportPage.c"
- }
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 7315 "ImportPage.c"
+ }
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 6914 "ImportPage.c"
+#line 7327 "ImportPage.c"
}
-static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_on_locked) {
+static void
+import_page_try_refreshing_camera (ImportPage* self,
+ gboolean fail_on_locked)
+{
gboolean _tmp0_ = FALSE;
gboolean _tmp1_;
ImportPageRefreshResult res = 0;
ImportPageRefreshResult _tmp3_;
- ImportPageRefreshResult _tmp4_;
GError * _inner_error_ = NULL;
#line 980 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -6930,102 +7345,97 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
if (_tmp1_) {
#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
-#line 6933 "ImportPage.c"
+#line 7348 "ImportPage.c"
} else {
gboolean _tmp2_;
#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = self->priv->busy;
#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = _tmp2_;
-#line 6940 "ImportPage.c"
+#line 7355 "ImportPage.c"
}
#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 6946 "ImportPage.c"
+#line 7361 "ImportPage.c"
}
#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = import_page_refresh_camera (self);
-#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp3_;
+ res = import_page_refresh_camera (self);
#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = res;
+ _tmp3_ = res;
#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- switch (_tmp4_) {
+ switch (_tmp3_) {
#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_OK:
#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6960 "ImportPage.c"
+#line 7373 "ImportPage.c"
{
#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 6964 "ImportPage.c"
+#line 7377 "ImportPage.c"
}
#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6968 "ImportPage.c"
+#line 7381 "ImportPage.c"
{
- gboolean _tmp5_;
- const gchar* _tmp6_;
+ const gchar* _tmp4_;
GFile* uri = NULL;
- const gchar* _tmp7_;
- GFile* _tmp8_;
+ const gchar* _tmp5_;
+ GFile* _tmp6_;
GMount* mount = NULL;
- gboolean _tmp13_ = FALSE;
- GMount* _tmp14_;
- GMount* _tmp27_;
-#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = fail_on_locked;
+ gboolean _tmp11_ = FALSE;
+ GMount* _tmp12_;
+ GMount* _tmp24_;
#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp5_) {
+ if (fail_on_locked) {
#line 995 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 6987 "ImportPage.c"
+#line 7397 "ImportPage.c"
}
#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = self->priv->uri;
+ _tmp4_ = self->priv->uri;
#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1001: Checking if %s is mounted…", _tmp6_);
+ g_debug ("ImportPage.vala:1001: Checking if %s is mounted…", _tmp4_);
#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = self->priv->uri;
+ _tmp5_ = self->priv->uri;
#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = g_file_new_for_uri (_tmp7_);
+ _tmp6_ = g_file_new_for_uri (_tmp5_);
#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- uri = _tmp8_;
+ uri = _tmp6_;
#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
mount = NULL;
-#line 7001 "ImportPage.c"
+#line 7411 "ImportPage.c"
{
- GMount* _tmp9_ = NULL;
- GFile* _tmp10_;
- GMount* _tmp11_;
- GMount* _tmp12_;
+ GMount* _tmp7_ = NULL;
+ GFile* _tmp8_;
+ GMount* _tmp9_;
+ GMount* _tmp10_;
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = uri;
+ _tmp8_ = uri;
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
+ _tmp9_ = g_file_find_enclosing_mount (_tmp8_, NULL, &_inner_error_);
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp11_;
+ _tmp7_ = _tmp9_;
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7015 "ImportPage.c"
+#line 7425 "ImportPage.c"
goto __catch73_g_error;
}
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = _tmp9_;
+ _tmp10_ = _tmp7_;
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = NULL;
+ _tmp7_ = NULL;
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- mount = _tmp12_;
+ mount = _tmp10_;
#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp9_);
-#line 7028 "ImportPage.c"
+ _g_object_unref0 (_tmp7_);
+#line 7438 "ImportPage.c"
}
goto __finally73;
__catch73_g_error:
@@ -7037,7 +7447,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_inner_error_ = NULL;
#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 7040 "ImportPage.c"
+#line 7450 "ImportPage.c"
}
__finally73:
#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7052,84 +7462,81 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
g_clear_error (&_inner_error_);
#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 7055 "ImportPage.c"
+#line 7465 "ImportPage.c"
}
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = mount;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp14_ == NULL) {
-#line 7061 "ImportPage.c"
- const gchar* _tmp15_;
- gboolean _tmp16_;
+ _tmp12_ = mount;
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = self->priv->uri;
+ if (_tmp12_ == NULL) {
+#line 7471 "ImportPage.c"
+ const gchar* _tmp13_;
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = g_str_has_prefix (_tmp15_, "gphoto2");
+ _tmp13_ = self->priv->uri;
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = _tmp16_;
-#line 7070 "ImportPage.c"
+ _tmp11_ = g_str_has_prefix (_tmp13_, "gphoto2");
+#line 7477 "ImportPage.c"
} else {
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = FALSE;
-#line 7074 "ImportPage.c"
+ _tmp11_ = FALSE;
+#line 7481 "ImportPage.c"
}
#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp13_) {
-#line 7078 "ImportPage.c"
- const gchar* _tmp17_;
+ if (_tmp11_) {
+#line 7485 "ImportPage.c"
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
gchar* _tmp18_;
- gchar* _tmp19_;
- gchar* _tmp20_;
- gchar* _tmp21_;
- GFile* _tmp22_;
+ GFile* _tmp19_;
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = self->priv->uri;
+ _tmp14_ = self->priv->uri;
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = string_substring (_tmp17_, (glong) 7, (glong) -1);
+ _tmp15_ = string_substring (_tmp14_, (glong) 7, (glong) -1);
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp16_ = _tmp15_;
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = g_strconcat ("mtp", _tmp19_, NULL);
+ _tmp17_ = g_strconcat ("mtp", _tmp16_, NULL);
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = _tmp20_;
+ _tmp18_ = _tmp17_;
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = g_file_new_for_uri (_tmp21_);
+ _tmp19_ = g_file_new_for_uri (_tmp18_);
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (uri);
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- uri = _tmp22_;
+ uri = _tmp19_;
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp21_);
+ _g_free0 (_tmp18_);
#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp19_);
-#line 7105 "ImportPage.c"
+ _g_free0 (_tmp16_);
+#line 7512 "ImportPage.c"
{
- GMount* _tmp23_ = NULL;
- GFile* _tmp24_;
- GMount* _tmp25_;
- GMount* _tmp26_;
+ GMount* _tmp20_ = NULL;
+ GFile* _tmp21_;
+ GMount* _tmp22_;
+ GMount* _tmp23_;
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = uri;
+ _tmp21_ = uri;
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = g_file_find_enclosing_mount (_tmp24_, NULL, &_inner_error_);
+ _tmp22_ = g_file_find_enclosing_mount (_tmp21_, NULL, &_inner_error_);
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = _tmp25_;
+ _tmp20_ = _tmp22_;
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7119 "ImportPage.c"
+#line 7526 "ImportPage.c"
goto __catch74_g_error;
}
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = _tmp23_;
+ _tmp23_ = _tmp20_;
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = NULL;
+ _tmp20_ = NULL;
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- mount = _tmp26_;
+ mount = _tmp23_;
#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp23_);
-#line 7132 "ImportPage.c"
+ _g_object_unref0 (_tmp20_);
+#line 7539 "ImportPage.c"
}
goto __finally74;
__catch74_g_error:
@@ -7141,7 +7548,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_inner_error_ = NULL;
#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 7144 "ImportPage.c"
+#line 7551 "ImportPage.c"
}
__finally74:
#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7156,141 +7563,138 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
g_clear_error (&_inner_error_);
#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 7159 "ImportPage.c"
+#line 7566 "ImportPage.c"
}
}
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = mount;
+ _tmp24_ = mount;
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp27_ != NULL) {
-#line 7166 "ImportPage.c"
+ if (_tmp24_ != NULL) {
+#line 7573 "ImportPage.c"
gchar* mounted_message = NULL;
- gchar* _tmp28_;
+ gchar* _tmp25_;
GtkMessageDialog* dialog = NULL;
- AppWindow* _tmp29_;
- AppWindow* _tmp30_;
- const gchar* _tmp31_;
+ AppWindow* _tmp26_;
+ AppWindow* _tmp27_;
+ const gchar* _tmp28_;
+ GtkMessageDialog* _tmp29_;
+ GtkMessageDialog* _tmp30_;
+ GtkMessageDialog* _tmp31_;
GtkMessageDialog* _tmp32_;
+ gint dialog_res = 0;
GtkMessageDialog* _tmp33_;
GtkMessageDialog* _tmp34_;
- GtkMessageDialog* _tmp35_;
- gint dialog_res = 0;
- GtkMessageDialog* _tmp36_;
- gint _tmp37_;
- GtkMessageDialog* _tmp38_;
- gint _tmp39_;
+ gint _tmp35_;
#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
+ _tmp25_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
"ccess it. Continue?"));
#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- mounted_message = _tmp28_;
+ mounted_message = _tmp25_;
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = app_window_get_instance ();
+ _tmp26_ = app_window_get_instance ();
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = _tmp29_;
+ _tmp27_ = _tmp26_;
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = mounted_message;
+ _tmp28_ = mounted_message;
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp31_);
+ _tmp29_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp28_);
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp32_);
+ g_object_ref_sink (_tmp29_);
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = _tmp32_;
+ _tmp30_ = _tmp29_;
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp30_);
+ _g_object_unref0 (_tmp27_);
#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog = _tmp33_;
+ dialog = _tmp30_;
#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = dialog;
+ _tmp31_ = dialog;
#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = dialog;
+ _tmp32_ = dialog;
#line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = dialog;
+ gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
+ _tmp33_ = dialog;
#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog_res = _tmp37_;
+ dialog_res = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_dialog_get_type (), GtkDialog));
#line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = dialog;
+ _tmp34_ = dialog;
#line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = dialog_res;
+ _tmp35_ = dialog_res;
#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp39_ != ((gint) GTK_RESPONSE_YES)) {
+ if (_tmp35_ != ((gint) GTK_RESPONSE_YES)) {
#line 1036 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please unmount the camera."));
-#line 7226 "ImportPage.c"
+#line 7630 "ImportPage.c"
} else {
- GMount* _tmp40_;
+ GMount* _tmp36_;
#line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = mount;
+ _tmp36_ = mount;
#line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_unmount_camera (self, _tmp40_);
-#line 7233 "ImportPage.c"
+ import_page_unmount_camera (self, _tmp36_);
+#line 7637 "ImportPage.c"
}
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dialog);
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (mounted_message);
-#line 7239 "ImportPage.c"
+#line 7643 "ImportPage.c"
} else {
gchar* locked_message = NULL;
- gchar* _tmp41_;
+ gchar* _tmp37_;
GtkMessageDialog* dialog = NULL;
- AppWindow* _tmp42_;
- AppWindow* _tmp43_;
- const gchar* _tmp44_;
+ AppWindow* _tmp38_;
+ AppWindow* _tmp39_;
+ const gchar* _tmp40_;
+ GtkMessageDialog* _tmp41_;
+ GtkMessageDialog* _tmp42_;
+ GtkMessageDialog* _tmp43_;
+ GtkMessageDialog* _tmp44_;
GtkMessageDialog* _tmp45_;
- GtkMessageDialog* _tmp46_;
- GtkMessageDialog* _tmp47_;
- GtkMessageDialog* _tmp48_;
- GtkMessageDialog* _tmp49_;
#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \
+ _tmp37_ = 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 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- locked_message = _tmp41_;
+ locked_message = _tmp37_;
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = app_window_get_instance ();
+ _tmp38_ = app_window_get_instance ();
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = _tmp42_;
+ _tmp39_ = _tmp38_;
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = locked_message;
+ _tmp40_ = locked_message;
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp44_);
+ _tmp41_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp40_);
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp45_);
+ g_object_ref_sink (_tmp41_);
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = _tmp45_;
+ _tmp42_ = _tmp41_;
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp43_);
+ _g_object_unref0 (_tmp39_);
#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- dialog = _tmp46_;
+ dialog = _tmp42_;
#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = dialog;
+ _tmp43_ = dialog;
#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
#line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = dialog;
+ _tmp44_ = dialog;
#line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_dialog_get_type (), GtkDialog));
+ gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_dialog_get_type (), GtkDialog));
#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = dialog;
+ _tmp45_ = dialog;
#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
#line 1051 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please close any other application using the camera."));
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (dialog);
#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (locked_message);
-#line 7290 "ImportPage.c"
+#line 7694 "ImportPage.c"
}
#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
@@ -7298,76 +7702,84 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
_g_object_unref0 (uri);
#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7298 "ImportPage.c"
+#line 7702 "ImportPage.c"
}
#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7302 "ImportPage.c"
+#line 7706 "ImportPage.c"
{
- gchar* _tmp50_;
- gchar* _tmp51_;
- gchar* _tmp52_;
- gchar* _tmp53_;
+ gchar* _tmp46_;
+ gchar* _tmp47_;
+ gchar* _tmp48_;
+ gchar* _tmp49_;
#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_page_get_refresh_message (self);
+ _tmp46_ = import_page_get_refresh_message (self);
#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = _tmp50_;
+ _tmp47_ = _tmp46_;
#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp51_);
+ _tmp48_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp47_);
#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = _tmp52_;
+ _tmp49_ = _tmp48_;
#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- app_window_error_message (_tmp53_, NULL);
+ app_window_error_message (_tmp49_, NULL);
#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp53_);
+ _g_free0 (_tmp49_);
#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp51_);
+ _g_free0 (_tmp47_);
#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7324 "ImportPage.c"
+#line 7728 "ImportPage.c"
}
default:
{
- ImportPageRefreshResult _tmp54_;
+ ImportPageRefreshResult _tmp50_;
#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = res;
+ _tmp50_ = res;
#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_error ("ImportPage.vala:1061: Unknown result type %d", (gint) _tmp54_);
-#line 7333 "ImportPage.c"
+ g_error ("ImportPage.vala:1061: Unknown result type %d", (gint) _tmp50_);
+#line 7737 "ImportPage.c"
}
}
}
-static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) {
+static void
+_import_page_on_unmounted_g_mount_unmounted (GMount* _sender,
+ gpointer self)
+{
#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 7342 "ImportPage.c"
+#line 7749 "ImportPage.c"
}
-static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
+static void
+_import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object,
+ GAsyncResult* res,
+ gpointer self)
+{
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_object_unref (self);
-#line 7351 "ImportPage.c"
+#line 7762 "ImportPage.c"
}
-gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
+gboolean
+import_page_unmount_camera (ImportPage* self,
+ GMount* mount)
+{
gboolean result = FALSE;
gboolean _tmp0_;
GtkProgressBar* _tmp1_;
GtkProgressBar* _tmp2_;
GtkProgressBar* _tmp3_;
GtkProgressBar* _tmp4_;
- GMount* _tmp5_;
- GMount* _tmp6_;
- AppWindow* _tmp7_;
- AppWindow* _tmp8_;
- GtkMountOperation* _tmp9_;
- GtkMountOperation* _tmp10_;
+ AppWindow* _tmp5_;
+ AppWindow* _tmp6_;
+ GtkMountOperation* _tmp7_;
+ GtkMountOperation* _tmp8_;
#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7380,7 +7792,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
result = FALSE;
#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7380 "ImportPage.c"
+#line 7792 "ImportPage.c"
}
#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, TRUE, FALSE);
@@ -7401,39 +7813,38 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
gtk_progress_bar_set_text (_tmp4_, _ ("Unmounting…"));
#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = mount;
-#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp5_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
+ g_signal_connect_object (mount, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_debug ("ImportPage.vala:1080: Unmounting camera…");
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = mount;
-#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = app_window_get_instance ();
-#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp5_ = app_window_get_instance ();
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
+ _tmp6_ = _tmp5_;
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp7_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow));
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_mount_unmount_with_operation (_tmp6_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
+ _tmp8_ = _tmp7_;
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp10_);
+ g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp8_);
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_object_unref0 (_tmp6_);
#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7426 "ImportPage.c"
+#line 7834 "ImportPage.c"
}
-static void import_page_on_unmount_finished (ImportPage* self, GObject* source, GAsyncResult* aresult) {
+static void
+import_page_on_unmount_finished (ImportPage* self,
+ GObject* source,
+ GAsyncResult* aresult)
+{
GMount* mount = NULL;
- GObject* _tmp0_;
- GMount* _tmp1_;
+ GMount* _tmp0_;
GError * _inner_error_ = NULL;
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
@@ -7444,21 +7855,16 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_debug ("ImportPage.vala:1088: Async unmount finished");
#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = source;
-#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount));
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, g_mount_get_type (), GMount));
#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- mount = _tmp1_;
-#line 7449 "ImportPage.c"
+ mount = _tmp0_;
+#line 7858 "ImportPage.c"
{
- GAsyncResult* _tmp2_;
#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = aresult;
-#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
+ g_mount_unmount_with_operation_finish (mount, aresult, &_inner_error_);
#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7458 "ImportPage.c"
+#line 7864 "ImportPage.c"
goto __catch75_g_error;
}
}
@@ -7466,11 +7872,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
__catch75_g_error:
{
GError* err = NULL;
- guint _tmp3_;
- gboolean _tmp4_;
+ guint _tmp1_;
+ gboolean _tmp2_;
+ GtkProgressBar* _tmp3_;
+ GtkProgressBar* _tmp4_;
GtkProgressBar* _tmp5_;
- GtkProgressBar* _tmp6_;
- GtkProgressBar* _tmp7_;
#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7478,28 +7884,28 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp1_, NULL, FALSE);
#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_handlers_disconnect_matched (mount, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _import_page_on_unmounted_g_mount_unmounted, self);
+ g_signal_handlers_disconnect_matched (mount, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _import_page_on_unmounted_g_mount_unmounted, self);
#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = self->priv->refreshed;
+ _tmp2_ = self->priv->refreshed;
#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, FALSE, _tmp4_);
+ import_page_update_status (self, FALSE, _tmp2_);
#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = self->priv->progress_bar;
+ _tmp3_ = self->priv->progress_bar;
#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp5_, PANGO_ELLIPSIZE_NONE);
+ gtk_progress_bar_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_NONE);
#line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = self->priv->progress_bar;
+ _tmp4_ = self->priv->progress_bar;
#line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp6_, "");
+ gtk_progress_bar_set_text (_tmp4_, "");
#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = self->priv->progress_bar;
+ _tmp5_ = self->priv->progress_bar;
#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 7499 "ImportPage.c"
+#line 7905 "ImportPage.c"
}
__finally75:
#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7512,15 +7918,18 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
g_clear_error (&_inner_error_);
#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 7512 "ImportPage.c"
+#line 7918 "ImportPage.c"
}
#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (mount);
-#line 7516 "ImportPage.c"
+#line 7922 "ImportPage.c"
}
-static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
+static void
+import_page_on_unmounted (ImportPage* self,
+ GMount* mount)
+{
gboolean _tmp0_;
GtkProgressBar* _tmp1_;
GtkProgressBar* _tmp2_;
@@ -7549,11 +7958,13 @@ 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 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_try_refreshing_camera (self, TRUE);
-#line 7549 "ImportPage.c"
+#line 7958 "ImportPage.c"
}
-static void import_page_clear_all_import_sources (ImportPage* self) {
+static void
+import_page_clear_all_import_sources (ImportPage* self)
+{
Marker* marker = NULL;
SourceCollection* _tmp0_;
Marker* _tmp1_;
@@ -7574,7 +7985,7 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
#line 1117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (marker);
-#line 7574 "ImportPage.c"
+#line 7985 "ImportPage.c"
}
@@ -7585,29 +7996,30 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
* @param dir The path to start searching from.
* @param search_target The name of the directory to look for.
*/
-static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid, const gchar* dir, const gchar* search_target) {
+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_;
const gchar* _tmp1_;
- gint _tmp2_;
- const gchar* _tmp3_;
- gchar* _tmp4_;
+ gchar* _tmp2_;
int _result_ = 0;
CameraList* folders = NULL;
- CameraList* _tmp5_ = NULL;
- int _tmp6_;
- int _tmp7_;
- Camera* _tmp8_;
- const gchar* _tmp9_;
- CameraList* _tmp10_;
- GPSpinIdleWrapper* _tmp11_;
- GPContext* _tmp12_;
- int _tmp13_;
- int _tmp14_;
+ CameraList* _tmp3_ = NULL;
+ int _tmp4_;
+ int _tmp5_;
+ Camera* _tmp6_;
+ const gchar* _tmp7_;
+ CameraList* _tmp8_;
+ GPSpinIdleWrapper* _tmp9_;
+ GPContext* _tmp10_;
+ int _tmp11_;
gint list_len = 0;
- CameraList* _tmp15_;
- gint _tmp16_;
+ CameraList* _tmp12_;
#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7619,25 +8031,21 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->camera_name;
#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = fsid;
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = dir;
+ _tmp2_ = import_page_get_fulldir (_tmp0_, _tmp1_, fsid, dir);
#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- fulldir = _tmp4_;
+ fulldir = _tmp2_;
#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = gp_list_new (&_tmp5_);
+ _tmp4_ = gp_list_new (&_tmp3_);
#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- folders = _tmp5_;
+ folders = _tmp3_;
#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _result_ = _tmp6_;
+ _result_ = _tmp4_;
#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _result_;
+ _tmp5_ = _result_;
#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp7_ != GP_OK) {
+ if (_tmp5_ != GP_OK) {
#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7646,26 +8054,24 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7646 "ImportPage.c"
+#line 8054 "ImportPage.c"
}
#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = self->priv->camera;
+ _tmp6_ = self->priv->camera;
#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = fulldir;
+ _tmp7_ = fulldir;
#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = folders;
+ _tmp8_ = folders;
#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = import_page_spin_idle_context;
+ _tmp9_ = import_page_spin_idle_context;
#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = gp_camera_folder_list_folders (_tmp8_, _tmp9_, _tmp10_, _tmp12_);
-#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _result_ = _tmp13_;
+ _result_ = gp_camera_folder_list_folders (_tmp6_, _tmp7_, _tmp8_, _tmp10_);
#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = _result_;
+ _tmp11_ = _result_;
#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp14_ != GP_OK) {
+ if (_tmp11_ != GP_OK) {
#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7674,76 +8080,71 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7674 "ImportPage.c"
+#line 8080 "ImportPage.c"
}
#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = folders;
-#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = gp_list_count (_tmp15_);
+ _tmp12_ = folders;
#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- list_len = _tmp16_;
-#line 7682 "ImportPage.c"
+ list_len = gp_list_count (_tmp12_);
+#line 8086 "ImportPage.c"
{
gint list_index = 0;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
list_index = 0;
-#line 7687 "ImportPage.c"
+#line 8091 "ImportPage.c"
{
- gboolean _tmp17_ = FALSE;
+ gboolean _tmp13_ = FALSE;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = TRUE;
+ _tmp13_ = TRUE;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 7694 "ImportPage.c"
- gint _tmp19_;
- gint _tmp20_;
+#line 8098 "ImportPage.c"
+ gint _tmp15_;
+ gint _tmp16_;
gchar* tmp = NULL;
- CameraList* _tmp21_;
- gint _tmp22_;
- const gchar* _tmp23_ = NULL;
- gchar* _tmp24_;
- const gchar* _tmp25_;
- const gchar* _tmp26_;
+ CameraList* _tmp17_;
+ gint _tmp18_;
+ const gchar* _tmp19_ = NULL;
+ gchar* _tmp20_;
+ const gchar* _tmp21_;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp17_) {
-#line 7706 "ImportPage.c"
- gint _tmp18_;
+ if (!_tmp13_) {
+#line 8109 "ImportPage.c"
+ gint _tmp14_;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = list_index;
+ _tmp14_ = list_index;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- list_index = _tmp18_ + 1;
-#line 7712 "ImportPage.c"
+ list_index = _tmp14_ + 1;
+#line 8115 "ImportPage.c"
}
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = FALSE;
+ _tmp13_ = FALSE;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = list_index;
+ _tmp15_ = list_index;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = list_len;
+ _tmp16_ = list_len;
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp19_ < _tmp20_)) {
+ if (!(_tmp15_ < _tmp16_)) {
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 7724 "ImportPage.c"
+#line 8127 "ImportPage.c"
}
#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = folders;
+ _tmp17_ = folders;
#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = list_index;
+ _tmp18_ = list_index;
#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gp_list_get_name (_tmp21_, _tmp22_, &_tmp23_);
+ gp_list_get_name (_tmp17_, _tmp18_, &_tmp19_);
#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (tmp);
#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = g_strdup (_tmp23_);
+ _tmp20_ = g_strdup (_tmp19_);
#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- tmp = _tmp24_;
+ tmp = _tmp20_;
#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = tmp;
+ _tmp21_ = tmp;
#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = search_target;
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (g_strcmp0 (_tmp25_, _tmp26_) == 0) {
+ if (g_strcmp0 (_tmp21_, search_target) == 0) {
#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7754,11 +8155,11 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7754 "ImportPage.c"
+#line 8155 "ImportPage.c"
}
#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (tmp);
-#line 7758 "ImportPage.c"
+#line 8159 "ImportPage.c"
}
}
}
@@ -7770,11 +8171,13 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
_g_free0 (fulldir);
#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7770 "ImportPage.c"
+#line 8171 "ImportPage.c"
}
-static gboolean ____lambda18_ (ImportPage* self) {
+static gboolean
+____lambda18_ (ImportPage* self)
+{
gboolean result = FALSE;
#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_refresh_camera (self);
@@ -7782,20 +8185,24 @@ static gboolean ____lambda18_ (ImportPage* self) {
result = FALSE;
#line 1181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7782 "ImportPage.c"
+#line 8185 "ImportPage.c"
}
-static gboolean _____lambda18__gsource_func (gpointer self) {
+static gboolean
+_____lambda18__gsource_func (gpointer self)
+{
gboolean result;
result = ____lambda18_ ((ImportPage*) self);
#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7791 "ImportPage.c"
+#line 8196 "ImportPage.c"
}
-static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
+static ImportPageRefreshResult
+import_page_refresh_camera (ImportPage* self)
+{
ImportPageRefreshResult result = 0;
gboolean _tmp0_;
gboolean _tmp1_;
@@ -7803,38 +8210,36 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
GPSpinIdleWrapper* _tmp3_;
GPContext* _tmp4_;
int _tmp5_;
- int _tmp6_;
- int _tmp10_;
- gboolean _tmp16_;
+ int _tmp9_;
+ gboolean _tmp15_;
+ GtkProgressBar* _tmp16_;
GtkProgressBar* _tmp17_;
GtkProgressBar* _tmp18_;
GtkProgressBar* _tmp19_;
GtkProgressBar* _tmp20_;
- GtkProgressBar* _tmp21_;
GeeArrayList* import_list = NULL;
- GeeArrayList* _tmp22_;
+ GeeArrayList* _tmp21_;
CameraStorageInformation* sifs = NULL;
gint count = 0;
- Camera* _tmp23_;
- GPSpinIdleWrapper* _tmp24_;
- GPContext* _tmp25_;
- gint _tmp26_ = 0;
+ Camera* _tmp22_;
+ GPSpinIdleWrapper* _tmp23_;
+ GPContext* _tmp24_;
+ gint _tmp25_ = 0;
+ int _tmp26_;
int _tmp27_;
- int _tmp28_;
- GeeArrayList* _tmp77_;
- GeeArrayList* _tmp78_;
- GtkProgressBar* _tmp79_;
- GtkProgressBar* _tmp80_;
- GtkProgressBar* _tmp81_;
- GtkProgressBar* _tmp82_;
+ GeeArrayList* _tmp65_;
+ GeeArrayList* _tmp66_;
+ GtkProgressBar* _tmp67_;
+ GtkProgressBar* _tmp68_;
+ GtkProgressBar* _tmp69_;
+ GtkProgressBar* _tmp70_;
int res = 0;
- Camera* _tmp83_;
- GPSpinIdleWrapper* _tmp84_;
- GPContext* _tmp85_;
- int _tmp86_;
- int _tmp87_;
- int _tmp91_;
- int _tmp96_;
+ Camera* _tmp71_;
+ GPSpinIdleWrapper* _tmp72_;
+ GPContext* _tmp73_;
+ int _tmp74_;
+ int _tmp78_;
+ int _tmp82_;
#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), 0);
#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7845,7 +8250,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7845 "ImportPage.c"
+#line 8250 "ImportPage.c"
}
#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Connecting to camera, please wait…"));
@@ -7864,399 +8269,364 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = gp_camera_init (_tmp2_, _tmp4_);
-#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp5_;
+ self->priv->refresh_result = gp_camera_init (_tmp2_, _tmp4_);
#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = self->priv->refresh_result;
+ _tmp5_ = self->priv->refresh_result;
#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp6_ == GP_ERROR_IO_USB_CLAIM) {
-#line 7871 "ImportPage.c"
- gint _tmp7_;
+ if (_tmp5_ == GP_ERROR_IO_USB_CLAIM) {
+#line 8274 "ImportPage.c"
+ gint _tmp6_;
#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = self->priv->claim_timeout;
+ _tmp6_ = self->priv->claim_timeout;
#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp7_ < 4000) {
-#line 7877 "ImportPage.c"
+ if (_tmp6_ < 4000) {
+#line 8280 "ImportPage.c"
+ gint _tmp7_;
gint _tmp8_;
- gint _tmp9_;
#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = self->priv->claim_timeout;
+ _tmp7_ = self->priv->claim_timeout;
#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp8_, _____lambda18__gsource_func, g_object_ref (self), g_object_unref);
+ g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp7_, _____lambda18__gsource_func, g_object_ref (self), g_object_unref);
#line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = self->priv->claim_timeout;
+ _tmp8_ = self->priv->claim_timeout;
#line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->claim_timeout = _tmp9_ * 2;
+ self->priv->claim_timeout = _tmp8_ * 2;
#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7892 "ImportPage.c"
+#line 8295 "ImportPage.c"
}
}
#line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->claim_timeout = 500;
#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = self->priv->refresh_result;
+ _tmp9_ = self->priv->refresh_result;
#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp10_ != GP_OK) {
-#line 7901 "ImportPage.c"
- int _tmp11_;
+ if (_tmp9_ != GP_OK) {
+#line 8304 "ImportPage.c"
+ int _tmp10_;
+ gchar* _tmp11_;
gchar* _tmp12_;
- gchar* _tmp13_;
- ImportPageRefreshResult _tmp14_ = 0;
- int _tmp15_;
+ ImportPageRefreshResult _tmp13_ = 0;
+ int _tmp14_;
#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = self->priv->refresh_result;
+ _tmp10_ = self->priv->refresh_result;
#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = gp_result_to_full_string (_tmp11_);
+ _tmp11_ = gp_result_to_full_string (_tmp10_);
#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1193: Unable to initialize camera: %s", _tmp13_);
+ g_warning ("ImportPage.vala:1193: Unable to initialize camera: %s", _tmp12_);
#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp13_);
+ _g_free0 (_tmp12_);
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = self->priv->refresh_result;
+ _tmp14_ = self->priv->refresh_result;
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp15_ == GP_ERROR_IO_LOCK) {
+ if (_tmp14_ == GP_ERROR_IO_LOCK) {
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7923 "ImportPage.c"
+ _tmp13_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
+#line 8326 "ImportPage.c"
} else {
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7927 "ImportPage.c"
+ _tmp13_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
+#line 8330 "ImportPage.c"
}
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp14_;
+ result = _tmp13_;
#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 7933 "ImportPage.c"
+#line 8336 "ImportPage.c"
}
#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Starting import, please wait…"));
#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = self->priv->refreshed;
+ _tmp15_ = self->priv->refreshed;
#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, TRUE, _tmp16_);
+ import_page_update_status (self, TRUE, _tmp15_);
#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = self->priv->progress_bar;
+ _tmp16_ = self->priv->progress_bar;
#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp17_, PANGO_ELLIPSIZE_NONE);
+ gtk_progress_bar_set_ellipsize (_tmp16_, PANGO_ELLIPSIZE_NONE);
#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = self->priv->progress_bar;
+ _tmp17_ = self->priv->progress_bar;
#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp18_, _ ("Fetching photo information"));
+ gtk_progress_bar_set_text (_tmp17_, _ ("Fetching photo information"));
#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = self->priv->progress_bar;
+ _tmp18_ = self->priv->progress_bar;
#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp19_, 0.0);
+ gtk_progress_bar_set_fraction (_tmp18_, 0.0);
#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = self->priv->progress_bar;
+ _tmp19_ = self->priv->progress_bar;
#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_pulse_step (_tmp20_, 0.01);
+ gtk_progress_bar_set_pulse_step (_tmp19_, 0.01);
#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = self->priv->progress_bar;
+ _tmp20_ = self->priv->progress_bar;
#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+ _tmp21_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_list = _tmp22_;
+ import_list = _tmp21_;
#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
sifs = NULL;
#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
count = 0;
#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = self->priv->camera;
+ _tmp22_ = self->priv->camera;
#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = import_page_spin_idle_context;
+ _tmp23_ = import_page_spin_idle_context;
#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = gp_camera_get_storageinfo (_tmp23_, &sifs, &_tmp26_, _tmp25_);
+ _tmp26_ = gp_camera_get_storageinfo (_tmp22_, &sifs, &_tmp25_, _tmp24_);
#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- count = _tmp26_;
+ count = _tmp25_;
#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp27_;
+ self->priv->refresh_result = _tmp26_;
#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = self->priv->refresh_result;
+ _tmp27_ = self->priv->refresh_result;
#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp28_ == GP_OK) {
-#line 7987 "ImportPage.c"
+ if (_tmp27_ == GP_OK) {
+#line 8390 "ImportPage.c"
{
gint fsid = 0;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
fsid = 0;
-#line 7992 "ImportPage.c"
+#line 8395 "ImportPage.c"
{
- gboolean _tmp29_ = FALSE;
+ gboolean _tmp28_ = FALSE;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = TRUE;
+ _tmp28_ = TRUE;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 7999 "ImportPage.c"
+#line 8402 "ImportPage.c"
+ gint _tmp30_;
gint _tmp31_;
- gint _tmp32_;
gboolean got_well_known_dir = FALSE;
- gint _tmp33_;
- gboolean _tmp34_;
- gint _tmp37_;
- gboolean _tmp38_;
+ gint _tmp32_;
+ gint _tmp35_;
+ gint _tmp38_;
gint _tmp41_;
- gboolean _tmp42_;
- gint _tmp45_;
- gboolean _tmp46_;
- gint _tmp49_;
- gboolean _tmp50_;
+ gint _tmp44_;
+ gint _tmp47_;
+ gint _tmp50_;
gint _tmp53_;
- gboolean _tmp54_;
- gint _tmp57_;
- gboolean _tmp58_;
- gint _tmp61_;
+ gint _tmp56_;
+ gint _tmp59_;
gboolean _tmp62_;
- gint _tmp65_;
- gboolean _tmp66_;
- gint _tmp69_;
- gboolean _tmp70_;
- gboolean _tmp73_;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp29_) {
-#line 8026 "ImportPage.c"
- gint _tmp30_;
+ if (!_tmp28_) {
+#line 8419 "ImportPage.c"
+ gint _tmp29_;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = fsid;
+ _tmp29_ = fsid;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- fsid = _tmp30_ + 1;
-#line 8032 "ImportPage.c"
+ fsid = _tmp29_ + 1;
+#line 8425 "ImportPage.c"
}
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = FALSE;
+ _tmp28_ = FALSE;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = fsid;
+ _tmp30_ = fsid;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = count;
+ _tmp31_ = count;
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp31_ < _tmp32_)) {
+ if (!(_tmp30_ < _tmp31_)) {
#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 8044 "ImportPage.c"
+#line 8437 "ImportPage.c"
}
#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = FALSE;
#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = fsid;
-#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "DCIM");
+ _tmp32_ = fsid;
#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp34_) {
-#line 8054 "ImportPage.c"
- gint _tmp35_;
- GeeArrayList* _tmp36_;
+ if (import_page_check_directory_exists (self, _tmp32_, "/", "DCIM")) {
+#line 8445 "ImportPage.c"
+ gint _tmp33_;
+ GeeArrayList* _tmp34_;
#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = fsid;
+ _tmp33_ = fsid;
#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = import_list;
+ _tmp34_ = import_list;
#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp35_, "/DCIM", _tmp36_);
+ import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8065 "ImportPage.c"
+#line 8456 "ImportPage.c"
}
#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = fsid;
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/", "dcim");
+ _tmp35_ = fsid;
#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp38_) {
-#line 8073 "ImportPage.c"
- gint _tmp39_;
- GeeArrayList* _tmp40_;
+ if (import_page_check_directory_exists (self, _tmp35_, "/", "dcim")) {
+#line 8462 "ImportPage.c"
+ gint _tmp36_;
+ GeeArrayList* _tmp37_;
#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = fsid;
+ _tmp36_ = fsid;
#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = import_list;
+ _tmp37_ = import_list;
#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp39_, "/dcim", _tmp40_);
+ import_page_enumerate_files (self, _tmp36_, "/dcim", _tmp37_);
#line 1228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8084 "ImportPage.c"
+#line 8473 "ImportPage.c"
}
#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = fsid;
-#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/PRIVATE/", "AVCHD");
+ _tmp38_ = fsid;
#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp42_) {
-#line 8092 "ImportPage.c"
- gint _tmp43_;
- GeeArrayList* _tmp44_;
+ if (import_page_check_directory_exists (self, _tmp38_, "/PRIVATE/", "AVCHD")) {
+#line 8479 "ImportPage.c"
+ gint _tmp39_;
+ GeeArrayList* _tmp40_;
#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = fsid;
+ _tmp39_ = fsid;
#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = import_list;
+ _tmp40_ = import_list;
#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp43_, "/PRIVATE/AVCHD", _tmp44_);
+ import_page_enumerate_files (self, _tmp39_, "/PRIVATE/AVCHD", _tmp40_);
#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8103 "ImportPage.c"
+#line 8490 "ImportPage.c"
}
#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = fsid;
-#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/private/", "avchd");
+ _tmp41_ = fsid;
#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp46_) {
-#line 8111 "ImportPage.c"
- gint _tmp47_;
- GeeArrayList* _tmp48_;
+ if (import_page_check_directory_exists (self, _tmp41_, "/private/", "avchd")) {
+#line 8496 "ImportPage.c"
+ gint _tmp42_;
+ GeeArrayList* _tmp43_;
#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = fsid;
+ _tmp42_ = fsid;
#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = import_list;
+ _tmp43_ = import_list;
#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp47_, "/private/avchd", _tmp48_);
+ import_page_enumerate_files (self, _tmp42_, "/private/avchd", _tmp43_);
#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8122 "ImportPage.c"
+#line 8507 "ImportPage.c"
}
#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = fsid;
+ _tmp44_ = fsid;
#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "AVCHD");
-#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp50_) {
-#line 8130 "ImportPage.c"
- gint _tmp51_;
- GeeArrayList* _tmp52_;
+ if (import_page_check_directory_exists (self, _tmp44_, "/", "AVCHD")) {
+#line 8513 "ImportPage.c"
+ gint _tmp45_;
+ GeeArrayList* _tmp46_;
#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = fsid;
+ _tmp45_ = fsid;
#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = import_list;
+ _tmp46_ = import_list;
#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp51_, "/AVCHD", _tmp52_);
+ import_page_enumerate_files (self, _tmp45_, "/AVCHD", _tmp46_);
#line 1243 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8141 "ImportPage.c"
+#line 8524 "ImportPage.c"
}
#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = fsid;
-#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/", "avchd");
+ _tmp47_ = fsid;
#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp54_) {
-#line 8149 "ImportPage.c"
- gint _tmp55_;
- GeeArrayList* _tmp56_;
+ if (import_page_check_directory_exists (self, _tmp47_, "/", "avchd")) {
+#line 8530 "ImportPage.c"
+ gint _tmp48_;
+ GeeArrayList* _tmp49_;
#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = fsid;
+ _tmp48_ = fsid;
#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = import_list;
+ _tmp49_ = import_list;
#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp55_, "/avchd", _tmp56_);
+ import_page_enumerate_files (self, _tmp48_, "/avchd", _tmp49_);
#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8160 "ImportPage.c"
+#line 8541 "ImportPage.c"
}
#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = fsid;
-#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/PRIVATE/", "SONY");
+ _tmp50_ = fsid;
#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp58_) {
-#line 8168 "ImportPage.c"
- gint _tmp59_;
- GeeArrayList* _tmp60_;
+ if (import_page_check_directory_exists (self, _tmp50_, "/PRIVATE/", "SONY")) {
+#line 8547 "ImportPage.c"
+ gint _tmp51_;
+ GeeArrayList* _tmp52_;
#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = fsid;
+ _tmp51_ = fsid;
#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = import_list;
+ _tmp52_ = import_list;
#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp59_, "/PRIVATE/SONY", _tmp60_);
+ import_page_enumerate_files (self, _tmp51_, "/PRIVATE/SONY", _tmp52_);
#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8179 "ImportPage.c"
+#line 8558 "ImportPage.c"
}
#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = fsid;
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/private/", "sony");
+ _tmp53_ = fsid;
#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp62_) {
-#line 8187 "ImportPage.c"
- gint _tmp63_;
- GeeArrayList* _tmp64_;
+ if (import_page_check_directory_exists (self, _tmp53_, "/private/", "sony")) {
+#line 8564 "ImportPage.c"
+ gint _tmp54_;
+ GeeArrayList* _tmp55_;
#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = fsid;
+ _tmp54_ = fsid;
#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = import_list;
+ _tmp55_ = import_list;
#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp63_, "/private/sony", _tmp64_);
+ import_page_enumerate_files (self, _tmp54_, "/private/sony", _tmp55_);
#line 1258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8198 "ImportPage.c"
+#line 8575 "ImportPage.c"
}
#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = fsid;
-#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "MP_ROOT");
+ _tmp56_ = fsid;
#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp66_) {
-#line 8206 "ImportPage.c"
- gint _tmp67_;
- GeeArrayList* _tmp68_;
+ if (import_page_check_directory_exists (self, _tmp56_, "/", "MP_ROOT")) {
+#line 8581 "ImportPage.c"
+ gint _tmp57_;
+ GeeArrayList* _tmp58_;
#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = fsid;
+ _tmp57_ = fsid;
#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = import_list;
+ _tmp58_ = import_list;
#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp67_, "/MP_ROOT", _tmp68_);
+ import_page_enumerate_files (self, _tmp57_, "/MP_ROOT", _tmp58_);
#line 1264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8217 "ImportPage.c"
+#line 8592 "ImportPage.c"
}
#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = fsid;
+ _tmp59_ = fsid;
#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = import_page_check_directory_exists (self, _tmp69_, "/", "mp_root");
-#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp70_) {
-#line 8225 "ImportPage.c"
- gint _tmp71_;
- GeeArrayList* _tmp72_;
+ if (import_page_check_directory_exists (self, _tmp59_, "/", "mp_root")) {
+#line 8598 "ImportPage.c"
+ gint _tmp60_;
+ GeeArrayList* _tmp61_;
#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = fsid;
+ _tmp60_ = fsid;
#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = import_list;
+ _tmp61_ = import_list;
#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_enumerate_files (self, _tmp71_, "/mp_root", _tmp72_);
+ import_page_enumerate_files (self, _tmp60_, "/mp_root", _tmp61_);
#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
got_well_known_dir = TRUE;
-#line 8236 "ImportPage.c"
+#line 8609 "ImportPage.c"
}
#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = got_well_known_dir;
+ _tmp62_ = got_well_known_dir;
#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp73_) {
-#line 8242 "ImportPage.c"
- gint _tmp74_;
- GeeArrayList* _tmp75_;
- gboolean _tmp76_;
-#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = fsid;
+ if (!_tmp62_) {
+#line 8615 "ImportPage.c"
+ gint _tmp63_;
+ GeeArrayList* _tmp64_;
#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = import_list;
+ _tmp63_ = fsid;
#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = import_page_enumerate_files (self, _tmp74_, "/", _tmp75_);
+ _tmp64_ = import_list;
#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp76_) {
+ if (!import_page_enumerate_files (self, _tmp63_, "/", _tmp64_)) {
#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 8256 "ImportPage.c"
+#line 8626 "ImportPage.c"
}
}
}
@@ -8266,104 +8636,99 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
#line 1280 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_clear_all_import_sources (self);
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = import_list;
+ _tmp65_ = import_list;
#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_auto_match_raw_jpeg (self, _tmp77_);
+ import_page_auto_match_raw_jpeg (self, _tmp65_);
#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = import_list;
+ _tmp66_ = import_list;
#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList));
+ import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_LIST, GeeList));
#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = self->priv->progress_bar;
+ _tmp67_ = self->priv->progress_bar;
#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = self->priv->progress_bar;
+ _tmp68_ = self->priv->progress_bar;
#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp80_, PANGO_ELLIPSIZE_NONE);
+ gtk_progress_bar_set_ellipsize (_tmp68_, PANGO_ELLIPSIZE_NONE);
#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = self->priv->progress_bar;
+ _tmp69_ = self->priv->progress_bar;
#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp81_, "");
+ gtk_progress_bar_set_text (_tmp69_, "");
#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = self->priv->progress_bar;
+ _tmp70_ = self->priv->progress_bar;
#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp82_, 0.0);
+ gtk_progress_bar_set_fraction (_tmp70_, 0.0);
#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = self->priv->camera;
+ _tmp71_ = self->priv->camera;
#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = import_page_spin_idle_context;
+ _tmp72_ = import_page_spin_idle_context;
#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp73_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = gp_camera_exit (_tmp83_, _tmp85_);
-#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp86_;
+ res = gp_camera_exit (_tmp71_, _tmp73_);
#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = res;
+ _tmp74_ = res;
#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp87_ != GP_OK) {
-#line 8303 "ImportPage.c"
- int _tmp88_;
- gchar* _tmp89_;
- gchar* _tmp90_;
+ if (_tmp74_ != GP_OK) {
+#line 8671 "ImportPage.c"
+ int _tmp75_;
+ gchar* _tmp76_;
+ gchar* _tmp77_;
#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = res;
+ _tmp75_ = res;
#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = gp_result_to_full_string (_tmp88_);
+ _tmp76_ = gp_result_to_full_string (_tmp75_);
#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = _tmp89_;
+ _tmp77_ = _tmp76_;
#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1305: Unable to unlock camera: %s", _tmp90_);
+ g_warning ("ImportPage.vala:1305: Unable to unlock camera: %s", _tmp77_);
#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp90_);
-#line 8317 "ImportPage.c"
+ _g_free0 (_tmp77_);
+#line 8685 "ImportPage.c"
}
#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = self->priv->refresh_result;
+ _tmp78_ = self->priv->refresh_result;
#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp91_ == GP_OK) {
-#line 8323 "ImportPage.c"
- SourceCollection* _tmp92_;
- gint _tmp93_;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = self->priv->import_sources;
+ if (_tmp78_ == GP_OK) {
+#line 8691 "ImportPage.c"
+ SourceCollection* _tmp79_;
#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp79_ = self->priv->import_sources;
#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp93_ == 0) {
-#line 8332 "ImportPage.c"
- gchar* _tmp94_;
- gchar* _tmp95_;
+ if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_DATA_COLLECTION, DataCollection)) == 0) {
+#line 8697 "ImportPage.c"
+ gchar* _tmp80_;
+ gchar* _tmp81_;
#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+ _tmp80_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp95_ = _tmp94_;
+ _tmp81_ = _tmp80_;
#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp95_);
+ checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp81_);
#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp95_);
-#line 8343 "ImportPage.c"
+ _g_free0 (_tmp81_);
+#line 8708 "ImportPage.c"
}
#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, TRUE);
-#line 8347 "ImportPage.c"
+#line 8712 "ImportPage.c"
} else {
#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_update_status (self, FALSE, FALSE);
#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_clear_all_import_sources (self);
-#line 8353 "ImportPage.c"
+#line 8718 "ImportPage.c"
}
#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp96_ = self->priv->refresh_result;
+ _tmp82_ = self->priv->refresh_result;
#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- switch (_tmp96_) {
+ switch (_tmp82_) {
#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_OK:
-#line 8363 "ImportPage.c"
+#line 8728 "ImportPage.c"
{
#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_OK;
@@ -8371,11 +8736,11 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_g_object_unref0 (import_list);
#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8371 "ImportPage.c"
+#line 8736 "ImportPage.c"
}
#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
case GP_ERROR_IO_LOCK:
-#line 8375 "ImportPage.c"
+#line 8740 "ImportPage.c"
{
#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
@@ -8383,7 +8748,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_g_object_unref0 (import_list);
#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8383 "ImportPage.c"
+#line 8748 "ImportPage.c"
}
default:
{
@@ -8393,378 +8758,290 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
_g_object_unref0 (import_list);
#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8393 "ImportPage.c"
+#line 8758 "ImportPage.c"
}
}
#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_list);
-#line 8398 "ImportPage.c"
+#line 8763 "ImportPage.c"
}
-static gchar string_get (const gchar* self, glong index) {
+static gchar
+string_get (const gchar* self,
+ glong index)
+{
gchar result = '\0';
- glong _tmp0_;
- gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar _tmp0_;
+#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = ((gchar*) self)[index];
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_;
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 8416 "ImportPage.c"
+#line 8781 "ImportPage.c"
}
-static gchar* string_slice (const gchar* self, glong start, glong end) {
+static gchar*
+string_slice (const gchar* self,
+ glong start,
+ glong end)
+{
gchar* result = NULL;
glong string_length = 0L;
gint _tmp0_;
gint _tmp1_;
- glong _tmp2_;
- glong _tmp5_;
- gboolean _tmp8_ = FALSE;
- glong _tmp9_;
- gboolean _tmp12_ = FALSE;
- 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"
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp6_ = FALSE;
+ gchar* _tmp8_;
+#line 1369 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1370 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = start;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp2_ < ((glong) 0)) {
-#line 8449 "ImportPage.c"
+#line 1371 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start < ((glong) 0)) {
+#line 8807 "ImportPage.c"
+ glong _tmp2_;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = string_length;
+#line 1372 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ start = _tmp2_ + start;
+#line 8813 "ImportPage.c"
+ }
+#line 1374 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end < ((glong) 0)) {
+#line 8817 "ImportPage.c"
glong _tmp3_;
- glong _tmp4_;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = start;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- start = _tmp3_ + _tmp4_;
-#line 8458 "ImportPage.c"
- }
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp5_ < ((glong) 0)) {
-#line 8464 "ImportPage.c"
- glong _tmp6_;
- glong _tmp7_;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = string_length;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = end;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp6_ + _tmp7_;
-#line 8473 "ImportPage.c"
+#line 1375 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp3_ + end;
+#line 8823 "ImportPage.c"
}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp9_ >= ((glong) 0)) {
-#line 8479 "ImportPage.c"
- glong _tmp10_;
- glong _tmp11_;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = string_length;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp10_ <= _tmp11_;
-#line 8488 "ImportPage.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (start >= ((glong) 0)) {
+#line 8827 "ImportPage.c"
+ glong _tmp5_;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = start <= _tmp5_;
+#line 8833 "ImportPage.c"
} else {
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = FALSE;
-#line 8492 "ImportPage.c"
- }
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp8_, NULL);
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp13_ >= ((glong) 0)) {
-#line 8500 "ImportPage.c"
- glong _tmp14_;
- glong _tmp15_;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = _tmp14_ <= _tmp15_;
-#line 8509 "ImportPage.c"
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = FALSE;
+#line 8837 "ImportPage.c"
+ }
+#line 1377 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp4_, NULL);
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (end >= ((glong) 0)) {
+#line 8843 "ImportPage.c"
+ glong _tmp7_;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = string_length;
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = end <= _tmp7_;
+#line 8849 "ImportPage.c"
} else {
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = FALSE;
-#line 8513 "ImportPage.c"
- }
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_, NULL);
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = start;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = end;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = end;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp21_;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = FALSE;
+#line 8853 "ImportPage.c"
+ }
+#line 1378 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (_tmp6_, NULL);
+#line 1379 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (start <= end, NULL);
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = g_strndup (((gchar*) self) + start, (gsize) (end - start));
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp8_;
+#line 1380 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 8535 "ImportPage.c"
+#line 8865 "ImportPage.c"
}
-static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
+static gchar*
+import_page_chomp_ch (const gchar* str,
+ gchar ch)
+{
gchar* result = NULL;
glong offset = 0L;
- const gchar* _tmp0_;
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
- gchar* _tmp12_;
+ gchar* _tmp7_;
#line 1334 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (str != NULL, NULL);
#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = str;
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = strlen (_tmp0_);
+ _tmp0_ = strlen (str);
#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- offset = (glong) _tmp2_;
+ offset = (glong) _tmp1_;
#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 8558 "ImportPage.c"
+#line 8888 "ImportPage.c"
+ glong _tmp2_;
glong _tmp3_;
glong _tmp4_;
- const gchar* _tmp5_;
- glong _tmp6_;
- gchar _tmp7_;
- gchar _tmp8_;
#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = offset;
+ _tmp2_ = offset;
#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- offset = _tmp3_ - 1;
+ offset = _tmp2_ - 1;
#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = offset;
+ _tmp3_ = offset;
#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp4_ >= ((glong) 0))) {
+ if (!(_tmp3_ >= ((glong) 0))) {
#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 8575 "ImportPage.c"
+#line 8902 "ImportPage.c"
}
#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = str;
-#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = offset;
-#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = string_get (_tmp5_, _tmp6_);
-#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = ch;
+ _tmp4_ = offset;
#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp7_ != _tmp8_) {
-#line 8587 "ImportPage.c"
- const gchar* _tmp9_;
- glong _tmp10_;
- gchar* _tmp11_;
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = str;
+ if (string_get (str, _tmp4_) != ch) {
+#line 8908 "ImportPage.c"
+ glong _tmp5_;
+ gchar* _tmp6_;
#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = offset;
+ _tmp5_ = offset;
#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = string_slice (_tmp9_, (glong) 0, _tmp10_);
+ _tmp6_ = string_slice (str, (glong) 0, _tmp5_);
#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp11_;
+ result = _tmp6_;
#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8601 "ImportPage.c"
+#line 8919 "ImportPage.c"
}
}
#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = g_strdup ("");
+ _tmp7_ = g_strdup ("");
#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp12_;
+ result = _tmp7_;
#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8610 "ImportPage.c"
+#line 8928 "ImportPage.c"
}
-gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
+gchar*
+import_page_append_path (const gchar* basepath,
+ const gchar* addition)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
- const gchar* _tmp1_;
- gboolean _tmp2_;
#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (basepath != NULL, NULL);
#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (addition != NULL, NULL);
#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = basepath;
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = g_str_has_suffix (_tmp1_, "/");
+ if (!g_str_has_suffix (basepath, "/")) {
#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp2_) {
-#line 8629 "ImportPage.c"
- const gchar* _tmp3_;
- gboolean _tmp4_;
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = addition;
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = g_str_has_prefix (_tmp3_, "/");
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = !_tmp4_;
-#line 8638 "ImportPage.c"
+ _tmp0_ = !g_str_has_prefix (addition, "/");
+#line 8946 "ImportPage.c"
} else {
#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
-#line 8642 "ImportPage.c"
+#line 8950 "ImportPage.c"
}
#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
-#line 8646 "ImportPage.c"
- const gchar* _tmp5_;
- gchar* _tmp6_;
- gchar* _tmp7_;
- const gchar* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = basepath;
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = g_strconcat (_tmp5_, "/", NULL);
+#line 8954 "ImportPage.c"
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp1_ = g_strconcat (basepath, "/", NULL);
#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = addition;
+ _tmp2_ = _tmp1_;
#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL);
+ _tmp3_ = g_strconcat (_tmp2_, addition, NULL);
#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp4_ = _tmp3_;
#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp2_);
#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp10_;
+ result = _tmp4_;
#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8671 "ImportPage.c"
+#line 8973 "ImportPage.c"
} else {
- gboolean _tmp11_ = FALSE;
- const gchar* _tmp12_;
- gboolean _tmp13_;
+ gboolean _tmp5_ = FALSE;
#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = basepath;
+ if (g_str_has_suffix (basepath, "/")) {
#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp13_) {
-#line 8682 "ImportPage.c"
- const gchar* _tmp14_;
- gboolean _tmp15_;
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = addition;
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = g_str_has_prefix (_tmp14_, "/");
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp15_;
-#line 8691 "ImportPage.c"
+ _tmp5_ = g_str_has_prefix (addition, "/");
+#line 8980 "ImportPage.c"
} else {
#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = FALSE;
-#line 8695 "ImportPage.c"
+ _tmp5_ = FALSE;
+#line 8984 "ImportPage.c"
}
#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp11_) {
-#line 8699 "ImportPage.c"
- const gchar* _tmp16_;
- gchar* _tmp17_;
- gchar* _tmp18_;
- const gchar* _tmp19_;
- gchar* _tmp20_;
- gchar* _tmp21_;
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = basepath;
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = import_page_chomp_ch (_tmp16_, '/');
+ if (_tmp5_) {
+#line 8988 "ImportPage.c"
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = _tmp17_;
+ _tmp6_ = import_page_chomp_ch (basepath, '/');
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = addition;
+ _tmp7_ = _tmp6_;
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
+ _tmp8_ = g_strconcat (_tmp7_, addition, NULL);
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = _tmp20_;
+ _tmp9_ = _tmp8_;
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp7_);
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp21_;
+ result = _tmp9_;
#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8724 "ImportPage.c"
+#line 9007 "ImportPage.c"
} else {
- const gchar* _tmp22_;
- const gchar* _tmp23_;
- gchar* _tmp24_;
+ gchar* _tmp10_;
#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = basepath;
+ _tmp10_ = g_strconcat (basepath, addition, NULL);
#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = addition;
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp24_;
+ result = _tmp10_;
#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8739 "ImportPage.c"
+#line 9016 "ImportPage.c"
}
}
}
-gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
+gchar*
+import_page_get_fs_basedir (Camera* camera,
+ gint fsid)
+{
gchar* result = NULL;
CameraStorageInformation* sifs = NULL;
gint count = 0;
int res = 0;
- Camera* _tmp0_;
- GPContextWrapper* _tmp1_;
- GPContext* _tmp2_;
- gint _tmp3_ = 0;
+ GPContextWrapper* _tmp0_;
+ GPContext* _tmp1_;
+ gint _tmp2_ = 0;
+ int _tmp3_;
int _tmp4_;
- int _tmp5_;
- gint _tmp6_;
- gint _tmp7_;
+ gint _tmp5_;
CameraStorageInformation* ifs = NULL;
+ CameraStorageInformation* _tmp6_;
+ const gchar* _tmp7_ = NULL;
CameraStorageInformation* _tmp8_;
- gint _tmp9_;
- const gchar* _tmp10_ = NULL;
- CameraStorageInformation* _tmp11_;
- CameraStorageInfoFields _tmp12_;
- gchar* _tmp15_;
+ CameraStorageInfoFields _tmp9_;
+ gchar* _tmp12_;
#line 1355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
#line 1356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8772,89 +9049,84 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
count = 0;
#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = camera;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = import_page_null_context;
+ _tmp0_ = import_page_null_context;
#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _tmp1_->context;
+ _tmp1_ = _tmp0_->context;
#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp3_, _tmp2_);
+ _tmp3_ = gp_camera_get_storageinfo (camera, &sifs, &_tmp2_, _tmp1_);
#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- count = _tmp3_;
+ count = _tmp2_;
#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp4_;
+ res = _tmp3_;
#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = res;
+ _tmp4_ = res;
#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp5_ != GP_OK) {
+ if (_tmp4_ != GP_OK) {
#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8791 "ImportPage.c"
+#line 9066 "ImportPage.c"
}
#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = fsid;
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = count;
+ _tmp5_ = count;
#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp6_ >= _tmp7_) {
+ if (fsid >= _tmp5_) {
#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8803 "ImportPage.c"
+#line 9076 "ImportPage.c"
}
#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = sifs;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = fsid;
+ _tmp6_ = sifs;
#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ifs = _tmp8_ + _tmp9_;
+ ifs = _tmp6_ + fsid;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = ifs;
+ _tmp8_ = ifs;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = (*_tmp11_).fields;
+ _tmp9_ = (*_tmp8_).fields;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8817 "ImportPage.c"
- CameraStorageInformation* _tmp13_;
- const gchar* _tmp14_;
+ if ((_tmp9_ & GP_STORAGEINFO_BASE) != 0) {
+#line 9088 "ImportPage.c"
+ CameraStorageInformation* _tmp10_;
+ const gchar* _tmp11_;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = ifs;
+ _tmp10_ = ifs;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = (*_tmp13_).basedir;
+ _tmp11_ = (*_tmp10_).basedir;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _tmp14_;
-#line 8826 "ImportPage.c"
+ _tmp7_ = _tmp11_;
+#line 9097 "ImportPage.c"
} else {
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = "/";
-#line 8830 "ImportPage.c"
+ _tmp7_ = "/";
+#line 9101 "ImportPage.c"
}
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = g_strdup (_tmp10_);
+ _tmp12_ = g_strdup (_tmp7_);
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp15_;
+ result = _tmp12_;
#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8838 "ImportPage.c"
+#line 9109 "ImportPage.c"
}
-gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint fsid, const gchar* folder) {
+gchar*
+import_page_get_fulldir (Camera* camera,
+ const gchar* camera_name,
+ gint fsid,
+ const gchar* folder)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
+ gint _tmp0_;
gint _tmp1_;
- gint _tmp2_;
gchar* basedir = NULL;
- Camera* _tmp3_;
- gint _tmp4_;
- gchar* _tmp5_;
- const gchar* _tmp6_;
- const gchar* _tmp11_;
- const gchar* _tmp12_;
- gchar* _tmp13_;
+ gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (camera != NULL, NULL);
#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8862,102 +9134,86 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (folder != NULL, NULL);
#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = folder;
-#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = strlen (_tmp0_);
+ _tmp0_ = strlen (folder);
#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) {
+ if (_tmp1_ > GP_MAX_BASEDIR_LENGTH) {
#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = NULL;
#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8873 "ImportPage.c"
+#line 9143 "ImportPage.c"
}
#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = camera;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = fsid;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = import_page_get_fs_basedir (_tmp3_, _tmp4_);
+ _tmp2_ = import_page_get_fs_basedir (camera, fsid);
#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- basedir = _tmp5_;
+ basedir = _tmp2_;
#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = basedir;
+ _tmp3_ = basedir;
#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp6_ == NULL) {
-#line 8887 "ImportPage.c"
- const gchar* _tmp7_;
- gint _tmp8_;
- const gchar* _tmp9_;
- gchar* _tmp10_;
-#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = camera_name;
-#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = fsid;
+ if (_tmp3_ == NULL) {
+#line 9153 "ImportPage.c"
+ gchar* _tmp4_;
#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1376: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_);
-#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = folder;
+ g_debug ("ImportPage.vala:1376: Unable to find base directory for %s fsid %d", camera_name, fsid);
#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = g_strdup (_tmp9_);
+ _tmp4_ = g_strdup (folder);
#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp10_;
+ result = _tmp4_;
#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (basedir);
#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8908 "ImportPage.c"
+#line 9165 "ImportPage.c"
}
#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = basedir;
+ _tmp5_ = basedir;
#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = folder;
+ _tmp6_ = import_page_append_path (_tmp5_, folder);
#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = import_page_append_path (_tmp11_, _tmp12_);
-#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = _tmp13_;
+ result = _tmp6_;
#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (basedir);
#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8922 "ImportPage.c"
+#line 9177 "ImportPage.c"
}
-static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list) {
+static gboolean
+import_page_enumerate_files (ImportPage* self,
+ gint fsid,
+ const gchar* dir,
+ GeeArrayList* import_list)
+{
gboolean result = FALSE;
gchar* fulldir = NULL;
Camera* _tmp0_;
const gchar* _tmp1_;
- gint _tmp2_;
+ gchar* _tmp2_;
const gchar* _tmp3_;
- gchar* _tmp4_;
- const gchar* _tmp5_;
CameraList* files = NULL;
- CameraList* _tmp7_ = NULL;
- int _tmp8_;
- int _tmp9_;
- Camera* _tmp13_;
- const gchar* _tmp14_;
- CameraList* _tmp15_;
- GPSpinIdleWrapper* _tmp16_;
- GPContext* _tmp17_;
- int _tmp18_;
- int _tmp19_;
- CameraList* _tmp24_;
+ CameraList* _tmp4_ = NULL;
+ int _tmp5_;
+ int _tmp6_;
+ Camera* _tmp10_;
+ const gchar* _tmp11_;
+ CameraList* _tmp12_;
+ GPSpinIdleWrapper* _tmp13_;
+ GPContext* _tmp14_;
+ int _tmp15_;
+ CameraList* _tmp20_;
CameraList* folders = NULL;
- CameraList* _tmp111_ = NULL;
- int _tmp112_;
- int _tmp113_;
- Camera* _tmp117_;
- const gchar* _tmp118_;
- CameraList* _tmp119_;
- GPSpinIdleWrapper* _tmp120_;
- GPContext* _tmp121_;
- int _tmp122_;
- int _tmp123_;
+ CameraList* _tmp97_ = NULL;
+ int _tmp98_;
+ int _tmp99_;
+ Camera* _tmp103_;
+ const gchar* _tmp104_;
+ CameraList* _tmp105_;
+ GPSpinIdleWrapper* _tmp106_;
+ GPContext* _tmp107_;
+ int _tmp108_;
GError * _inner_error_ = NULL;
#line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
@@ -8970,57 +9226,49 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->camera_name;
#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = fsid;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = dir;
+ _tmp2_ = import_page_get_fulldir (_tmp0_, _tmp1_, fsid, dir);
#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- fulldir = _tmp4_;
+ fulldir = _tmp2_;
#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = fulldir;
+ _tmp3_ = fulldir;
#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp5_ == NULL) {
-#line 8981 "ImportPage.c"
- const gchar* _tmp6_;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = dir;
+ if (_tmp3_ == NULL) {
#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1387: Skipping enumerating %s: invalid folder name", _tmp6_);
+ g_warning ("ImportPage.vala:1387: Skipping enumerating %s: invalid folder name", dir);
#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = TRUE;
#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 8993 "ImportPage.c"
+#line 9241 "ImportPage.c"
}
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = gp_list_new (&_tmp7_);
+ _tmp5_ = gp_list_new (&_tmp4_);
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (files);
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- files = _tmp7_;
+ files = _tmp4_;
#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp8_;
+ self->priv->refresh_result = _tmp5_;
#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = self->priv->refresh_result;
+ _tmp6_ = self->priv->refresh_result;
#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp9_ != GP_OK) {
-#line 9007 "ImportPage.c"
- int _tmp10_;
- gchar* _tmp11_;
- gchar* _tmp12_;
+ if (_tmp6_ != GP_OK) {
+#line 9255 "ImportPage.c"
+ int _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = self->priv->refresh_result;
+ _tmp7_ = self->priv->refresh_result;
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = gp_result_to_full_string (_tmp10_);
+ _tmp8_ = gp_result_to_full_string (_tmp7_);
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = _tmp11_;
+ _tmp9_ = _tmp8_;
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1395: Unable to create file list: %s", _tmp12_);
+ g_warning ("ImportPage.vala:1395: Unable to create file list: %s", _tmp9_);
#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp9_);
#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9029,43 +9277,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9029 "ImportPage.c"
+#line 9277 "ImportPage.c"
}
#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = self->priv->camera;
+ _tmp10_ = self->priv->camera;
#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = fulldir;
+ _tmp11_ = fulldir;
#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = files;
+ _tmp12_ = files;
#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = import_page_spin_idle_context;
+ _tmp13_ = import_page_spin_idle_context;
#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = gp_camera_folder_list_files (_tmp13_, _tmp14_, _tmp15_, _tmp17_);
-#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp18_;
+ self->priv->refresh_result = gp_camera_folder_list_files (_tmp10_, _tmp11_, _tmp12_, _tmp14_);
#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = self->priv->refresh_result;
+ _tmp15_ = self->priv->refresh_result;
#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp19_ != GP_OK) {
-#line 9049 "ImportPage.c"
- const gchar* _tmp20_;
- int _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
+ if (_tmp15_ != GP_OK) {
+#line 9295 "ImportPage.c"
+ const gchar* _tmp16_;
+ int _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = fulldir;
+ _tmp16_ = fulldir;
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = self->priv->refresh_result;
+ _tmp17_ = self->priv->refresh_result;
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = gp_result_to_full_string (_tmp21_);
+ _tmp18_ = gp_result_to_full_string (_tmp17_);
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = _tmp22_;
+ _tmp19_ = _tmp18_;
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1402: Unable to list files in %s: %s", _tmp20_, _tmp23_);
+ g_warning ("ImportPage.vala:1402: Unable to list files in %s: %s", _tmp16_, _tmp19_);
#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp23_);
+ _g_free0 (_tmp19_);
#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = GP_OK;
#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9076,97 +9322,94 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9076 "ImportPage.c"
+#line 9322 "ImportPage.c"
}
#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = files;
+ _tmp20_ = files;
#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gp_list_sort (_tmp24_);
-#line 9082 "ImportPage.c"
+ gp_list_sort (_tmp20_);
+#line 9328 "ImportPage.c"
{
gint ctr = 0;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 9087 "ImportPage.c"
+#line 9333 "ImportPage.c"
{
- gboolean _tmp25_ = FALSE;
+ gboolean _tmp21_ = FALSE;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = TRUE;
+ _tmp21_ = TRUE;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9094 "ImportPage.c"
- gint _tmp27_;
- CameraList* _tmp28_;
- gint _tmp29_;
+#line 9340 "ImportPage.c"
+ gint _tmp23_;
+ CameraList* _tmp24_;
gchar* filename = NULL;
- CameraList* _tmp30_;
- gint _tmp31_;
- const gchar* _tmp32_ = NULL;
- int _tmp33_;
- gchar* _tmp34_;
- int _tmp35_;
+ CameraList* _tmp25_;
+ gint _tmp26_;
+ const gchar* _tmp27_ = NULL;
+ int _tmp28_;
+ gchar* _tmp29_;
+ int _tmp30_;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp25_) {
-#line 9107 "ImportPage.c"
- gint _tmp26_;
+ if (!_tmp21_) {
+#line 9352 "ImportPage.c"
+ gint _tmp22_;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = ctr;
+ _tmp22_ = ctr;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ctr = _tmp26_ + 1;
-#line 9113 "ImportPage.c"
+ ctr = _tmp22_ + 1;
+#line 9358 "ImportPage.c"
}
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = FALSE;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = ctr;
+ _tmp21_ = FALSE;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = files;
+ _tmp23_ = ctr;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = gp_list_count (_tmp28_);
+ _tmp24_ = files;
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp27_ < _tmp29_)) {
+ if (!(_tmp23_ < gp_list_count (_tmp24_))) {
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9127 "ImportPage.c"
+#line 9370 "ImportPage.c"
}
#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = files;
+ _tmp25_ = files;
#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = ctr;
+ _tmp26_ = ctr;
#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = gp_list_get_name (_tmp30_, _tmp31_, &_tmp32_);
+ _tmp28_ = gp_list_get_name (_tmp25_, _tmp26_, &_tmp27_);
#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = g_strdup (_tmp32_);
+ _tmp29_ = g_strdup (_tmp27_);
#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- filename = _tmp34_;
+ filename = _tmp29_;
#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp33_;
+ self->priv->refresh_result = _tmp28_;
#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = self->priv->refresh_result;
+ _tmp30_ = self->priv->refresh_result;
#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp35_ != GP_OK) {
-#line 9147 "ImportPage.c"
- gint _tmp36_;
- const gchar* _tmp37_;
- int _tmp38_;
- gchar* _tmp39_;
- gchar* _tmp40_;
+ if (_tmp30_ != GP_OK) {
+#line 9390 "ImportPage.c"
+ gint _tmp31_;
+ const gchar* _tmp32_;
+ int _tmp33_;
+ gchar* _tmp34_;
+ gchar* _tmp35_;
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = ctr;
+ _tmp31_ = ctr;
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = fulldir;
+ _tmp32_ = fulldir;
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = self->priv->refresh_result;
+ _tmp33_ = self->priv->refresh_result;
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = gp_result_to_full_string (_tmp38_);
+ _tmp34_ = gp_result_to_full_string (_tmp33_);
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = _tmp39_;
+ _tmp35_ = _tmp34_;
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1415: Unable to get the name of file %d in %s: %s", _tmp36_, _tmp37_, _tmp40_);
+ g_warning ("ImportPage.vala:1415: Unable to get the name of file %d in %s: %s", _tmp31_, _tmp32_, _tmp35_);
#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp40_);
+ _g_free0 (_tmp35_);
#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9177,315 +9420,288 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9177 "ImportPage.c"
+#line 9420 "ImportPage.c"
}
{
CameraFileInfo info = {0};
- gboolean _tmp41_ = FALSE;
- GPSpinIdleWrapper* _tmp42_;
- GPContext* _tmp43_;
- Camera* _tmp44_;
- const gchar* _tmp45_;
- const gchar* _tmp46_;
- CameraFileInfo _tmp47_ = {0};
- gboolean _tmp48_;
- CameraFileInfo _tmp51_;
- CameraFileInfoFile _tmp52_;
- CameraFileInfoFields _tmp53_;
- const gchar* _tmp59_;
- gboolean _tmp60_;
- GtkProgressBar* _tmp103_;
+ gboolean _tmp36_ = FALSE;
+ GPSpinIdleWrapper* _tmp37_;
+ GPContext* _tmp38_;
+ Camera* _tmp39_;
+ const gchar* _tmp40_;
+ const gchar* _tmp41_;
+ CameraFileInfo _tmp42_ = {0};
+ gboolean _tmp43_;
+ CameraFileInfo _tmp46_;
+ CameraFileInfoFile _tmp47_;
+ CameraFileInfoFields _tmp48_;
+ const gchar* _tmp54_;
+ GtkProgressBar* _tmp89_;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_page_spin_idle_context;
+ _tmp37_ = import_page_spin_idle_context;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = self->priv->camera;
+ _tmp39_ = self->priv->camera;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = fulldir;
+ _tmp40_ = fulldir;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = filename;
+ _tmp41_ = filename;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = gp_get_info (_tmp43_, _tmp44_, _tmp45_, _tmp46_, &_tmp47_, &_inner_error_);
+ _tmp43_ = gp_get_info (_tmp38_, _tmp39_, _tmp40_, _tmp41_, &_tmp42_, &_inner_error_);
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- info = _tmp47_;
+ info = _tmp42_;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = _tmp48_;
+ _tmp36_ = _tmp43_;
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 9217 "ImportPage.c"
+#line 9459 "ImportPage.c"
goto __catch76_g_error;
}
#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp41_) {
-#line 9222 "ImportPage.c"
- const gchar* _tmp49_;
- const gchar* _tmp50_;
+ if (!_tmp36_) {
+#line 9464 "ImportPage.c"
+ const gchar* _tmp44_;
+ const gchar* _tmp45_;
#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = fulldir;
+ _tmp44_ = fulldir;
#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = filename;
+ _tmp45_ = filename;
#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1424: Skipping import of %s/%s: name too long", _tmp49_, _tmp50_);
+ g_warning ("ImportPage.vala:1424: Skipping import of %s/%s: name too long", _tmp44_, _tmp45_);
#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 9237 "ImportPage.c"
+#line 9479 "ImportPage.c"
}
#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = info;
+ _tmp46_ = info;
#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = _tmp51_.file;
+ _tmp47_ = _tmp46_.file;
#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = _tmp52_.fields;
+ _tmp48_ = _tmp47_.fields;
#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if ((_tmp53_ & GP_FILE_INFO_TYPE) == 0) {
-#line 9247 "ImportPage.c"
- const gchar* _tmp54_;
- const gchar* _tmp55_;
- CameraFileInfo _tmp56_;
- CameraFileInfoFile _tmp57_;
- CameraFileInfoFields _tmp58_;
+ if ((_tmp48_ & GP_FILE_INFO_TYPE) == 0) {
+#line 9489 "ImportPage.c"
+ const gchar* _tmp49_;
+ const gchar* _tmp50_;
+ CameraFileInfo _tmp51_;
+ CameraFileInfoFile _tmp52_;
+ CameraFileInfoFields _tmp53_;
#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = fulldir;
+ _tmp49_ = fulldir;
#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = filename;
+ _tmp50_ = filename;
#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = info;
+ _tmp51_ = info;
#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = _tmp56_.file;
+ _tmp52_ = _tmp51_.file;
#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = _tmp57_.fields;
+ _tmp53_ = _tmp52_.fields;
#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1430: Skipping %s/%s: No file (file=%02Xh)", _tmp54_, _tmp55_, (guint) _tmp58_);
+ g_message ("ImportPage.vala:1430: Skipping %s/%s: No file (file=%02Xh)", _tmp49_, _tmp50_, (guint) _tmp53_);
#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 9271 "ImportPage.c"
+#line 9513 "ImportPage.c"
}
#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = filename;
+ _tmp54_ = filename;
#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = video_reader_is_supported_video_filename (_tmp59_);
-#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp60_) {
-#line 9279 "ImportPage.c"
+ if (video_reader_is_supported_video_filename (_tmp54_)) {
+#line 9519 "ImportPage.c"
VideoImportSource* video_source = NULL;
- const gchar* _tmp61_;
- Camera* _tmp62_;
- gint _tmp63_;
- const gchar* _tmp64_;
- const gchar* _tmp65_;
- CameraFileInfo _tmp66_;
- CameraFileInfoFile _tmp67_;
- gulong _tmp68_;
- CameraFileInfo _tmp69_;
- CameraFileInfoFile _tmp70_;
- time_t _tmp71_;
- VideoImportSource* _tmp72_;
- GeeArrayList* _tmp73_;
- VideoImportSource* _tmp74_;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = self->priv->camera_name;
+ const gchar* _tmp55_;
+ Camera* _tmp56_;
+ const gchar* _tmp57_;
+ CameraFileInfo _tmp58_;
+ CameraFileInfoFile _tmp59_;
+ gulong _tmp60_;
+ CameraFileInfo _tmp61_;
+ CameraFileInfoFile _tmp62_;
+ time_t _tmp63_;
+ VideoImportSource* _tmp64_;
+ VideoImportSource* _tmp65_;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = self->priv->camera;
+ _tmp55_ = self->priv->camera_name;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = fsid;
+ _tmp56_ = self->priv->camera;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = dir;
+ _tmp57_ = filename;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = filename;
+ _tmp58_ = info;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = info;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = _tmp66_.file;
+ _tmp59_ = _tmp58_.file;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = _tmp67_.size;
+ _tmp60_ = _tmp59_.size;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = info;
+ _tmp61_ = info;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = _tmp69_.file;
+ _tmp62_ = _tmp61_.file;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = _tmp70_.mtime;
+ _tmp63_ = _tmp62_.mtime;
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = video_import_source_new (_tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp65_, _tmp68_, _tmp71_);
+ _tmp64_ = video_import_source_new (_tmp55_, _tmp56_, fsid, dir, _tmp57_, _tmp60_, _tmp63_);
#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- video_source = _tmp72_;
+ video_source = _tmp64_;
#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = import_list;
+ _tmp65_ = video_source;
#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = video_source;
-#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_IMPORT_SOURCE, ImportSource));
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (video_source);
-#line 9329 "ImportPage.c"
+#line 9560 "ImportPage.c"
} else {
PhotoFileFormat file_format = 0;
- CameraFileInfo _tmp75_;
- CameraFileInfoFile _tmp76_;
+ CameraFileInfo _tmp66_;
+ CameraFileInfoFile _tmp67_;
+ const gchar* _tmp68_;
+ PhotoFileFormat _tmp69_;
const gchar* _tmp77_;
- PhotoFileFormat _tmp78_;
- PhotoFileFormat _tmp79_;
- GeeArrayList* _tmp88_;
- const gchar* _tmp89_;
- Camera* _tmp90_;
- gint _tmp91_;
- const gchar* _tmp92_;
- const gchar* _tmp93_;
- CameraFileInfo _tmp94_;
- CameraFileInfoFile _tmp95_;
- gulong _tmp96_;
- CameraFileInfo _tmp97_;
- CameraFileInfoFile _tmp98_;
- time_t _tmp99_;
- PhotoFileFormat _tmp100_;
- PhotoImportSource* _tmp101_;
- PhotoImportSource* _tmp102_;
+ Camera* _tmp78_;
+ const gchar* _tmp79_;
+ CameraFileInfo _tmp80_;
+ CameraFileInfoFile _tmp81_;
+ gulong _tmp82_;
+ CameraFileInfo _tmp83_;
+ CameraFileInfoFile _tmp84_;
+ time_t _tmp85_;
+ PhotoFileFormat _tmp86_;
+ PhotoImportSource* _tmp87_;
+ PhotoImportSource* _tmp88_;
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = info;
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = _tmp75_.file;
+ _tmp66_ = info;
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = _tmp76_.type;
+ _tmp67_ = _tmp66_.file;
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = photo_file_format_from_gphoto_type (_tmp77_);
+ _tmp68_ = _tmp67_.type;
#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- file_format = _tmp78_;
+ file_format = photo_file_format_from_gphoto_type (_tmp68_);
#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = file_format;
+ _tmp69_ = file_format;
#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp79_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9366 "ImportPage.c"
- const gchar* _tmp80_;
- PhotoFileFormat _tmp81_;
- PhotoFileFormat _tmp82_;
+ if (_tmp69_ == PHOTO_FILE_FORMAT_UNKNOWN) {
+#line 9591 "ImportPage.c"
+ const gchar* _tmp70_;
+ PhotoFileFormat _tmp71_;
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = filename;
+ _tmp70_ = filename;
#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = photo_file_format_get_by_basename_extension (_tmp80_);
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- file_format = _tmp81_;
+ file_format = photo_file_format_get_by_basename_extension (_tmp70_);
#line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = file_format;
+ _tmp71_ = file_format;
#line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp82_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9380 "ImportPage.c"
- const gchar* _tmp83_;
- const gchar* _tmp84_;
- CameraFileInfo _tmp85_;
- CameraFileInfoFile _tmp86_;
- const gchar* _tmp87_;
+ if (_tmp71_ == PHOTO_FILE_FORMAT_UNKNOWN) {
+#line 9602 "ImportPage.c"
+ const gchar* _tmp72_;
+ const gchar* _tmp73_;
+ CameraFileInfo _tmp74_;
+ CameraFileInfoFile _tmp75_;
+ const gchar* _tmp76_;
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = fulldir;
+ _tmp72_ = fulldir;
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = filename;
+ _tmp73_ = filename;
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = info;
+ _tmp74_ = info;
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = _tmp85_.file;
+ _tmp75_ = _tmp74_.file;
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = _tmp86_.type;
+ _tmp76_ = _tmp75_.type;
#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_message ("ImportPage.vala:1446: Skipping %s/%s: Not a supported file extension (" \
-"%s)", _tmp83_, _tmp84_, _tmp87_);
+"%s)", _tmp72_, _tmp73_, _tmp76_);
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 9404 "ImportPage.c"
+#line 9626 "ImportPage.c"
}
}
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = import_list;
-#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = self->priv->camera_name;
+ _tmp77_ = self->priv->camera_name;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = self->priv->camera;
+ _tmp78_ = self->priv->camera;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = fsid;
+ _tmp79_ = filename;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = dir;
+ _tmp80_ = info;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = filename;
+ _tmp81_ = _tmp80_.file;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = info;
+ _tmp82_ = _tmp81_.size;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp95_ = _tmp94_.file;
+ _tmp83_ = info;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp96_ = _tmp95_.size;
+ _tmp84_ = _tmp83_.file;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp97_ = info;
+ _tmp85_ = _tmp84_.mtime;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp98_ = _tmp97_.file;
+ _tmp86_ = file_format;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp99_ = _tmp98_.mtime;
+ _tmp87_ = photo_import_source_new (_tmp77_, _tmp78_, fsid, dir, _tmp79_, _tmp82_, _tmp85_, _tmp86_);
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp100_ = file_format;
+ _tmp88_ = _tmp87_;
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp101_ = photo_import_source_new (_tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp93_, _tmp96_, _tmp99_, _tmp100_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp102_ = _tmp101_;
-#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp102_);
-#line 9441 "ImportPage.c"
+ _g_object_unref0 (_tmp88_);
+#line 9657 "ImportPage.c"
}
#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp103_ = self->priv->progress_bar;
+ _tmp89_ = self->priv->progress_bar;
#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_pulse (_tmp103_);
+ gtk_progress_bar_pulse (_tmp89_);
#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
spin_event_loop ();
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
(info);
-#line 9451 "ImportPage.c"
+#line 9667 "ImportPage.c"
}
goto __finally76;
__catch76_g_error:
{
GError* err = NULL;
- const gchar* _tmp104_;
- GError* _tmp105_;
- const gchar* _tmp106_;
- GError* _tmp107_;
- const gchar* _tmp108_;
- gchar* _tmp109_;
+ const gchar* _tmp90_;
+ GError* _tmp91_;
+ const gchar* _tmp92_;
+ GError* _tmp93_;
+ const gchar* _tmp94_;
+ gchar* _tmp95_;
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp104_ = fulldir;
+ _tmp90_ = fulldir;
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp105_ = err;
+ _tmp91_ = err;
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp106_ = _tmp105_->message;
+ _tmp92_ = _tmp91_->message;
#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1461: Error while enumerating files in %s: %s", _tmp104_, _tmp106_);
+ g_warning ("ImportPage.vala:1461: Error while enumerating files in %s: %s", _tmp90_, _tmp92_);
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp107_ = err;
+ _tmp93_ = err;
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp108_ = _tmp107_->message;
+ _tmp94_ = _tmp93_->message;
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp109_ = g_strdup (_tmp108_);
+ _tmp95_ = g_strdup (_tmp94_);
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->refresh_error);
#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_error = _tmp109_;
+ self->priv->refresh_error = _tmp95_;
#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9498,13 +9714,13 @@ 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 9497 "ImportPage.c"
+#line 9713 "ImportPage.c"
}
__finally76:
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9502 "ImportPage.c"
- gboolean _tmp110_ = FALSE;
+#line 9718 "ImportPage.c"
+ gboolean _tmp96_ = FALSE;
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9516,41 +9732,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_clear_error (&_inner_error_);
#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- return _tmp110_;
-#line 9516 "ImportPage.c"
+ return _tmp96_;
+#line 9732 "ImportPage.c"
}
#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (filename);
-#line 9520 "ImportPage.c"
+#line 9736 "ImportPage.c"
}
}
}
#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp112_ = gp_list_new (&_tmp111_);
+ _tmp98_ = gp_list_new (&_tmp97_);
#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_list_unref0 (folders);
#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- folders = _tmp111_;
+ folders = _tmp97_;
#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp112_;
+ self->priv->refresh_result = _tmp98_;
#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp113_ = self->priv->refresh_result;
+ _tmp99_ = self->priv->refresh_result;
#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp113_ != GP_OK) {
-#line 9536 "ImportPage.c"
- int _tmp114_;
- gchar* _tmp115_;
- gchar* _tmp116_;
+ if (_tmp99_ != GP_OK) {
+#line 9752 "ImportPage.c"
+ int _tmp100_;
+ gchar* _tmp101_;
+ gchar* _tmp102_;
#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp114_ = self->priv->refresh_result;
+ _tmp100_ = self->priv->refresh_result;
#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp115_ = gp_result_to_full_string (_tmp114_);
+ _tmp101_ = gp_result_to_full_string (_tmp100_);
#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp116_ = _tmp115_;
+ _tmp102_ = _tmp101_;
#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1472: Unable to create folder list: %s", _tmp116_);
+ g_warning ("ImportPage.vala:1472: Unable to create folder list: %s", _tmp102_);
#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp116_);
+ _g_free0 (_tmp102_);
#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9561,43 +9777,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9560 "ImportPage.c"
+#line 9776 "ImportPage.c"
}
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp117_ = self->priv->camera;
+ _tmp103_ = self->priv->camera;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp118_ = fulldir;
+ _tmp104_ = fulldir;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp119_ = folders;
+ _tmp105_ = folders;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp120_ = import_page_spin_idle_context;
+ _tmp106_ = import_page_spin_idle_context;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp121_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp107_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp122_ = gp_camera_folder_list_folders (_tmp117_, _tmp118_, _tmp119_, _tmp121_);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp122_;
+ self->priv->refresh_result = gp_camera_folder_list_folders (_tmp103_, _tmp104_, _tmp105_, _tmp107_);
#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp123_ = self->priv->refresh_result;
+ _tmp108_ = self->priv->refresh_result;
#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp123_ != GP_OK) {
-#line 9580 "ImportPage.c"
- const gchar* _tmp124_;
- int _tmp125_;
- gchar* _tmp126_;
- gchar* _tmp127_;
+ if (_tmp108_ != GP_OK) {
+#line 9794 "ImportPage.c"
+ const gchar* _tmp109_;
+ int _tmp110_;
+ gchar* _tmp111_;
+ gchar* _tmp112_;
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp124_ = fulldir;
+ _tmp109_ = fulldir;
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp125_ = self->priv->refresh_result;
+ _tmp110_ = self->priv->refresh_result;
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp126_ = gp_result_to_full_string (_tmp125_);
+ _tmp111_ = gp_result_to_full_string (_tmp110_);
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp127_ = _tmp126_;
+ _tmp112_ = _tmp111_;
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1479: Unable to list folders in %s: %s", _tmp124_, _tmp127_);
+ g_warning ("ImportPage.vala:1479: Unable to list folders in %s: %s", _tmp109_, _tmp112_);
#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp127_);
+ _g_free0 (_tmp112_);
#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->refresh_result = GP_OK;
#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9610,97 +9824,90 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9609 "ImportPage.c"
+#line 9823 "ImportPage.c"
}
{
gint ctr = 0;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
ctr = 0;
-#line 9615 "ImportPage.c"
+#line 9829 "ImportPage.c"
{
- gboolean _tmp128_ = FALSE;
+ gboolean _tmp113_ = FALSE;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp128_ = TRUE;
+ _tmp113_ = TRUE;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9622 "ImportPage.c"
- gint _tmp130_;
- CameraList* _tmp131_;
- gint _tmp132_;
+#line 9836 "ImportPage.c"
+ gint _tmp115_;
+ CameraList* _tmp116_;
gchar* subdir = NULL;
- CameraList* _tmp133_;
- gint _tmp134_;
- const gchar* _tmp135_ = NULL;
- int _tmp136_;
- gchar* _tmp137_;
- int _tmp138_;
- gint _tmp143_;
- const gchar* _tmp144_;
- const gchar* _tmp145_;
- gchar* _tmp146_;
- gchar* _tmp147_;
- GeeArrayList* _tmp148_;
- gboolean _tmp149_;
- gboolean _tmp150_;
+ CameraList* _tmp117_;
+ gint _tmp118_;
+ const gchar* _tmp119_ = NULL;
+ int _tmp120_;
+ gchar* _tmp121_;
+ int _tmp122_;
+ const gchar* _tmp127_;
+ gchar* _tmp128_;
+ gchar* _tmp129_;
+ gboolean _tmp130_;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp128_) {
-#line 9643 "ImportPage.c"
- gint _tmp129_;
+ if (!_tmp113_) {
+#line 9852 "ImportPage.c"
+ gint _tmp114_;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp129_ = ctr;
+ _tmp114_ = ctr;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ctr = _tmp129_ + 1;
-#line 9649 "ImportPage.c"
+ ctr = _tmp114_ + 1;
+#line 9858 "ImportPage.c"
}
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp128_ = FALSE;
-#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp130_ = ctr;
+ _tmp113_ = FALSE;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp131_ = folders;
+ _tmp115_ = ctr;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp132_ = gp_list_count (_tmp131_);
+ _tmp116_ = folders;
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp130_ < _tmp132_)) {
+ if (!(_tmp115_ < gp_list_count (_tmp116_))) {
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9663 "ImportPage.c"
+#line 9870 "ImportPage.c"
}
#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp133_ = folders;
+ _tmp117_ = folders;
#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp134_ = ctr;
+ _tmp118_ = ctr;
#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp136_ = gp_list_get_name (_tmp133_, _tmp134_, &_tmp135_);
+ _tmp120_ = gp_list_get_name (_tmp117_, _tmp118_, &_tmp119_);
#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp137_ = g_strdup (_tmp135_);
+ _tmp121_ = g_strdup (_tmp119_);
#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- subdir = _tmp137_;
+ subdir = _tmp121_;
#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->refresh_result = _tmp136_;
+ self->priv->refresh_result = _tmp120_;
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp138_ = self->priv->refresh_result;
+ _tmp122_ = self->priv->refresh_result;
#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp138_ != GP_OK) {
-#line 9683 "ImportPage.c"
- gint _tmp139_;
- int _tmp140_;
- gchar* _tmp141_;
- gchar* _tmp142_;
+ if (_tmp122_ != GP_OK) {
+#line 9890 "ImportPage.c"
+ gint _tmp123_;
+ int _tmp124_;
+ gchar* _tmp125_;
+ gchar* _tmp126_;
#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp139_ = ctr;
+ _tmp123_ = ctr;
#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp140_ = self->priv->refresh_result;
+ _tmp124_ = self->priv->refresh_result;
#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp141_ = gp_result_to_full_string (_tmp140_);
+ _tmp125_ = gp_result_to_full_string (_tmp124_);
#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp142_ = _tmp141_;
+ _tmp126_ = _tmp125_;
#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1491: Unable to get name of folder %d: %s", _tmp139_, _tmp142_);
+ g_warning ("ImportPage.vala:1491: Unable to get name of folder %d: %s", _tmp123_, _tmp126_);
#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp142_);
+ _g_free0 (_tmp126_);
#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9713,28 +9920,20 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9712 "ImportPage.c"
+#line 9919 "ImportPage.c"
}
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp143_ = fsid;
+ _tmp127_ = subdir;
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp144_ = dir;
+ _tmp128_ = import_page_append_path (dir, _tmp127_);
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp145_ = subdir;
+ _tmp129_ = _tmp128_;
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp146_ = import_page_append_path (_tmp144_, _tmp145_);
+ _tmp130_ = !import_page_enumerate_files (self, fsid, _tmp129_, import_list);
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp147_ = _tmp146_;
+ _g_free0 (_tmp129_);
#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp148_ = import_list;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp149_ = import_page_enumerate_files (self, _tmp143_, _tmp147_, _tmp148_);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp150_ = !_tmp149_;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp147_);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp150_) {
+ if (_tmp130_) {
#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -9747,11 +9946,11 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9746 "ImportPage.c"
+#line 9945 "ImportPage.c"
}
#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (subdir);
-#line 9750 "ImportPage.c"
+#line 9949 "ImportPage.c"
}
}
}
@@ -9765,439 +9964,412 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
_g_free0 (fulldir);
#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 9764 "ImportPage.c"
+#line 9963 "ImportPage.c"
}
-static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list) {
+static void
+import_page_auto_match_raw_jpeg (ImportPage* self,
+ GeeArrayList* import_list)
+{
#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9773 "ImportPage.c"
+#line 9975 "ImportPage.c"
{
gint i = 0;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
i = 0;
-#line 9778 "ImportPage.c"
+#line 9980 "ImportPage.c"
{
gboolean _tmp0_ = FALSE;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 9785 "ImportPage.c"
+#line 9987 "ImportPage.c"
gint _tmp2_;
- GeeArrayList* _tmp3_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
PhotoImportSource* current = NULL;
- GeeArrayList* _tmp6_;
- gint _tmp7_;
- gpointer _tmp8_;
- ImportSource* _tmp9_;
- PhotoImportSource* _tmp10_;
- PhotoImportSource* _tmp11_ = NULL;
+ gint _tmp5_;
+ gpointer _tmp6_;
+ ImportSource* _tmp7_;
+ PhotoImportSource* _tmp8_;
+ PhotoImportSource* _tmp9_ = NULL;
+ gint _tmp10_;
+ gint _tmp11_;
gint _tmp12_;
- GeeArrayList* _tmp13_;
- gint _tmp14_;
- gint _tmp15_;
PhotoImportSource* next = NULL;
- PhotoImportSource* _tmp21_;
- PhotoImportSource* _tmp22_ = NULL;
- gint _tmp23_;
+ PhotoImportSource* _tmp17_;
+ PhotoImportSource* _tmp18_ = NULL;
+ gint _tmp19_;
PhotoImportSource* prev = NULL;
- PhotoImportSource* _tmp29_;
- gboolean _tmp30_ = FALSE;
- PhotoImportSource* _tmp31_;
+ PhotoImportSource* _tmp24_;
+ gboolean _tmp25_ = FALSE;
+ PhotoImportSource* _tmp26_;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (!_tmp0_) {
-#line 9811 "ImportPage.c"
+#line 10010 "ImportPage.c"
gint _tmp1_;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = i;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
i = _tmp1_ + 1;
-#line 9817 "ImportPage.c"
+#line 10016 "ImportPage.c"
}
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = FALSE;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = i;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = import_list;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp2_ < _tmp5_)) {
+ if (!(_tmp2_ < _tmp4_)) {
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 9833 "ImportPage.c"
+#line 10030 "ImportPage.c"
}
#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = import_list;
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = i;
+ _tmp5_ = i;
#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_);
+ _tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp5_);
#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = (ImportSource*) _tmp8_;
+ _tmp7_ = (ImportSource*) _tmp6_;
#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL;
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp7_) : NULL;
#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp10_ == NULL) {
+ if (_tmp8_ == NULL) {
#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp9_);
-#line 9849 "ImportPage.c"
+ _g_object_unref0 (_tmp7_);
+#line 10044 "ImportPage.c"
}
#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- current = _tmp10_;
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = i;
+ current = _tmp8_;
#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = import_list;
+ _tmp10_ = i;
#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = _tmp14_;
+ _tmp12_ = _tmp11_;
#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if ((_tmp12_ + 1) < _tmp15_) {
-#line 9863 "ImportPage.c"
- GeeArrayList* _tmp16_;
- gint _tmp17_;
- gpointer _tmp18_;
- ImportSource* _tmp19_;
- PhotoImportSource* _tmp20_;
+ if ((_tmp10_ + 1) < _tmp12_) {
+#line 10056 "ImportPage.c"
+ gint _tmp13_;
+ gpointer _tmp14_;
+ ImportSource* _tmp15_;
+ PhotoImportSource* _tmp16_;
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = import_list;
+ _tmp13_ = i;
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = i;
+ _tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_ + 1);
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_ + 1);
+ _tmp15_ = (ImportSource*) _tmp14_;
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = (ImportSource*) _tmp18_;
+ _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp15_) : NULL;
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp19_) : NULL;
+ if (_tmp16_ == NULL) {
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp20_ == NULL) {
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp19_);
-#line 9883 "ImportPage.c"
+ _g_object_unref0 (_tmp15_);
+#line 10073 "ImportPage.c"
}
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp9_);
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp20_;
-#line 9889 "ImportPage.c"
+ _tmp9_ = _tmp16_;
+#line 10079 "ImportPage.c"
} else {
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp9_);
#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = NULL;
-#line 9895 "ImportPage.c"
+ _tmp9_ = NULL;
+#line 10085 "ImportPage.c"
}
#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = _g_object_ref0 (_tmp11_);
+ _tmp17_ = _g_object_ref0 (_tmp9_);
#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- next = _tmp21_;
+ next = _tmp17_;
#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = i;
+ _tmp19_ = i;
#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp23_ > 0) {
-#line 9905 "ImportPage.c"
- GeeArrayList* _tmp24_;
- gint _tmp25_;
- gpointer _tmp26_;
- ImportSource* _tmp27_;
- PhotoImportSource* _tmp28_;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = import_list;
+ if (_tmp19_ > 0) {
+#line 10095 "ImportPage.c"
+ gint _tmp20_;
+ gpointer _tmp21_;
+ ImportSource* _tmp22_;
+ PhotoImportSource* _tmp23_;
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = i;
+ _tmp20_ = i;
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_ - 1);
+ _tmp21_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp20_ - 1);
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = (ImportSource*) _tmp26_;
+ _tmp22_ = (ImportSource*) _tmp21_;
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp27_) : NULL;
+ _tmp23_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp22_) : NULL;
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp28_ == NULL) {
+ if (_tmp23_ == NULL) {
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp27_);
-#line 9925 "ImportPage.c"
+ _g_object_unref0 (_tmp22_);
+#line 10112 "ImportPage.c"
}
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp22_);
+ _g_object_unref0 (_tmp18_);
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = _tmp28_;
-#line 9931 "ImportPage.c"
+ _tmp18_ = _tmp23_;
+#line 10118 "ImportPage.c"
} else {
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp22_);
+ _g_object_unref0 (_tmp18_);
#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = NULL;
-#line 9937 "ImportPage.c"
+ _tmp18_ = NULL;
+#line 10124 "ImportPage.c"
}
#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = _g_object_ref0 (_tmp22_);
+ _tmp24_ = _g_object_ref0 (_tmp18_);
#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- prev = _tmp29_;
+ prev = _tmp24_;
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = current;
+ _tmp26_ = current;
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp31_ != NULL) {
-#line 9947 "ImportPage.c"
- PhotoImportSource* _tmp32_;
- PhotoFileFormat _tmp33_;
-#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = current;
+ if (_tmp26_ != NULL) {
+#line 10134 "ImportPage.c"
+ PhotoImportSource* _tmp27_;
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = photo_import_source_get_file_format (_tmp32_);
+ _tmp27_ = current;
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9956 "ImportPage.c"
+ _tmp25_ = photo_import_source_get_file_format (_tmp27_) == PHOTO_FILE_FORMAT_RAW;
+#line 10140 "ImportPage.c"
} else {
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = FALSE;
-#line 9960 "ImportPage.c"
+ _tmp25_ = FALSE;
+#line 10144 "ImportPage.c"
}
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp30_) {
-#line 9964 "ImportPage.c"
+ if (_tmp25_) {
+#line 10148 "ImportPage.c"
gchar* current_name = NULL;
gchar* ext = NULL;
- PhotoImportSource* _tmp34_;
- gchar* _tmp35_;
- gchar* _tmp36_;
- gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
+ PhotoImportSource* _tmp28_;
+ gchar* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_ = NULL;
+ gchar* _tmp32_ = NULL;
PhotoImportSource* associated = NULL;
- gboolean _tmp39_ = FALSE;
- PhotoImportSource* _tmp40_;
- gboolean _tmp52_ = FALSE;
- PhotoImportSource* _tmp53_;
- PhotoImportSource* _tmp65_;
+ gboolean _tmp33_ = FALSE;
+ PhotoImportSource* _tmp34_;
+ gboolean _tmp45_ = FALSE;
+ PhotoImportSource* _tmp46_;
+ PhotoImportSource* _tmp57_;
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = current;
+ _tmp28_ = current;
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp29_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp30_ = _tmp29_;
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_);
+ disassemble_filename (_tmp30_, &_tmp31_, &_tmp32_);
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (current_name);
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- current_name = _tmp37_;
+ current_name = _tmp31_;
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (ext);
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ext = _tmp38_;
+ ext = _tmp32_;
#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp36_);
+ _g_free0 (_tmp30_);
#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = NULL;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = next;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp40_ != NULL) {
-#line 10002 "ImportPage.c"
- PhotoImportSource* _tmp41_;
- PhotoFileFormat _tmp42_;
+ _tmp34_ = next;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = next;
+ if (_tmp34_ != NULL) {
+#line 10186 "ImportPage.c"
+ PhotoImportSource* _tmp35_;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = photo_import_source_get_file_format (_tmp41_);
+ _tmp35_ = next;
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 10011 "ImportPage.c"
+ _tmp33_ = photo_import_source_get_file_format (_tmp35_) == PHOTO_FILE_FORMAT_JFIF;
+#line 10192 "ImportPage.c"
} else {
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = FALSE;
-#line 10015 "ImportPage.c"
+ _tmp33_ = FALSE;
+#line 10196 "ImportPage.c"
}
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp39_) {
-#line 10019 "ImportPage.c"
+ if (_tmp33_) {
+#line 10200 "ImportPage.c"
gchar* next_name = NULL;
- PhotoImportSource* _tmp43_;
- gchar* _tmp44_;
- gchar* _tmp45_;
- gchar* _tmp46_ = NULL;
- gchar* _tmp47_ = NULL;
- const gchar* _tmp48_;
- const gchar* _tmp49_;
+ PhotoImportSource* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_ = NULL;
+ gchar* _tmp40_ = NULL;
+ const gchar* _tmp41_;
+ const gchar* _tmp42_;
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = next;
+ _tmp36_ = next;
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp37_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = _tmp44_;
+ _tmp38_ = _tmp37_;
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- disassemble_filename (_tmp45_, &_tmp46_, &_tmp47_);
+ disassemble_filename (_tmp38_, &_tmp39_, &_tmp40_);
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (next_name);
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- next_name = _tmp46_;
+ next_name = _tmp39_;
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (ext);
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ext = _tmp47_;
+ ext = _tmp40_;
#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp45_);
+ _g_free0 (_tmp38_);
#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = next_name;
+ _tmp41_ = next_name;
#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = current_name;
+ _tmp42_ = current_name;
#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 10052 "ImportPage.c"
- PhotoImportSource* _tmp50_;
- PhotoImportSource* _tmp51_;
+ if (g_strcmp0 (_tmp41_, _tmp42_) == 0) {
+#line 10233 "ImportPage.c"
+ PhotoImportSource* _tmp43_;
+ PhotoImportSource* _tmp44_;
#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = next;
+ _tmp43_ = next;
#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = _g_object_ref0 (_tmp50_);
+ _tmp44_ = _g_object_ref0 (_tmp43_);
#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- associated = _tmp51_;
-#line 10063 "ImportPage.c"
+ associated = _tmp44_;
+#line 10244 "ImportPage.c"
}
#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (next_name);
-#line 10067 "ImportPage.c"
+#line 10248 "ImportPage.c"
}
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = prev;
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp53_ != NULL) {
-#line 10073 "ImportPage.c"
- PhotoImportSource* _tmp54_;
- PhotoFileFormat _tmp55_;
+ _tmp46_ = prev;
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = prev;
+ if (_tmp46_ != NULL) {
+#line 10254 "ImportPage.c"
+ PhotoImportSource* _tmp47_;
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = photo_import_source_get_file_format (_tmp54_);
+ _tmp47_ = prev;
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 10082 "ImportPage.c"
+ _tmp45_ = photo_import_source_get_file_format (_tmp47_) == PHOTO_FILE_FORMAT_JFIF;
+#line 10260 "ImportPage.c"
} else {
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = FALSE;
-#line 10086 "ImportPage.c"
+ _tmp45_ = FALSE;
+#line 10264 "ImportPage.c"
}
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp52_) {
-#line 10090 "ImportPage.c"
+ if (_tmp45_) {
+#line 10268 "ImportPage.c"
gchar* prev_name = NULL;
- PhotoImportSource* _tmp56_;
- gchar* _tmp57_;
- gchar* _tmp58_;
- gchar* _tmp59_ = NULL;
- gchar* _tmp60_ = NULL;
- const gchar* _tmp61_;
- const gchar* _tmp62_;
+ PhotoImportSource* _tmp48_;
+ gchar* _tmp49_;
+ gchar* _tmp50_;
+ gchar* _tmp51_ = NULL;
+ gchar* _tmp52_ = NULL;
+ const gchar* _tmp53_;
+ const gchar* _tmp54_;
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = prev;
+ _tmp48_ = prev;
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp49_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = _tmp57_;
+ _tmp50_ = _tmp49_;
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- disassemble_filename (_tmp58_, &_tmp59_, &_tmp60_);
+ disassemble_filename (_tmp50_, &_tmp51_, &_tmp52_);
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (prev_name);
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- prev_name = _tmp59_;
+ prev_name = _tmp51_;
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (ext);
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- ext = _tmp60_;
+ ext = _tmp52_;
#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp58_);
+ _g_free0 (_tmp50_);
#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = prev_name;
+ _tmp53_ = prev_name;
#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = current_name;
+ _tmp54_ = current_name;
#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 10123 "ImportPage.c"
- PhotoImportSource* _tmp63_;
- PhotoImportSource* _tmp64_;
+ if (g_strcmp0 (_tmp53_, _tmp54_) == 0) {
+#line 10301 "ImportPage.c"
+ PhotoImportSource* _tmp55_;
+ PhotoImportSource* _tmp56_;
#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = prev;
+ _tmp55_ = prev;
#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = _g_object_ref0 (_tmp63_);
+ _tmp56_ = _g_object_ref0 (_tmp55_);
#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- associated = _tmp64_;
-#line 10134 "ImportPage.c"
+ associated = _tmp56_;
+#line 10312 "ImportPage.c"
}
#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (prev_name);
-#line 10138 "ImportPage.c"
+#line 10316 "ImportPage.c"
}
#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = associated;
+ _tmp57_ = associated;
#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp65_ != NULL) {
-#line 10144 "ImportPage.c"
+ if (_tmp57_ != NULL) {
+#line 10322 "ImportPage.c"
+ PhotoImportSource* _tmp58_;
+ gchar* _tmp59_;
+ gchar* _tmp60_;
+ PhotoImportSource* _tmp61_;
+ gchar* _tmp62_;
+ gchar* _tmp63_;
+ PhotoImportSource* _tmp64_;
+ PhotoImportSource* _tmp65_;
PhotoImportSource* _tmp66_;
- gchar* _tmp67_;
- gchar* _tmp68_;
- PhotoImportSource* _tmp69_;
- gchar* _tmp70_;
- gchar* _tmp71_;
- PhotoImportSource* _tmp72_;
- PhotoImportSource* _tmp73_;
- GeeArrayList* _tmp74_;
- PhotoImportSource* _tmp75_;
- gboolean _tmp76_;
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = current;
+ _tmp58_ = current;
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp59_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = _tmp67_;
+ _tmp60_ = _tmp59_;
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = associated;
+ _tmp61_ = associated;
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp62_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = _tmp70_;
+ _tmp63_ = _tmp62_;
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1533: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_);
+ g_debug ("ImportPage.vala:1533: Found RAW+JPEG pair: %s and %s", _tmp60_, _tmp63_);
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp71_);
+ _g_free0 (_tmp63_);
#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp68_);
+ _g_free0 (_tmp60_);
#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = current;
+ _tmp64_ = current;
#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = associated;
+ _tmp65_ = associated;
#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source_set_associated (_tmp72_, _tmp73_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = import_list;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = associated;
+ photo_import_source_set_associated (_tmp64_, _tmp65_);
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp66_ = associated;
#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp76_) {
-#line 10188 "ImportPage.c"
- PhotoImportSource* _tmp77_;
+ if (!gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource))) {
+#line 10360 "ImportPage.c"
+ PhotoImportSource* _tmp67_;
#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_debug ("ImportPage.vala:1536: Unable to associate files");
#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = current;
+ _tmp67_ = current;
#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source_set_associated (_tmp77_, NULL);
-#line 10196 "ImportPage.c"
+ photo_import_source_set_associated (_tmp67_, NULL);
+#line 10368 "ImportPage.c"
}
}
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10206,26 +10378,29 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
_g_free0 (ext);
#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (current_name);
-#line 10205 "ImportPage.c"
+#line 10377 "ImportPage.c"
}
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (prev);
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp22_);
+ _g_object_unref0 (_tmp18_);
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (next);
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp9_);
#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (current);
-#line 10217 "ImportPage.c"
+#line 10389 "ImportPage.c"
}
}
}
}
-static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list) {
+static void
+import_page_load_previews_and_metadata (ImportPage* self,
+ GeeList* import_list)
+{
gint loaded_photos = 0;
GError * _inner_error_ = NULL;
#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10234,130 +10409,125 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_return_if_fail (GEE_IS_LIST (import_list));
#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
loaded_photos = 0;
-#line 10233 "ImportPage.c"
+#line 10408 "ImportPage.c"
{
GeeList* _import_source_list = NULL;
GeeList* _tmp0_;
- GeeList* _tmp1_;
gint _import_source_size = 0;
- GeeList* _tmp2_;
+ GeeList* _tmp1_;
+ gint _tmp2_;
gint _tmp3_;
- gint _tmp4_;
gint _import_source_index = 0;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = import_list;
-#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (import_list);
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _import_source_list = _tmp1_;
+ _import_source_list = _tmp0_;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _import_source_list;
+ _tmp1_ = _import_source_list;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _import_source_size = _tmp4_;
+ _import_source_size = _tmp3_;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_source_index = -1;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 10261 "ImportPage.c"
+#line 10433 "ImportPage.c"
+ gint _tmp4_;
gint _tmp5_;
gint _tmp6_;
- gint _tmp7_;
ImportSource* import_source = NULL;
- GeeList* _tmp8_;
- gint _tmp9_;
- gpointer _tmp10_;
+ GeeList* _tmp7_;
+ gint _tmp8_;
+ gpointer _tmp9_;
gchar* filename = NULL;
- ImportSource* _tmp11_;
- gchar* _tmp12_;
+ ImportSource* _tmp10_;
+ gchar* _tmp11_;
gchar* fulldir = NULL;
- ImportSource* _tmp13_;
- gchar* _tmp14_;
- const gchar* _tmp15_;
+ ImportSource* _tmp12_;
+ gchar* _tmp13_;
+ const gchar* _tmp14_;
PhotoImportSource* associated = NULL;
- gboolean _tmp19_ = FALSE;
- ImportSource* _tmp20_;
+ gboolean _tmp18_ = FALSE;
+ ImportSource* _tmp19_;
+ GtkProgressBar* _tmp25_;
GtkProgressBar* _tmp26_;
- GtkProgressBar* _tmp27_;
- ImportSource* _tmp28_;
+ ImportSource* _tmp27_;
+ gchar* _tmp28_;
gchar* _tmp29_;
gchar* _tmp30_;
gchar* _tmp31_;
- gchar* _tmp32_;
PhotoMetadata* metadata = NULL;
- const gchar* _tmp33_;
- gboolean _tmp34_;
+ const gchar* _tmp32_;
gchar* exif_only_md5 = NULL;
- PhotoMetadata* _tmp47_;
+ PhotoMetadata* _tmp45_;
GdkPixbuf* preview = NULL;
gchar* preview_md5 = NULL;
+ ImportSource* _tmp71_;
ImportSource* _tmp74_;
- ImportSource* _tmp77_;
- PhotoImportSource* _tmp83_;
- SourceCollection* _tmp107_;
- ImportSource* _tmp108_;
- GtkProgressBar* _tmp109_;
+ PhotoImportSource* _tmp80_;
+ SourceCollection* _tmp104_;
+ ImportSource* _tmp105_;
+ GtkProgressBar* _tmp106_;
+ gint _tmp107_;
+ gint _tmp108_;
+ gint _tmp109_;
gint _tmp110_;
- gint _tmp111_;
- GeeList* _tmp112_;
- gint _tmp113_;
- gint _tmp114_;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _import_source_index;
+ _tmp4_ = _import_source_index;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _import_source_index = _tmp5_ + 1;
+ _import_source_index = _tmp4_ + 1;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _import_source_index;
+ _tmp5_ = _import_source_index;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _import_source_size;
+ _tmp6_ = _import_source_size;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp6_ < _tmp7_)) {
+ if (!(_tmp5_ < _tmp6_)) {
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 10316 "ImportPage.c"
+#line 10486 "ImportPage.c"
}
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _import_source_list;
+ _tmp7_ = _import_source_list;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _import_source_index;
+ _tmp8_ = _import_source_index;
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = gee_list_get (_tmp8_, _tmp9_);
+ _tmp9_ = gee_list_get (_tmp7_, _tmp8_);
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_source = (ImportSource*) _tmp10_;
+ import_source = (ImportSource*) _tmp9_;
#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = import_source;
+ _tmp10_ = import_source;
#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = import_source_get_filename (_tmp11_);
+ _tmp11_ = import_source_get_filename (_tmp10_);
#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- filename = _tmp12_;
+ filename = _tmp11_;
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = import_source;
+ _tmp12_ = import_source;
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = import_source_get_fulldir (_tmp13_);
+ _tmp13_ = import_source_get_fulldir (_tmp12_);
#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- fulldir = _tmp14_;
+ fulldir = _tmp13_;
#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = fulldir;
+ _tmp14_ = fulldir;
#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp15_ == NULL) {
-#line 10342 "ImportPage.c"
- ImportSource* _tmp16_;
+ if (_tmp14_ == NULL) {
+#line 10512 "ImportPage.c"
+ ImportSource* _tmp15_;
+ gchar* _tmp16_;
gchar* _tmp17_;
- gchar* _tmp18_;
#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = import_source;
+ _tmp15_ = import_source;
#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
+ _tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject));
#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = _tmp17_;
+ _tmp17_ = _tmp16_;
#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_warning ("ImportPage.vala:1550: Skipping loading preview of %s: invalid folder n" \
-"ame", _tmp18_);
+"ame", _tmp17_);
#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp18_);
+ _g_free0 (_tmp17_);
#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (fulldir);
#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10366,145 +10536,143 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_object_unref0 (import_source);
#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 10364 "ImportPage.c"
+#line 10534 "ImportPage.c"
}
#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
associated = NULL;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = import_source;
+ _tmp19_ = import_source;
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10372 "ImportPage.c"
- ImportSource* _tmp21_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 10542 "ImportPage.c"
+ ImportSource* _tmp20_;
+ PhotoImportSource* _tmp21_;
PhotoImportSource* _tmp22_;
- PhotoImportSource* _tmp23_;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = import_source;
+ _tmp20_ = import_source;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+ _tmp21_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = _tmp22_;
+ _tmp22_ = _tmp21_;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _tmp23_ != NULL;
+ _tmp18_ = _tmp22_ != NULL;
#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp23_);
-#line 10386 "ImportPage.c"
+ _g_object_unref0 (_tmp22_);
+#line 10556 "ImportPage.c"
} else {
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = FALSE;
-#line 10390 "ImportPage.c"
+ _tmp18_ = FALSE;
+#line 10560 "ImportPage.c"
}
#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp19_) {
-#line 10394 "ImportPage.c"
- ImportSource* _tmp24_;
- PhotoImportSource* _tmp25_;
+ if (_tmp18_) {
+#line 10564 "ImportPage.c"
+ ImportSource* _tmp23_;
+ PhotoImportSource* _tmp24_;
#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = import_source;
+ _tmp23_ = import_source;
#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+ _tmp24_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (associated);
#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- associated = _tmp25_;
-#line 10405 "ImportPage.c"
+ associated = _tmp24_;
+#line 10575 "ImportPage.c"
}
#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = self->priv->progress_bar;
+ _tmp25_ = self->priv->progress_bar;
#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_ellipsize (_tmp26_, PANGO_ELLIPSIZE_MIDDLE);
+ gtk_progress_bar_set_ellipsize (_tmp25_, PANGO_ELLIPSIZE_MIDDLE);
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = self->priv->progress_bar;
+ _tmp26_ = self->priv->progress_bar;
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = import_source;
+ _tmp27_ = import_source;
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
+ _tmp28_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject));
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = _tmp29_;
+ _tmp29_ = _tmp28_;
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp30_);
+ _tmp30_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp29_);
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = _tmp31_;
+ _tmp31_ = _tmp30_;
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_text (_tmp27_, _tmp32_);
+ gtk_progress_bar_set_text (_tmp26_, _tmp31_);
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp32_);
+ _g_free0 (_tmp31_);
#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp30_);
+ _g_free0 (_tmp29_);
#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
metadata = NULL;
#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = filename;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = video_reader_is_supported_video_filename (_tmp33_);
+ _tmp32_ = filename;
#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp34_) {
-#line 10437 "ImportPage.c"
+ if (!video_reader_is_supported_video_filename (_tmp32_)) {
+#line 10605 "ImportPage.c"
{
- PhotoMetadata* _tmp35_ = NULL;
- GPSpinIdleWrapper* _tmp36_;
- GPContext* _tmp37_;
- Camera* _tmp38_;
- const gchar* _tmp39_;
- const gchar* _tmp40_;
- PhotoMetadata* _tmp41_;
- PhotoMetadata* _tmp42_;
+ PhotoMetadata* _tmp33_ = NULL;
+ GPSpinIdleWrapper* _tmp34_;
+ GPContext* _tmp35_;
+ Camera* _tmp36_;
+ const gchar* _tmp37_;
+ const gchar* _tmp38_;
+ PhotoMetadata* _tmp39_;
+ PhotoMetadata* _tmp40_;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = import_page_spin_idle_context;
+ _tmp34_ = import_page_spin_idle_context;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = self->priv->camera;
+ _tmp36_ = self->priv->camera;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = fulldir;
+ _tmp37_ = fulldir;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = filename;
+ _tmp38_ = filename;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = gp_load_metadata (_tmp37_, _tmp38_, _tmp39_, _tmp40_, &_inner_error_);
+ _tmp39_ = gp_load_metadata (_tmp35_, _tmp36_, _tmp37_, _tmp38_, &_inner_error_);
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = _tmp41_;
+ _tmp33_ = _tmp39_;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10463 "ImportPage.c"
+#line 10631 "ImportPage.c"
goto __catch77_g_error;
}
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = _tmp35_;
+ _tmp40_ = _tmp33_;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = NULL;
+ _tmp33_ = NULL;
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (metadata);
#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- metadata = _tmp42_;
+ metadata = _tmp40_;
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _media_metadata_unref0 (_tmp35_);
-#line 10476 "ImportPage.c"
+ _media_metadata_unref0 (_tmp33_);
+#line 10644 "ImportPage.c"
}
goto __finally77;
__catch77_g_error:
{
GError* err = NULL;
- const gchar* _tmp43_;
+ const gchar* _tmp41_;
+ const gchar* _tmp42_;
+ GError* _tmp43_;
const gchar* _tmp44_;
- GError* _tmp45_;
- const gchar* _tmp46_;
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = fulldir;
+ _tmp41_ = fulldir;
#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = filename;
+ _tmp42_ = filename;
#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = err;
+ _tmp43_ = err;
#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = _tmp45_->message;
+ _tmp44_ = _tmp43_->message;
#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1576: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_);
+ g_warning ("ImportPage.vala:1576: Unable to fetch metadata for %s/%s: %s", _tmp41_, _tmp42_, _tmp44_);
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10502 "ImportPage.c"
+#line 10670 "ImportPage.c"
}
__finally77:
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10527,168 +10695,165 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_clear_error (&_inner_error_);
#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10525 "ImportPage.c"
+#line 10693 "ImportPage.c"
}
}
#line 1582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
exif_only_md5 = NULL;
#line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = metadata;
+ _tmp45_ = metadata;
#line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp47_ != NULL) {
-#line 10534 "ImportPage.c"
- PhotoMetadata* _tmp48_;
- gchar* _tmp49_;
+ if (_tmp45_ != NULL) {
+#line 10702 "ImportPage.c"
+ PhotoMetadata* _tmp46_;
+ gchar* _tmp47_;
#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = metadata;
+ _tmp46_ = metadata;
#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = photo_metadata_exif_hash (_tmp48_);
+ _tmp47_ = photo_metadata_exif_hash (_tmp46_);
#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (exif_only_md5);
#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- exif_only_md5 = _tmp49_;
-#line 10545 "ImportPage.c"
+ exif_only_md5 = _tmp47_;
+#line 10713 "ImportPage.c"
}
#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview = NULL;
#line 1594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
preview_md5 = NULL;
-#line 10551 "ImportPage.c"
+#line 10719 "ImportPage.c"
{
gchar* preview_fulldir = NULL;
+ const gchar* _tmp48_;
+ gchar* _tmp49_;
+ gchar* preview_filename = NULL;
const gchar* _tmp50_;
gchar* _tmp51_;
- gchar* preview_filename = NULL;
- const gchar* _tmp52_;
- gchar* _tmp53_;
- PhotoImportSource* _tmp54_;
- GdkPixbuf* _tmp59_ = NULL;
- GPSpinIdleWrapper* _tmp60_;
- GPContext* _tmp61_;
- Camera* _tmp62_;
- const gchar* _tmp63_;
- const gchar* _tmp64_;
- gchar* _tmp65_ = NULL;
- GdkPixbuf* _tmp66_;
- GdkPixbuf* _tmp67_;
+ PhotoImportSource* _tmp52_;
+ GdkPixbuf* _tmp57_ = NULL;
+ GPSpinIdleWrapper* _tmp58_;
+ GPContext* _tmp59_;
+ Camera* _tmp60_;
+ const gchar* _tmp61_;
+ const gchar* _tmp62_;
+ gchar* _tmp63_ = NULL;
+ GdkPixbuf* _tmp64_;
+ GdkPixbuf* _tmp65_;
#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = fulldir;
+ _tmp48_ = fulldir;
#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = g_strdup (_tmp50_);
+ _tmp49_ = g_strdup (_tmp48_);
#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_fulldir = _tmp51_;
+ preview_fulldir = _tmp49_;
#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = filename;
+ _tmp50_ = filename;
#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = g_strdup (_tmp52_);
+ _tmp51_ = g_strdup (_tmp50_);
#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_filename = _tmp53_;
+ preview_filename = _tmp51_;
#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = associated;
+ _tmp52_ = associated;
#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp54_ != NULL) {
-#line 10585 "ImportPage.c"
+ if (_tmp52_ != NULL) {
+#line 10753 "ImportPage.c"
+ PhotoImportSource* _tmp53_;
+ gchar* _tmp54_;
PhotoImportSource* _tmp55_;
gchar* _tmp56_;
- PhotoImportSource* _tmp57_;
- gchar* _tmp58_;
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = associated;
+ _tmp53_ = associated;
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp54_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_fulldir = _tmp56_;
+ preview_fulldir = _tmp54_;
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = associated;
+ _tmp55_ = associated;
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp56_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_filename = _tmp58_;
-#line 10606 "ImportPage.c"
+ preview_filename = _tmp56_;
+#line 10774 "ImportPage.c"
}
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = import_page_spin_idle_context;
+ _tmp58_ = import_page_spin_idle_context;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp59_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = self->priv->camera;
+ _tmp60_ = self->priv->camera;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = preview_fulldir;
+ _tmp61_ = preview_fulldir;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = preview_filename;
+ _tmp62_ = preview_filename;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = gp_load_preview (_tmp61_, _tmp62_, _tmp63_, _tmp64_, &_tmp65_, &_inner_error_);
+ _tmp64_ = gp_load_preview (_tmp59_, _tmp60_, _tmp61_, _tmp62_, &_tmp63_, &_inner_error_);
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_md5);
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview_md5 = _tmp65_;
+ preview_md5 = _tmp63_;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = _tmp66_;
+ _tmp57_ = _tmp64_;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10632 "ImportPage.c"
+#line 10800 "ImportPage.c"
goto __catch78_g_error;
}
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = _tmp59_;
+ _tmp65_ = _tmp57_;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = NULL;
+ _tmp57_ = NULL;
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (preview);
#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview = _tmp67_;
+ preview = _tmp65_;
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp59_);
+ _g_object_unref0 (_tmp57_);
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_filename);
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (preview_fulldir);
-#line 10649 "ImportPage.c"
+#line 10817 "ImportPage.c"
}
goto __finally78;
__catch78_g_error:
{
GError* err = NULL;
- const gchar* _tmp68_;
- gboolean _tmp69_;
+ const gchar* _tmp66_;
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = filename;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = video_reader_is_supported_video_filename (_tmp68_);
+ _tmp66_ = filename;
#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp69_) {
-#line 10667 "ImportPage.c"
+ if (!video_reader_is_supported_video_filename (_tmp66_)) {
+#line 10832 "ImportPage.c"
+ const gchar* _tmp67_;
+ const gchar* _tmp68_;
+ GError* _tmp69_;
const gchar* _tmp70_;
- const gchar* _tmp71_;
- GError* _tmp72_;
- const gchar* _tmp73_;
#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = fulldir;
+ _tmp67_ = fulldir;
#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = filename;
+ _tmp68_ = filename;
#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = err;
+ _tmp69_ = err;
#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = _tmp72_->message;
+ _tmp70_ = _tmp69_->message;
#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1611: Unable to fetch preview for %s/%s: %s", _tmp70_, _tmp71_, _tmp73_);
-#line 10682 "ImportPage.c"
+ g_warning ("ImportPage.vala:1611: Unable to fetch preview for %s/%s: %s", _tmp67_, _tmp68_, _tmp70_);
+#line 10847 "ImportPage.c"
}
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10686 "ImportPage.c"
+#line 10851 "ImportPage.c"
}
__finally78:
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10717,157 +10882,157 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_clear_error (&_inner_error_);
#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10715 "ImportPage.c"
+#line 10880 "ImportPage.c"
}
#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = import_source;
+ _tmp71_ = import_source;
#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10721 "ImportPage.c"
- ImportSource* _tmp75_;
- GdkPixbuf* _tmp76_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp71_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 10886 "ImportPage.c"
+ ImportSource* _tmp72_;
+ GdkPixbuf* _tmp73_;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = import_source;
+ _tmp72_ = import_source;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = preview;
+ _tmp73_ = preview;
#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp75_) : NULL, _tmp76_);
-#line 10730 "ImportPage.c"
+ video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp72_) : NULL, _tmp73_);
+#line 10895 "ImportPage.c"
}
#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = import_source;
+ _tmp74_ = import_source;
#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp77_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10736 "ImportPage.c"
- ImportSource* _tmp78_;
- GdkPixbuf* _tmp79_;
- const gchar* _tmp80_;
- PhotoMetadata* _tmp81_;
- const gchar* _tmp82_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 10901 "ImportPage.c"
+ ImportSource* _tmp75_;
+ GdkPixbuf* _tmp76_;
+ const gchar* _tmp77_;
+ PhotoMetadata* _tmp78_;
+ const gchar* _tmp79_;
#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = import_source;
+ _tmp75_ = import_source;
#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = preview;
+ _tmp76_ = preview;
#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = preview_md5;
+ _tmp77_ = preview_md5;
#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = metadata;
+ _tmp78_ = metadata;
#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = exif_only_md5;
+ _tmp79_ = exif_only_md5;
#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp78_) : NULL, _tmp79_, _tmp80_, _tmp81_, _tmp82_);
-#line 10754 "ImportPage.c"
+ photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp75_) : NULL, _tmp76_, _tmp77_, _tmp78_, _tmp79_);
+#line 10919 "ImportPage.c"
}
#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = associated;
+ _tmp80_ = associated;
#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp83_ != NULL) {
-#line 10760 "ImportPage.c"
+ if (_tmp80_ != NULL) {
+#line 10925 "ImportPage.c"
{
PhotoMetadata* associated_metadata = NULL;
- GPSpinIdleWrapper* _tmp84_;
- GPContext* _tmp85_;
- Camera* _tmp86_;
+ GPSpinIdleWrapper* _tmp81_;
+ GPContext* _tmp82_;
+ Camera* _tmp83_;
+ PhotoImportSource* _tmp84_;
+ gchar* _tmp85_;
+ gchar* _tmp86_;
PhotoImportSource* _tmp87_;
gchar* _tmp88_;
gchar* _tmp89_;
- PhotoImportSource* _tmp90_;
- gchar* _tmp91_;
- gchar* _tmp92_;
- PhotoMetadata* _tmp93_;
- PhotoMetadata* _tmp94_;
- PhotoImportSource* _tmp95_;
- GdkPixbuf* _tmp96_;
- const gchar* _tmp97_;
- PhotoMetadata* _tmp98_;
+ PhotoMetadata* _tmp90_;
+ PhotoMetadata* _tmp91_;
+ PhotoImportSource* _tmp92_;
+ GdkPixbuf* _tmp93_;
+ const gchar* _tmp94_;
+ PhotoMetadata* _tmp95_;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = import_page_spin_idle_context;
+ _tmp81_ = import_page_spin_idle_context;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+ _tmp82_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = self->priv->camera;
-#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = associated;
+ _tmp83_ = self->priv->camera;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp84_ = associated;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = _tmp88_;
+ _tmp85_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = associated;
+ _tmp86_ = _tmp85_;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp87_ = associated;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp92_ = _tmp91_;
+ _tmp88_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp93_ = gp_load_metadata (_tmp85_, _tmp86_, _tmp89_, _tmp92_, &_inner_error_);
+ _tmp89_ = _tmp88_;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp94_ = _tmp93_;
+ _tmp90_ = gp_load_metadata (_tmp82_, _tmp83_, _tmp86_, _tmp89_, &_inner_error_);
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp92_);
+ _tmp91_ = _tmp90_;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp89_);
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- associated_metadata = _tmp94_;
+ _g_free0 (_tmp86_);
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ associated_metadata = _tmp91_;
#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10808 "ImportPage.c"
+#line 10973 "ImportPage.c"
goto __catch79_g_error;
}
#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp95_ = associated;
+ _tmp92_ = associated;
#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp96_ = preview;
+ _tmp93_ = preview;
#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp97_ = preview_md5;
+ _tmp94_ = preview_md5;
#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp98_ = associated_metadata;
+ _tmp95_ = associated_metadata;
#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo_import_source_update (_tmp95_, _tmp96_, _tmp97_, _tmp98_, NULL);
+ photo_import_source_update (_tmp92_, _tmp93_, _tmp94_, _tmp95_, NULL);
#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (associated_metadata);
-#line 10823 "ImportPage.c"
+#line 10988 "ImportPage.c"
}
goto __finally79;
__catch79_g_error:
{
GError* err = NULL;
+ PhotoImportSource* _tmp96_;
+ gchar* _tmp97_;
+ gchar* _tmp98_;
PhotoImportSource* _tmp99_;
gchar* _tmp100_;
gchar* _tmp101_;
- PhotoImportSource* _tmp102_;
- gchar* _tmp103_;
- gchar* _tmp104_;
- GError* _tmp105_;
- const gchar* _tmp106_;
+ GError* _tmp102_;
+ const gchar* _tmp103_;
#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp99_ = associated;
-#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp100_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp96_ = associated;
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp101_ = _tmp100_;
+ _tmp97_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp102_ = associated;
+ _tmp98_ = _tmp97_;
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp103_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource));
+ _tmp99_ = associated;
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp104_ = _tmp103_;
+ _tmp100_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_IMPORT_SOURCE, ImportSource));
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp105_ = err;
+ _tmp101_ = _tmp100_;
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp106_ = _tmp105_->message;
+ _tmp102_ = err;
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_warning ("ImportPage.vala:1632: Unable to fetch metadata for %s/%s: %s", _tmp101_, _tmp104_, _tmp106_);
+ _tmp103_ = _tmp102_->message;
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp104_);
+ g_warning ("ImportPage.vala:1632: Unable to fetch metadata for %s/%s: %s", _tmp98_, _tmp101_, _tmp103_);
#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (_tmp101_);
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+ _g_free0 (_tmp98_);
#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 10865 "ImportPage.c"
+#line 11030 "ImportPage.c"
}
__finally79:
#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10896,31 +11061,29 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
g_clear_error (&_inner_error_);
#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 10894 "ImportPage.c"
+#line 11059 "ImportPage.c"
}
}
#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp107_ = self->priv->import_sources;
+ _tmp104_ = self->priv->import_sources;
#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp108_ = import_source;
+ _tmp105_ = import_source;
#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_DATA_OBJECT, DataObject));
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_DATA_OBJECT, DataObject));
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp109_ = self->priv->progress_bar;
+ _tmp106_ = self->priv->progress_bar;
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp110_ = loaded_photos;
+ _tmp107_ = loaded_photos;
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- loaded_photos = _tmp110_ + 1;
+ loaded_photos = _tmp107_ + 1;
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp111_ = loaded_photos;
+ _tmp108_ = loaded_photos;
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp112_ = import_list;
+ _tmp109_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (import_list, GEE_TYPE_COLLECTION, GeeCollection));
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp113_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp110_ = _tmp109_;
#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp114_ = _tmp113_;
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_progress_bar_set_fraction (_tmp109_, ((gdouble) _tmp111_) / ((gdouble) _tmp114_));
+ gtk_progress_bar_set_fraction (_tmp106_, ((gdouble) _tmp108_) / ((gdouble) _tmp110_));
#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
spin_event_loop ();
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10939,78 +11102,76 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
_g_free0 (filename);
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_source);
-#line 10937 "ImportPage.c"
+#line 11100 "ImportPage.c"
}
#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_import_source_list);
-#line 10941 "ImportPage.c"
+#line 11104 "ImportPage.c"
}
}
-static void import_page_on_hide_imported (ImportPage* self) {
+static void
+import_page_on_hide_imported (ImportPage* self)
+{
GtkCheckButton* _tmp0_;
- gboolean _tmp1_;
+ ConfigFacade* _tmp7_;
ConfigFacade* _tmp8_;
- ConfigFacade* _tmp9_;
- GtkCheckButton* _tmp10_;
- gboolean _tmp11_;
+ GtkCheckButton* _tmp9_;
#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = self->priv->hide_imported;
#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp1_) {
-#line 10961 "ImportPage.c"
+ if (gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton))) {
+#line 11122 "ImportPage.c"
+ ViewCollection* _tmp1_;
ViewCollection* _tmp2_;
- ViewCollection* _tmp3_;
- ImportPageHideImportedViewFilter* _tmp4_;
+ ImportPageHideImportedViewFilter* _tmp3_;
#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = self->priv->hide_imported_filter;
+ _tmp3_ = self->priv->hide_imported_filter;
#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- view_collection_install_view_filter (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_FILTER, ViewFilter));
+ view_collection_install_view_filter (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_VIEW_FILTER, ViewFilter));
#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp3_);
-#line 10975 "ImportPage.c"
+ _data_collection_unref0 (_tmp2_);
+#line 11136 "ImportPage.c"
} else {
+ ViewCollection* _tmp4_;
ViewCollection* _tmp5_;
- ViewCollection* _tmp6_;
- ImportPageHideImportedViewFilter* _tmp7_;
+ ImportPageHideImportedViewFilter* _tmp6_;
#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = self->priv->hide_imported_filter;
+ _tmp6_ = self->priv->hide_imported_filter;
#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- view_collection_remove_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter));
+ view_collection_remove_view_filter (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_FILTER, ViewFilter));
#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _data_collection_unref0 (_tmp6_);
-#line 10990 "ImportPage.c"
+ _data_collection_unref0 (_tmp5_);
+#line 11151 "ImportPage.c"
}
#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = config_facade_get_instance ();
-#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp7_ = config_facade_get_instance ();
#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = self->priv->hide_imported;
+ _tmp8_ = _tmp7_;
#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp9_ = self->priv->hide_imported;
#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_);
+ configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)));
#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp9_);
-#line 11004 "ImportPage.c"
+ _g_object_unref0 (_tmp8_);
+#line 11163 "ImportPage.c"
}
-static void import_page_on_import_selected (ImportPage* self) {
+static void
+import_page_on_import_selected (ImportPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
GeeList* _tmp2_;
@@ -11031,11 +11192,13 @@ static void import_page_on_import_selected (ImportPage* self) {
_g_object_unref0 (_tmp3_);
#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 11029 "ImportPage.c"
+#line 11190 "ImportPage.c"
}
-static void import_page_on_import_all (ImportPage* self) {
+static void
+import_page_on_import_all (ImportPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
GeeCollection* _tmp2_;
@@ -11056,60 +11219,79 @@ static void import_page_on_import_all (ImportPage* self) {
_g_object_unref0 (_tmp3_);
#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_data_collection_unref0 (_tmp1_);
-#line 11054 "ImportPage.c"
+#line 11217 "ImportPage.c"
}
-static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, gpointer self) {
+static gint64
+_import_page_import_job_comparator_comparator (void* a,
+ void* b,
+ gpointer self)
+{
gint64 result;
result = import_page_import_job_comparator ((ImportPage*) self, a, b);
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 11063 "ImportPage.c"
+#line 11230 "ImportPage.c"
}
-static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
+static void
+_import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self)
+{
#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import_reporter ((ImportPage*) self, manifest);
-#line 11070 "ImportPage.c"
+#line 11241 "ImportPage.c"
}
-static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) {
+static void
+_import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender,
+ BatchImportResult* _result_,
+ gpointer self)
+{
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 11077 "ImportPage.c"
+#line 11252 "ImportPage.c"
}
-static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
+static void
+_import_page_close_import_batch_import_import_complete (BatchImport* _sender,
+ ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self)
+{
#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_close_import ((ImportPage*) self);
-#line 11084 "ImportPage.c"
+#line 11264 "ImportPage.c"
}
-static void import_page_import (ImportPage* self, GeeIterable* items) {
+static void
+import_page_import (ImportPage* self,
+ GeeIterable* items)
+{
int res = 0;
Camera* _tmp0_;
GPSpinIdleWrapper* _tmp1_;
GPContext* _tmp2_;
int _tmp3_;
- int _tmp4_;
- gboolean _tmp10_;
- GtkProgressBar* _tmp11_;
+ gboolean _tmp9_;
+ GtkProgressBar* _tmp10_;
SortedList* jobs = NULL;
- SortedList* _tmp12_;
+ SortedList* _tmp11_;
GeeArrayList* already_imported = NULL;
- GeeArrayList* _tmp13_;
+ GeeArrayList* _tmp12_;
+ SortedList* _tmp50_;
+ gint _tmp51_;
+ gint _tmp52_;
+ const gchar* _tmp53_;
SortedList* _tmp54_;
gint _tmp55_;
gint _tmp56_;
- const gchar* _tmp57_;
- SortedList* _tmp58_;
- gint _tmp59_;
- gint _tmp60_;
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11121,171 +11303,160 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = gp_camera_init (_tmp0_, _tmp2_);
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp3_;
+ res = gp_camera_init (_tmp0_, _tmp2_);
#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = res;
+ _tmp3_ = res;
#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp4_ != GP_OK) {
-#line 11126 "ImportPage.c"
- int _tmp5_;
+ if (_tmp3_ != GP_OK) {
+#line 11306 "ImportPage.c"
+ int _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = res;
+ _tmp4_ = res;
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = gp_result_to_full_string (_tmp5_);
+ _tmp5_ = gp_result_to_full_string (_tmp4_);
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp7_);
+ _tmp7_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp6_);
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- app_window_error_message (_tmp9_, NULL);
+ app_window_error_message (_tmp8_, NULL);
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp8_);
#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp7_);
+ _g_free0 (_tmp6_);
#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11150 "ImportPage.c"
+#line 11330 "ImportPage.c"
}
#line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = self->priv->refreshed;
+ _tmp9_ = self->priv->refreshed;
#line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, TRUE, _tmp10_);
+ import_page_update_status (self, TRUE, _tmp9_);
#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = self->priv->progress_bar;
+ _tmp10_ = self->priv->progress_bar;
#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
+ _tmp11_ = 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 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- jobs = _tmp12_;
+ jobs = _tmp11_;
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+ _tmp12_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- already_imported = _tmp13_;
-#line 11170 "ImportPage.c"
+ already_imported = _tmp12_;
+#line 11350 "ImportPage.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp14_;
- GeeIterator* _tmp15_;
+ GeeIterator* _tmp13_;
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = items;
+ _tmp13_ = gee_iterable_iterator (items);
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _object_it = _tmp15_;
+ _object_it = _tmp13_;
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 11183 "ImportPage.c"
- GeeIterator* _tmp16_;
- gboolean _tmp17_;
+#line 11360 "ImportPage.c"
+ GeeIterator* _tmp14_;
DataObject* object = NULL;
- GeeIterator* _tmp18_;
- gpointer _tmp19_;
+ GeeIterator* _tmp15_;
+ gpointer _tmp16_;
ImportPreview* preview = NULL;
- DataObject* _tmp20_;
- ImportPreview* _tmp21_;
+ DataObject* _tmp17_;
+ ImportPreview* _tmp18_;
ImportSource* import_file = NULL;
- ImportPreview* _tmp22_;
- DataSource* _tmp23_;
- ImportPreview* _tmp24_;
- gboolean _tmp25_;
+ ImportPreview* _tmp19_;
+ DataSource* _tmp20_;
+ ImportPreview* _tmp21_;
ImportPageCameraImportJob* import_job = NULL;
- GPContextWrapper* _tmp37_;
- ImportSource* _tmp38_;
- ImportPageCameraImportJob* _tmp39_;
- gboolean _tmp40_ = FALSE;
- ImportSource* _tmp41_;
- SortedList* _tmp52_;
- ImportPageCameraImportJob* _tmp53_;
+ GPContextWrapper* _tmp33_;
+ ImportSource* _tmp34_;
+ ImportPageCameraImportJob* _tmp35_;
+ gboolean _tmp36_ = FALSE;
+ ImportSource* _tmp37_;
+ SortedList* _tmp48_;
+ ImportPageCameraImportJob* _tmp49_;
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = _object_it;
+ _tmp14_ = _object_it;
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = gee_iterator_next (_tmp16_);
-#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp17_) {
+ if (!gee_iterator_next (_tmp14_)) {
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11213 "ImportPage.c"
+#line 11386 "ImportPage.c"
}
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = _object_it;
+ _tmp15_ = _object_it;
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = gee_iterator_get (_tmp18_);
+ _tmp16_ = gee_iterator_get (_tmp15_);
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- object = (DataObject*) _tmp19_;
+ object = (DataObject*) _tmp16_;
#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = object;
+ _tmp17_ = object;
#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_PREVIEW, ImportPreview));
+ _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_IMPORT_PREVIEW, ImportPreview));
#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- preview = _tmp21_;
+ preview = _tmp18_;
#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = preview;
+ _tmp19_ = preview;
#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_VIEW, DataView));
+ _tmp20_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_VIEW, DataView));
#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = preview;
+ import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_SOURCE, ImportSource);
#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = import_preview_is_already_imported (_tmp24_);
+ _tmp21_ = preview;
#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp25_) {
-#line 11239 "ImportPage.c"
- ImportSource* _tmp26_;
- gchar* _tmp27_;
- gchar* _tmp28_;
- GeeArrayList* _tmp29_;
- GPContextWrapper* _tmp30_;
- ImportSource* _tmp31_;
- ImportPreview* _tmp32_;
- DuplicatedFile* _tmp33_;
- DuplicatedFile* _tmp34_;
- ImportPageCameraImportJob* _tmp35_;
- ImportPageCameraImportJob* _tmp36_;
+ if (import_preview_is_already_imported (_tmp21_)) {
+#line 11410 "ImportPage.c"
+ ImportSource* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ GeeArrayList* _tmp25_;
+ GPContextWrapper* _tmp26_;
+ ImportSource* _tmp27_;
+ ImportPreview* _tmp28_;
+ DuplicatedFile* _tmp29_;
+ DuplicatedFile* _tmp30_;
+ ImportPageCameraImportJob* _tmp31_;
+ ImportPageCameraImportJob* _tmp32_;
#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = import_file;
+ _tmp22_ = import_file;
#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = import_source_get_filename (_tmp26_);
+ _tmp23_ = import_source_get_filename (_tmp22_);
#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = _tmp27_;
+ _tmp24_ = _tmp23_;
#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_message ("ImportPage.vala:1689: Skipping import of %s: checksum detected in libr" \
-"ary", _tmp28_);
+"ary", _tmp24_);
#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp28_);
+ _g_free0 (_tmp24_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = already_imported;
+ _tmp25_ = already_imported;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = import_page_null_context;
+ _tmp26_ = import_page_null_context;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = import_file;
+ _tmp27_ = import_file;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = preview;
+ _tmp28_ = preview;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = import_preview_get_duplicated_file (_tmp32_);
+ _tmp29_ = import_preview_get_duplicated_file (_tmp28_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = _tmp33_;
+ _tmp30_ = _tmp29_;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = import_page_camera_import_job_new (_tmp30_, _tmp31_, _tmp34_);
+ _tmp31_ = import_page_camera_import_job_new (_tmp26_, _tmp27_, _tmp30_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp32_ = _tmp31_;
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_import_job_unref0 (_tmp36_);
+ _batch_import_job_unref0 (_tmp32_);
#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp34_);
+ _g_object_unref0 (_tmp30_);
#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (import_file);
#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11294,78 +11465,78 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_g_object_unref0 (object);
#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
continue;
-#line 11291 "ImportPage.c"
+#line 11462 "ImportPage.c"
}
#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = import_page_null_context;
+ _tmp33_ = import_page_null_context;
#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = import_file;
+ _tmp34_ = import_file;
#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = import_page_camera_import_job_new (_tmp37_, _tmp38_, NULL);
+ _tmp35_ = import_page_camera_import_job_new (_tmp33_, _tmp34_, NULL);
#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_job = _tmp39_;
+ import_job = _tmp35_;
#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = import_file;
+ _tmp37_ = import_file;
#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11305 "ImportPage.c"
- ImportSource* _tmp42_;
- PhotoImportSource* _tmp43_;
- PhotoImportSource* _tmp44_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 11476 "ImportPage.c"
+ ImportSource* _tmp38_;
+ PhotoImportSource* _tmp39_;
+ PhotoImportSource* _tmp40_;
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = import_file;
+ _tmp38_ = import_file;
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+ _tmp39_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = _tmp43_;
+ _tmp40_ = _tmp39_;
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = _tmp44_ != NULL;
+ _tmp36_ = _tmp40_ != NULL;
#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp44_);
-#line 11319 "ImportPage.c"
+ _g_object_unref0 (_tmp40_);
+#line 11490 "ImportPage.c"
} else {
#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = FALSE;
-#line 11323 "ImportPage.c"
+ _tmp36_ = FALSE;
+#line 11494 "ImportPage.c"
}
#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp40_) {
-#line 11327 "ImportPage.c"
- ImportPageCameraImportJob* _tmp45_;
- GPContextWrapper* _tmp46_;
- ImportSource* _tmp47_;
- PhotoImportSource* _tmp48_;
- PhotoImportSource* _tmp49_;
- ImportPageCameraImportJob* _tmp50_;
- ImportPageCameraImportJob* _tmp51_;
+ if (_tmp36_) {
+#line 11498 "ImportPage.c"
+ ImportPageCameraImportJob* _tmp41_;
+ GPContextWrapper* _tmp42_;
+ ImportSource* _tmp43_;
+ PhotoImportSource* _tmp44_;
+ PhotoImportSource* _tmp45_;
+ ImportPageCameraImportJob* _tmp46_;
+ ImportPageCameraImportJob* _tmp47_;
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = import_job;
+ _tmp41_ = import_job;
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = import_page_null_context;
+ _tmp42_ = import_page_null_context;
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = import_file;
+ _tmp43_ = import_file;
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
+ _tmp44_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = _tmp48_;
+ _tmp45_ = _tmp44_;
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_page_camera_import_job_new (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
+ _tmp46_ = import_page_camera_import_job_new (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = _tmp50_;
+ _tmp47_ = _tmp46_;
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
+ batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_import_job_unref0 (_tmp51_);
+ _batch_import_job_unref0 (_tmp47_);
#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp49_);
-#line 11355 "ImportPage.c"
+ _g_object_unref0 (_tmp45_);
+#line 11526 "ImportPage.c"
}
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = jobs;
+ _tmp48_ = jobs;
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = import_job;
+ _tmp49_ = import_job;
#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_);
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (import_job);
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11374,181 +11545,175 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
_g_object_unref0 (preview);
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (object);
-#line 11371 "ImportPage.c"
+#line 11542 "ImportPage.c"
}
#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_object_it);
-#line 11375 "ImportPage.c"
+#line 11546 "ImportPage.c"
}
#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = jobs;
+ _tmp50_ = jobs;
#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp51_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = _tmp55_;
+ _tmp52_ = _tmp51_;
#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = self->priv->camera_name;
+ _tmp53_ = self->priv->camera_name;
#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_debug ("ImportPage.vala:1710: Importing %d files from %s", _tmp56_, _tmp57_);
+ g_debug ("ImportPage.vala:1710: Importing %d files from %s", _tmp52_, _tmp53_);
#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = jobs;
+ _tmp54_ = jobs;
#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = _tmp59_;
+ _tmp56_ = _tmp55_;
#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp60_ > 0) {
-#line 11395 "ImportPage.c"
- ImportPage* _tmp61_;
- ImportPage* _tmp62_;
+ if (_tmp56_ > 0) {
+#line 11566 "ImportPage.c"
+ ImportPage* _tmp57_;
+ ImportPage* _tmp58_;
BatchImport* batch_import = NULL;
- SortedList* _tmp63_;
- const gchar* _tmp64_;
- GeeArrayList* _tmp65_;
- BatchImport* _tmp66_;
+ SortedList* _tmp59_;
+ const gchar* _tmp60_;
+ GeeArrayList* _tmp61_;
+ BatchImport* _tmp62_;
+ BatchImport* _tmp63_;
+ BatchImport* _tmp64_;
+ LibraryWindow* _tmp65_;
+ LibraryWindow* _tmp66_;
BatchImport* _tmp67_;
- BatchImport* _tmp68_;
+ LibraryWindow* _tmp68_;
LibraryWindow* _tmp69_;
- LibraryWindow* _tmp70_;
- BatchImport* _tmp71_;
- LibraryWindow* _tmp72_;
- LibraryWindow* _tmp73_;
#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = self->priv->local_ref;
+ _tmp57_ = self->priv->local_ref;
#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _vala_assert (_tmp61_ == NULL, "local_ref == null");
+ _vala_assert (_tmp57_ == NULL, "local_ref == null");
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = _g_object_ref0 (self);
+ _tmp58_ = _g_object_ref0 (self);
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->local_ref);
#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->local_ref = _tmp62_;
+ self->priv->local_ref = _tmp58_;
#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = jobs;
+ _tmp59_ = jobs;
#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = self->priv->camera_name;
+ _tmp60_ = self->priv->camera_name;
#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = already_imported;
+ _tmp61_ = already_imported;
#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ITERABLE, GeeIterable), _tmp64_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp65_, NULL, NULL, NULL);
+ _tmp62_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable), _tmp60_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp61_, NULL, NULL, NULL);
#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- batch_import = _tmp66_;
+ batch_import = _tmp62_;
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = batch_import;
+ _tmp63_ = batch_import;
#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp67_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
+ g_signal_connect_object (_tmp63_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = batch_import;
+ _tmp64_ = batch_import;
#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_signal_connect_object (_tmp68_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
+ g_signal_connect_object (_tmp64_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = library_window_get_app ();
+ _tmp65_ = library_window_get_app ();
#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = _tmp69_;
+ _tmp66_ = _tmp65_;
#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = batch_import;
+ _tmp67_ = batch_import;
#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_window_enqueue_batch_import (_tmp70_, _tmp71_, TRUE);
+ library_window_enqueue_batch_import (_tmp66_, _tmp67_, TRUE);
#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp70_);
+ _g_object_unref0 (_tmp66_);
#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = library_window_get_app ();
+ _tmp68_ = library_window_get_app ();
#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = _tmp72_;
+ _tmp69_ = _tmp68_;
#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- library_window_switch_to_import_queue_page (_tmp73_);
+ library_window_switch_to_import_queue_page (_tmp69_);
#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp73_);
+ _g_object_unref0 (_tmp69_);
#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (batch_import);
-#line 11458 "ImportPage.c"
+#line 11629 "ImportPage.c"
} else {
- GeeArrayList* _tmp74_;
- gint _tmp75_;
- gint _tmp76_;
+ GeeArrayList* _tmp70_;
+ gint _tmp71_;
+ gint _tmp72_;
#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = already_imported;
+ _tmp70_ = already_imported;
#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp71_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = _tmp75_;
+ _tmp72_ = _tmp71_;
#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp76_ > 0) {
-#line 11471 "ImportPage.c"
- GeeArrayList* _tmp77_;
- ImportManifest* _tmp78_;
- ImportManifest* _tmp79_;
+ if (_tmp72_ > 0) {
+#line 11642 "ImportPage.c"
+ GeeArrayList* _tmp73_;
+ ImportManifest* _tmp74_;
+ ImportManifest* _tmp75_;
#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = already_imported;
+ _tmp73_ = already_imported;
#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_LIST, GeeList));
+ _tmp74_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_LIST, GeeList));
#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = _tmp78_;
+ _tmp75_ = _tmp74_;
#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_import_reporter (self, _tmp79_);
+ import_page_import_reporter (self, _tmp75_);
#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _import_manifest_unref0 (_tmp79_);
-#line 11485 "ImportPage.c"
+ _import_manifest_unref0 (_tmp75_);
+#line 11656 "ImportPage.c"
}
#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_close_import (self);
-#line 11489 "ImportPage.c"
+#line 11660 "ImportPage.c"
}
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (already_imported);
#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (jobs);
-#line 11495 "ImportPage.c"
+#line 11666 "ImportPage.c"
}
-static void import_page_on_import_job_failed (ImportPage* self, BatchImportResult* _result_) {
+static void
+import_page_on_import_job_failed (ImportPage* self,
+ BatchImportResult* _result_)
+{
gboolean _tmp0_ = FALSE;
- BatchImportResult* _tmp1_;
- GFile* _tmp2_;
+ GFile* _tmp1_;
GError * _inner_error_ = NULL;
#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_BATCH_IMPORT_RESULT (_result_));
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _result_;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _tmp1_->file;
+ _tmp1_ = _result_->file;
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp2_ == NULL) {
+ if (_tmp1_ == NULL) {
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = TRUE;
-#line 11516 "ImportPage.c"
+#line 11687 "ImportPage.c"
} else {
- BatchImportResult* _tmp3_;
- ImportResult _tmp4_;
+ ImportResult _tmp2_;
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _result_;
+ _tmp2_ = _result_->result;
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = _tmp3_->result;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11526 "ImportPage.c"
+ _tmp0_ = _tmp2_ == IMPORT_RESULT_SUCCESS;
+#line 11694 "ImportPage.c"
}
#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (_tmp0_) {
#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11532 "ImportPage.c"
+#line 11700 "ImportPage.c"
}
{
- BatchImportResult* _tmp5_;
- GFile* _tmp6_;
-#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _result_;
+ GFile* _tmp3_;
#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = _tmp5_->file;
+ _tmp3_ = _result_->file;
#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_file_delete (_tmp6_, NULL, &_inner_error_);
+ g_file_delete (_tmp3_, NULL, &_inner_error_);
#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11545 "ImportPage.c"
+#line 11710 "ImportPage.c"
goto __catch80_g_error;
}
}
@@ -11556,35 +11721,32 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
__catch80_g_error:
{
GError* err = NULL;
- BatchImportResult* _tmp7_;
- GFile* _tmp8_;
- gchar* _tmp9_;
- gchar* _tmp10_;
- GError* _tmp11_;
- const gchar* _tmp12_;
+ GFile* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ GError* _tmp7_;
+ const gchar* _tmp8_;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
err = _inner_error_;
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_inner_error_ = NULL;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _result_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = _tmp7_->file;
+ _tmp4_ = _result_->file;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = g_file_get_path (_tmp8_);
+ _tmp5_ = g_file_get_path (_tmp4_);
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp6_ = _tmp5_;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = err;
+ _tmp7_ = err;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = _tmp11_->message;
+ _tmp8_ = _tmp7_->message;
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1742: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_);
+ g_message ("ImportPage.vala:1742: Unable to delete downloaded file %s: %s", _tmp6_, _tmp8_);
#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp10_);
+ _g_free0 (_tmp6_);
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_error_free0 (err);
-#line 11581 "ImportPage.c"
+#line 11743 "ImportPage.c"
}
__finally80:
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11595,52 +11757,60 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
g_clear_error (&_inner_error_);
#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11592 "ImportPage.c"
+#line 11754 "ImportPage.c"
}
}
-static gpointer _batch_import_job_ref0 (gpointer self) {
+static gpointer
+_batch_import_job_ref0 (gpointer self)
+{
#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? batch_import_job_ref (self) : NULL;
-#line 11600 "ImportPage.c"
+#line 11764 "ImportPage.c"
}
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
+static gboolean
+_progress_dialog_monitor_progress_monitor (guint64 current,
+ guint64 total,
+ gboolean do_event_loop,
+ gpointer self)
+{
gboolean result;
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 11609 "ImportPage.c"
+#line 11778 "ImportPage.c"
}
-static void import_page_import_reporter (ImportPage* self, ImportManifest* manifest) {
+static void
+import_page_import_reporter (ImportPage* self,
+ ImportManifest* manifest)
+{
ImportPage* local_ref = NULL;
ImportPage* _tmp0_;
ImportPage* _tmp1_;
- ImportManifest* _tmp2_;
- GeeList* _tmp3_;
+ GeeList* _tmp2_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
Marker* marker = NULL;
- SourceCollection* _tmp55_;
- Marker* _tmp56_;
+ SourceCollection* _tmp42_;
+ Marker* _tmp43_;
ProgressDialog* progress = NULL;
- AppWindow* _tmp76_;
- AppWindow* _tmp77_;
- GCancellable* _tmp78_;
- GCancellable* _tmp79_;
- ProgressDialog* _tmp80_;
- ProgressDialog* _tmp81_;
+ AppWindow* _tmp62_;
+ AppWindow* _tmp63_;
+ GCancellable* _tmp64_;
+ GCancellable* _tmp65_;
+ ProgressDialog* _tmp66_;
+ ProgressDialog* _tmp67_;
gint error_count = 0;
- SourceCollection* _tmp82_;
- Marker* _tmp83_;
- ProgressDialog* _tmp84_;
- gint _tmp85_;
- gint _tmp86_;
- ProgressDialog* _tmp91_;
+ SourceCollection* _tmp68_;
+ Marker* _tmp69_;
+ ProgressDialog* _tmp70_;
+ gint _tmp71_;
+ ProgressDialog* _tmp76_;
#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11656,180 +11826,145 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->local_ref = NULL;
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = manifest;
+ _tmp2_ = manifest->success;
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _tmp2_->success;
+ _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp5_ > 0) {
-#line 11662 "ImportPage.c"
+ if (_tmp4_ > 0) {
+#line 11830 "ImportPage.c"
gchar* photos_string = NULL;
- ImportManifest* _tmp6_;
- GeeList* _tmp7_;
- gint _tmp8_;
+ GeeList* _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
+ GeeList* _tmp8_;
gint _tmp9_;
- ImportManifest* _tmp10_;
- GeeList* _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
- gchar* _tmp14_;
+ gint _tmp10_;
+ gchar* _tmp11_;
gchar* videos_string = NULL;
- ImportManifest* _tmp15_;
- GeeList* _tmp16_;
+ GeeList* _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
+ GeeList* _tmp15_;
+ gint _tmp16_;
gint _tmp17_;
- gint _tmp18_;
- ImportManifest* _tmp19_;
- GeeList* _tmp20_;
- gint _tmp21_;
- gint _tmp22_;
- gchar* _tmp23_;
+ gchar* _tmp18_;
gchar* both_string = NULL;
- ImportManifest* _tmp24_;
- GeeList* _tmp25_;
- gint _tmp26_;
+ GeeList* _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
+ GeeList* _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
+ gchar* _tmp25_;
+ gchar* neither_string = NULL;
+ GeeList* _tmp26_;
gint _tmp27_;
- ImportManifest* _tmp28_;
+ gint _tmp28_;
GeeList* _tmp29_;
gint _tmp30_;
gint _tmp31_;
gchar* _tmp32_;
- gchar* neither_string = NULL;
- ImportManifest* _tmp33_;
- GeeList* _tmp34_;
- gint _tmp35_;
- gint _tmp36_;
- ImportManifest* _tmp37_;
- GeeList* _tmp38_;
- gint _tmp39_;
- gint _tmp40_;
- gchar* _tmp41_;
gchar* question_string = NULL;
- ImportManifest* _tmp42_;
- GeeList* _tmp43_;
- const gchar* _tmp44_;
- const gchar* _tmp45_;
- const gchar* _tmp46_;
- const gchar* _tmp47_;
- gchar* _tmp48_;
+ GeeList* _tmp33_;
+ const gchar* _tmp34_;
+ const gchar* _tmp35_;
+ const gchar* _tmp36_;
+ const gchar* _tmp37_;
+ gchar* _tmp38_;
ImportUIQuestionParams* question = NULL;
- const gchar* _tmp49_;
- ImportUIQuestionParams* _tmp50_;
- ImportManifest* _tmp51_;
- ImportUIQuestionParams* _tmp52_;
- gboolean _tmp53_;
+ const gchar* _tmp39_;
+ ImportUIQuestionParams* _tmp40_;
+ ImportUIQuestionParams* _tmp41_;
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = manifest;
+ _tmp5_ = manifest->success;
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp6_->success;
+ _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = _tmp8_;
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = manifest;
+ _tmp7_ = _tmp6_;
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = _tmp10_->success;
+ _tmp8_ = manifest->success;
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = _tmp12_;
+ _tmp10_ = _tmp9_;
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_), _tmp13_);
+ _tmp11_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp7_), _tmp10_);
#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photos_string = _tmp14_;
+ photos_string = _tmp11_;
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = manifest;
+ _tmp12_ = manifest->success;
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = _tmp15_->success;
+ _tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp14_ = _tmp13_;
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = _tmp17_;
+ _tmp15_ = manifest->success;
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = manifest;
+ _tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = _tmp19_->success;
-#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = _tmp21_;
+ _tmp17_ = _tmp16_;
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp18_), _tmp22_);
+ _tmp18_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp14_), _tmp17_);
#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- videos_string = _tmp23_;
+ videos_string = _tmp18_;
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = manifest;
+ _tmp19_ = manifest->success;
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = _tmp24_->success;
+ _tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp21_ = _tmp20_;
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = _tmp26_;
+ _tmp22_ = manifest->success;
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = manifest;
+ _tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = _tmp28_->success;
+ _tmp24_ = _tmp23_;
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp25_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp21_), _tmp24_);
#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp31_ = _tmp30_;
-#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp27_), _tmp31_);
-#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- both_string = _tmp32_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = manifest;
+ both_string = _tmp25_;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = _tmp33_->success;
+ _tmp26_ = manifest->success;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp37_ = manifest;
+ _tmp28_ = _tmp27_;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp38_ = _tmp37_->success;
+ _tmp29_ = manifest->success;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp39_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp40_ = _tmp39_;
+ _tmp31_ = _tmp30_;
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp41_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp36_), _tmp40_);
+ _tmp32_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp28_), _tmp31_);
#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- neither_string = _tmp41_;
+ neither_string = _tmp32_;
#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp42_ = manifest;
+ _tmp33_ = manifest->success;
#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp43_ = _tmp42_->success;
+ _tmp34_ = photos_string;
#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp44_ = photos_string;
+ _tmp35_ = videos_string;
#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp45_ = videos_string;
+ _tmp36_ = both_string;
#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp46_ = both_string;
+ _tmp37_ = neither_string;
#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp47_ = neither_string;
+ _tmp38_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_, _tmp35_, _tmp36_, _tmp37_);
#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp48_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_, _tmp45_, _tmp46_, _tmp47_);
-#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- question_string = _tmp48_;
+ question_string = _tmp38_;
#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp49_ = question_string;
+ _tmp39_ = question_string;
#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp50_ = import_ui_question_params_new (_tmp49_, RESOURCES_DELETE_LABEL, _ ("_Keep"));
+ _tmp40_ = import_ui_question_params_new (_tmp39_, RESOURCES_DELETE_LABEL, _ ("_Keep"));
#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- question = _tmp50_;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp51_ = manifest;
+ question = _tmp40_;
#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp52_ = question;
+ _tmp41_ = question;
#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp53_ = import_ui_report_manifest (_tmp51_, FALSE, _tmp52_);
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp53_) {
+ if (!import_ui_report_manifest (manifest, FALSE, _tmp41_)) {
#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_ui_question_params_unref0 (question);
#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11846,7 +11981,7 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_g_object_unref0 (local_ref);
#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11843 "ImportPage.c"
+#line 11978 "ImportPage.c"
}
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_import_ui_question_params_unref0 (question);
@@ -11860,184 +11995,176 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_g_free0 (videos_string);
#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (photos_string);
-#line 11857 "ImportPage.c"
+#line 11992 "ImportPage.c"
} else {
- ImportManifest* _tmp54_;
-#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp54_ = manifest;
#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_ui_report_manifest (_tmp54_, FALSE, NULL);
+ import_ui_report_manifest (manifest, FALSE, NULL);
#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return;
-#line 11868 "ImportPage.c"
+#line 12000 "ImportPage.c"
}
#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp55_ = self->priv->import_sources;
+ _tmp42_ = self->priv->import_sources;
#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp56_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp43_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_DATA_COLLECTION, DataCollection));
#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- marker = _tmp56_;
-#line 11876 "ImportPage.c"
+ marker = _tmp43_;
+#line 12008 "ImportPage.c"
{
GeeList* _batch_result_list = NULL;
- ImportManifest* _tmp57_;
- GeeList* _tmp58_;
- GeeList* _tmp59_;
+ GeeList* _tmp44_;
+ GeeList* _tmp45_;
gint _batch_result_size = 0;
- GeeList* _tmp60_;
- gint _tmp61_;
- gint _tmp62_;
+ GeeList* _tmp46_;
+ gint _tmp47_;
+ gint _tmp48_;
gint _batch_result_index = 0;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp57_ = manifest;
-#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp58_ = _tmp57_->success;
+ _tmp44_ = manifest->success;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp59_ = _g_object_ref0 (_tmp58_);
+ _tmp45_ = _g_object_ref0 (_tmp44_);
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_result_list = _tmp59_;
+ _batch_result_list = _tmp45_;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp60_ = _batch_result_list;
+ _tmp46_ = _batch_result_list;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp61_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp47_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp62_ = _tmp61_;
+ _tmp48_ = _tmp47_;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_result_size = _tmp62_;
+ _batch_result_size = _tmp48_;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_result_index = -1;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
while (TRUE) {
-#line 11907 "ImportPage.c"
- gint _tmp63_;
- gint _tmp64_;
- gint _tmp65_;
+#line 12036 "ImportPage.c"
+ gint _tmp49_;
+ gint _tmp50_;
+ gint _tmp51_;
BatchImportResult* batch_result = NULL;
- GeeList* _tmp66_;
- gint _tmp67_;
- gpointer _tmp68_;
+ GeeList* _tmp52_;
+ gint _tmp53_;
+ gpointer _tmp54_;
ImportPageCameraImportJob* job = NULL;
- BatchImportResult* _tmp69_;
- BatchImportJob* _tmp70_;
- ImportPageCameraImportJob* _tmp71_;
- Marker* _tmp72_;
- ImportPageCameraImportJob* _tmp73_;
- ImportSource* _tmp74_;
- ImportSource* _tmp75_;
+ BatchImportResult* _tmp55_;
+ BatchImportJob* _tmp56_;
+ ImportPageCameraImportJob* _tmp57_;
+ Marker* _tmp58_;
+ ImportPageCameraImportJob* _tmp59_;
+ ImportSource* _tmp60_;
+ ImportSource* _tmp61_;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp63_ = _batch_result_index;
+ _tmp49_ = _batch_result_index;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _batch_result_index = _tmp63_ + 1;
+ _batch_result_index = _tmp49_ + 1;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp64_ = _batch_result_index;
+ _tmp50_ = _batch_result_index;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp65_ = _batch_result_size;
+ _tmp51_ = _batch_result_size;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!(_tmp64_ < _tmp65_)) {
+ if (!(_tmp50_ < _tmp51_)) {
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
break;
-#line 11935 "ImportPage.c"
+#line 12064 "ImportPage.c"
}
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp66_ = _batch_result_list;
+ _tmp52_ = _batch_result_list;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp67_ = _batch_result_index;
+ _tmp53_ = _batch_result_index;
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp68_ = gee_list_get (_tmp66_, _tmp67_);
+ _tmp54_ = gee_list_get (_tmp52_, _tmp53_);
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- batch_result = (BatchImportResult*) _tmp68_;
+ batch_result = (BatchImportResult*) _tmp54_;
#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp69_ = batch_result;
+ _tmp55_ = batch_result;
#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp70_ = _tmp69_->job;
+ _tmp56_ = _tmp55_->job;
#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp71_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp70_) : NULL);
+ _tmp57_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp56_) : NULL);
#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- job = _tmp71_;
+ job = _tmp57_;
#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp72_ = marker;
+ _tmp58_ = marker;
#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp73_ = job;
+ _tmp59_ = job;
#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp74_ = import_page_camera_import_job_get_source (_tmp73_);
+ _tmp60_ = import_page_camera_import_job_get_source (_tmp59_);
#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp75_ = _tmp74_;
+ _tmp61_ = _tmp60_;
#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- marker_mark (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_OBJECT, DataObject));
+ marker_mark (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_OBJECT, DataObject));
#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp75_);
+ _g_object_unref0 (_tmp61_);
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (job);
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_result_unref0 (batch_result);
-#line 11969 "ImportPage.c"
+#line 12098 "ImportPage.c"
}
#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_batch_result_list);
-#line 11973 "ImportPage.c"
+#line 12102 "ImportPage.c"
}
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp76_ = app_window_get_instance ();
+ _tmp62_ = app_window_get_instance ();
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp77_ = _tmp76_;
+ _tmp63_ = _tmp62_;
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp78_ = g_cancellable_new ();
+ _tmp64_ = g_cancellable_new ();
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp79_ = _tmp78_;
+ _tmp65_ = _tmp64_;
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp80_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp79_);
+ _tmp66_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp65_);
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_object_ref_sink (_tmp80_);
+ g_object_ref_sink (_tmp66_);
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp81_ = _tmp80_;
+ _tmp67_ = _tmp66_;
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp79_);
+ _g_object_unref0 (_tmp65_);
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp77_);
+ _g_object_unref0 (_tmp63_);
#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- progress = _tmp81_;
+ progress = _tmp67_;
#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp82_ = self->priv->import_sources;
+ _tmp68_ = self->priv->import_sources;
#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp83_ = marker;
+ _tmp69_ = marker;
#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp84_ = progress;
+ _tmp70_ = progress;
#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp85_ = source_collection_destroy_marked (_tmp82_, _tmp83_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp84_, NULL);
-#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- error_count = _tmp85_;
+ error_count = source_collection_destroy_marked (_tmp68_, _tmp69_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp70_, NULL);
#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp86_ = error_count;
+ _tmp71_ = error_count;
#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp86_ > 0) {
-#line 12009 "ImportPage.c"
+ if (_tmp71_ > 0) {
+#line 12136 "ImportPage.c"
gchar* error_string = NULL;
- gint _tmp87_;
- gint _tmp88_;
- gchar* _tmp89_;
- const gchar* _tmp90_;
+ gint _tmp72_;
+ gint _tmp73_;
+ gchar* _tmp74_;
+ const gchar* _tmp75_;
#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp87_ = error_count;
+ _tmp72_ = error_count;
#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp88_ = error_count;
+ _tmp73_ = error_count;
#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp89_ = g_strdup_printf (ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp87_), _tmp88_);
+ _tmp74_ = 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) _tmp72_), _tmp73_);
#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- error_string = _tmp89_;
+ error_string = _tmp74_;
#line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp90_ = error_string;
+ _tmp75_ = error_string;
#line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- app_window_error_message (_tmp90_, NULL);
+ app_window_error_message (_tmp75_, NULL);
#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (error_string);
-#line 12029 "ImportPage.c"
+#line 12156 "ImportPage.c"
}
#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp91_ = progress;
+ _tmp76_ = progress;
#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- progress_dialog_close (_tmp91_);
+ progress_dialog_close (_tmp76_);
#line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
#line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12048,18 +12175,19 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
_g_object_unref0 (marker);
#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (local_ref);
-#line 12045 "ImportPage.c"
+#line 12172 "ImportPage.c"
}
-static void import_page_close_import (ImportPage* self) {
+static void
+import_page_close_import (ImportPage* self)
+{
int res = 0;
Camera* _tmp0_;
GPSpinIdleWrapper* _tmp1_;
GPContext* _tmp2_;
int _tmp3_;
- int _tmp4_;
- gboolean _tmp8_;
+ gboolean _tmp7_;
#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_if_fail (IS_IMPORT_PAGE (self));
#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12069,65 +12197,64 @@ static void import_page_close_import (ImportPage* self) {
#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = gp_camera_exit (_tmp0_, _tmp2_);
-#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- res = _tmp3_;
+ res = gp_camera_exit (_tmp0_, _tmp2_);
#line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = res;
+ _tmp3_ = res;
#line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp4_ != GP_OK) {
-#line 12073 "ImportPage.c"
- int _tmp5_;
+ if (_tmp3_ != GP_OK) {
+#line 12199 "ImportPage.c"
+ int _tmp4_;
+ gchar* _tmp5_;
gchar* _tmp6_;
- gchar* _tmp7_;
#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = res;
+ _tmp4_ = res;
#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = gp_result_to_full_string (_tmp5_);
+ _tmp5_ = gp_result_to_full_string (_tmp4_);
#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- g_message ("ImportPage.vala:1812: Unable to unlock camera: %s", _tmp7_);
+ g_message ("ImportPage.vala:1812: Unable to unlock camera: %s", _tmp6_);
#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_free0 (_tmp7_);
-#line 12087 "ImportPage.c"
+ _g_free0 (_tmp6_);
+#line 12213 "ImportPage.c"
}
#line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = self->priv->refreshed;
+ _tmp7_ = self->priv->refreshed;
#line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- import_page_update_status (self, FALSE, _tmp8_);
+ import_page_update_status (self, FALSE, _tmp7_);
#line 1817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_on_view_changed (self);
-#line 12095 "ImportPage.c"
+#line 12221 "ImportPage.c"
}
-static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display) {
+static void
+import_page_real_set_display_titles (CheckerboardPage* base,
+ gboolean display)
+{
ImportPage * self;
- gboolean _tmp0_;
- gboolean _tmp1_;
#line 1820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
#line 1821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = display;
-#line 1821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- CHECKERBOARD_PAGE_CLASS (import_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_);
+ CHECKERBOARD_PAGE_CLASS (import_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
#line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = display;
-#line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 12113 "ImportPage.c"
+ page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", display);
+#line 12236 "ImportPage.c"
}
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self ? view_filter_ref (self) : NULL;
-#line 12120 "ImportPage.c"
+#line 12245 "ImportPage.c"
}
-static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+import_page_real_get_search_view_filter (CheckerboardPage* base)
+{
ImportPage * self;
SearchViewFilter* result = NULL;
ImportPageImportPageSearchViewFilter* _tmp0_;
@@ -12142,61 +12269,65 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
result = _tmp1_;
#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12139 "ImportPage.c"
+#line 12266 "ImportPage.c"
}
-static ImportPageImportViewManager* import_page_import_view_manager_construct (GType object_type, ImportPage* owner) {
+static ImportPageImportViewManager*
+import_page_import_view_manager_construct (GType object_type,
+ ImportPage* owner)
+{
ImportPageImportViewManager* self = 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"
self = (ImportPageImportViewManager*) view_manager_construct (object_type);
#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = owner;
-#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (owner);
#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->owner);
#line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->owner = _tmp1_;
+ self->priv->owner = _tmp0_;
#line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 12161 "ImportPage.c"
+#line 12288 "ImportPage.c"
}
-static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) {
+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 12168 "ImportPage.c"
+#line 12297 "ImportPage.c"
}
-static DataView* import_page_import_view_manager_real_create_view (ViewManager* base, DataSource* source) {
+static DataView*
+import_page_import_view_manager_real_create_view (ViewManager* base,
+ DataSource* source)
+{
ImportPageImportViewManager * self;
DataView* result = NULL;
- DataSource* _tmp0_;
- ImportPreview* _tmp1_;
+ ImportPreview* _tmp0_;
#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"
g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = source;
+ _tmp0_ = import_preview_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_IMPORT_SOURCE, ImportSource));
#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = import_preview_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView);
#line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12189 "ImportPage.c"
+#line 12318 "ImportPage.c"
}
-static void import_page_import_view_manager_class_init (ImportPageImportViewManagerClass * klass) {
+static void
+import_page_import_view_manager_class_init (ImportPageImportViewManagerClass * klass)
+{
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import_view_manager_parent_class = g_type_class_peek_parent (klass);
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12205,18 +12336,22 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana
g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
#line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) import_page_import_view_manager_real_create_view;
-#line 12202 "ImportPage.c"
+#line 12333 "ImportPage.c"
}
-static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) {
+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 12209 "ImportPage.c"
+#line 12342 "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);
@@ -12224,11 +12359,13 @@ 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 12221 "ImportPage.c"
+#line 12356 "ImportPage.c"
}
-static GType import_page_import_view_manager_get_type (void) {
+static GType
+import_page_import_view_manager_get_type (void)
+{
static volatile gsize import_page_import_view_manager_type_id__volatile = 0;
if (g_once_init_enter (&import_page_import_view_manager_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportPageImportViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_import_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageImportViewManager), 0, (GInstanceInitFunc) import_page_import_view_manager_instance_init, NULL };
@@ -12240,35 +12377,31 @@ static GType import_page_import_view_manager_get_type (void) {
}
-static gpointer _gp_context_wrapper_ref0 (gpointer self) {
+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 12240 "ImportPage.c"
+#line 12379 "ImportPage.c"
}
-static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType object_type, GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
+static ImportPageCameraImportJob*
+import_page_camera_import_job_construct (GType object_type,
+ GPContextWrapper* context,
+ ImportSource* import_file,
+ DuplicatedFile* duplicated_file)
+{
ImportPageCameraImportJob* self = NULL;
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_;
- PhotoMetadata* _tmp19_;
- ImportSource* _tmp20_;
- time_t _tmp21_;
+ ImportSource* _tmp1_;
+ DuplicatedFile* _tmp2_;
+ Camera* _tmp3_;
+ gchar* _tmp4_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ PhotoMetadata* _tmp7_ = NULL;
+ PhotoMetadata* _tmp9_;
#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"
@@ -12278,114 +12411,95 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportPageCameraImportJob*) batch_import_job_construct (object_type);
#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = context;
-#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _gp_context_wrapper_ref0 (_tmp0_);
+ _tmp0_ = _gp_context_wrapper_ref0 (context);
#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_context_wrapper_unref0 (self->priv->context);
#line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->context = _tmp1_;
-#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = import_file;
+ self->priv->context = _tmp0_;
#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (import_file);
#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->import_file);
#line 496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->import_file = _tmp3_;
-#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = duplicated_file;
+ self->priv->import_file = _tmp1_;
#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = _g_object_ref0 (_tmp4_);
+ _tmp2_ = _g_object_ref0 (duplicated_file);
#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (self->priv->duplicated_file);
#line 497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->duplicated_file = _tmp5_;
+ self->priv->duplicated_file = _tmp2_;
#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = import_file;
-#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = import_source_get_camera (_tmp6_);
+ _tmp3_ = import_source_get_camera (import_file);
#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_gp_camera_unref0 (self->priv->camera);
#line 500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->camera = _tmp7_;
-#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = import_file;
+ self->priv->camera = _tmp3_;
#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = import_source_get_fulldir (_tmp8_);
+ _tmp4_ = import_source_get_fulldir (import_file);
#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->fulldir);
#line 501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->fulldir = _tmp9_;
+ self->priv->fulldir = _tmp4_;
#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = self->priv->fulldir;
+ _tmp5_ = self->priv->fulldir;
#line 503 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _vala_assert (_tmp10_ != NULL, "fulldir != null");
-#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = import_file;
+ _vala_assert (_tmp5_ != NULL, "fulldir != null");
#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = import_source_get_filename (_tmp11_);
+ _tmp6_ = import_source_get_filename (import_file);
#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_free0 (self->priv->filename);
#line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->filename = _tmp12_;
-#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = import_file;
+ self->priv->filename = _tmp6_;
#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = import_source_get_filesize (_tmp13_);
-#line 505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->filesize = (guint64) _tmp14_;
-#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = import_file;
+ self->priv->filesize = (guint64) import_source_get_filesize (import_file);
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 12336 "ImportPage.c"
- ImportSource* _tmp17_;
- PhotoMetadata* _tmp18_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (import_file, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 12451 "ImportPage.c"
+ PhotoMetadata* _tmp8_;
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = import_file;
+ _tmp8_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_TYPE (import_file, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) import_file) : NULL);
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp17_) : NULL);
+ _media_metadata_unref0 (_tmp7_);
#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_ = _tmp18_;
-#line 12347 "ImportPage.c"
+ _tmp7_ = _tmp8_;
+#line 12459 "ImportPage.c"
} else {
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _media_metadata_unref0 (_tmp15_);
+ _media_metadata_unref0 (_tmp7_);
#line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = NULL;
-#line 12353 "ImportPage.c"
+ _tmp7_ = NULL;
+#line 12465 "ImportPage.c"
}
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _media_metadata_ref0 (_tmp15_);
+ _tmp9_ = _media_metadata_ref0 (_tmp7_);
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_media_metadata_unref0 (self->priv->metadata);
#line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->metadata = _tmp19_;
-#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = import_file;
-#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = import_source_get_exposure_time (_tmp20_);
+ self->priv->metadata = _tmp9_;
#line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->exposure_time = _tmp21_;
+ self->priv->exposure_time = import_source_get_exposure_time (import_file);
#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _media_metadata_unref0 (_tmp15_);
+ _media_metadata_unref0 (_tmp7_);
#line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 12371 "ImportPage.c"
+#line 12479 "ImportPage.c"
}
-static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
+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 12378 "ImportPage.c"
+#line 12490 "ImportPage.c"
}
-static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self) {
+static time_t
+import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self)
+{
time_t result = 0;
time_t _tmp0_;
#line 511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12396,11 +12510,13 @@ 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 12393 "ImportPage.c"
+#line 12507 "ImportPage.c"
}
-static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base) {
+static DuplicatedFile*
+import_page_camera_import_job_real_get_duplicated_file (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
DuplicatedFile* result = NULL;
DuplicatedFile* _tmp0_;
@@ -12415,11 +12531,13 @@ 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 12412 "ImportPage.c"
+#line 12528 "ImportPage.c"
}
-static time_t import_page_camera_import_job_real_get_exposure_time_override (BatchImportJob* base) {
+static time_t
+import_page_camera_import_job_real_get_exposure_time_override (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
time_t result = 0;
time_t _tmp0_ = 0;
@@ -12430,27 +12548,25 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
_tmp1_ = self->priv->import_file;
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 12427 "ImportPage.c"
- time_t _tmp2_;
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = import_page_camera_import_job_get_exposure_time (self);
-#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = _tmp2_;
-#line 12433 "ImportPage.c"
+ _tmp0_ = import_page_camera_import_job_get_exposure_time (self);
+#line 12547 "ImportPage.c"
} else {
#line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp0_ = (time_t) 0;
-#line 12437 "ImportPage.c"
+#line 12551 "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 12443 "ImportPage.c"
+#line 12557 "ImportPage.c"
}
-static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImportJob* base) {
+static gchar*
+import_page_camera_import_job_real_get_dest_identifier (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -12465,11 +12581,13 @@ 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 12462 "ImportPage.c"
+#line 12578 "ImportPage.c"
}
-static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base) {
+static gchar*
+import_page_camera_import_job_real_get_source_identifier (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
gchar* result = NULL;
ImportSource* _tmp0_;
@@ -12484,11 +12602,13 @@ 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 12481 "ImportPage.c"
+#line 12599 "ImportPage.c"
}
-static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* base) {
+static gchar*
+import_page_camera_import_job_real_get_basename (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -12503,11 +12623,13 @@ 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 12500 "ImportPage.c"
+#line 12620 "ImportPage.c"
}
-static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base) {
+static gchar*
+import_page_camera_import_job_real_get_path (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -12522,31 +12644,33 @@ 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 12519 "ImportPage.c"
+#line 12641 "ImportPage.c"
}
-static void import_page_camera_import_job_real_set_associated (BatchImportJob* base, BatchImportJob* associated) {
+static void
+import_page_camera_import_job_real_set_associated (BatchImportJob* base,
+ BatchImportJob* associated)
+{
ImportPageCameraImportJob * self;
- BatchImportJob* _tmp0_;
- ImportPageCameraImportJob* _tmp1_;
+ ImportPageCameraImportJob* _tmp0_;
#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"
g_return_if_fail (IS_BATCH_IMPORT_JOB (associated));
#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = associated;
-#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp0_) : NULL);
+ _tmp0_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (associated, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) associated) : NULL);
#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_batch_import_job_unref0 (self->priv->associated);
#line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- self->priv->associated = _tmp1_;
-#line 12539 "ImportPage.c"
+ self->priv->associated = _tmp0_;
+#line 12661 "ImportPage.c"
}
-static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraImportJob* self) {
+static ImportSource*
+import_page_camera_import_job_get_source (ImportPageCameraImportJob* self)
+{
ImportSource* result = NULL;
ImportSource* _tmp0_;
ImportSource* _tmp1_;
@@ -12560,11 +12684,13 @@ 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 12557 "ImportPage.c"
+#line 12681 "ImportPage.c"
}
-static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob* base) {
+static gboolean
+import_page_camera_import_job_real_is_directory (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
gboolean result = FALSE;
#line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12573,11 +12699,15 @@ 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 12570 "ImportPage.c"
+#line 12696 "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;
@@ -12599,25 +12729,30 @@ 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 12596 "ImportPage.c"
+#line 12726 "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 12602 "ImportPage.c"
+#line 12732 "ImportPage.c"
} else {
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file);
-#line 12606 "ImportPage.c"
+#line 12736 "ImportPage.c"
}
#line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12610 "ImportPage.c"
+#line 12740 "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;
@@ -12639,7 +12774,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_vala_copy_to_library = FALSE;
#line 562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
dest_file = NULL;
-#line 12636 "ImportPage.c"
+#line 12771 "ImportPage.c"
{
gboolean collision = FALSE;
GFile* _tmp0_ = NULL;
@@ -12663,7 +12798,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp0_ = _tmp5_;
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12660 "ImportPage.c"
+#line 12795 "ImportPage.c"
goto __catch81_g_error;
}
#line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12676,7 +12811,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
dest_file = _tmp6_;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_tmp0_);
-#line 12673 "ImportPage.c"
+#line 12808 "ImportPage.c"
}
goto __finally81;
__catch81_g_error:
@@ -12707,12 +12842,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 12704 "ImportPage.c"
+#line 12839 "ImportPage.c"
}
__finally81:
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12709 "ImportPage.c"
+#line 12844 "ImportPage.c"
gboolean _tmp12_ = FALSE;
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12720,13 +12855,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp12_;
-#line 12717 "ImportPage.c"
+#line 12852 "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 12723 "ImportPage.c"
+#line 12858 "ImportPage.c"
ImportSource* _tmp14_;
gchar* _tmp15_;
gchar* _tmp16_;
@@ -12748,27 +12883,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
if (file_to_import) {
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
*file_to_import = _vala_file_to_import;
-#line 12745 "ImportPage.c"
+#line 12880 "ImportPage.c"
} else {
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12749 "ImportPage.c"
+#line 12884 "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 12755 "ImportPage.c"
+#line 12890 "ImportPage.c"
}
#line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12759 "ImportPage.c"
+#line 12894 "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 12765 "ImportPage.c"
+#line 12900 "ImportPage.c"
{
GPContextWrapper* _tmp18_;
GPContext* _tmp19_;
@@ -12792,7 +12927,7 @@ 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 12789 "ImportPage.c"
+#line 12924 "ImportPage.c"
goto __finally82;
}
}
@@ -12803,11 +12938,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp24_ = dest_file;
#line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_unblacklist_file (_tmp24_);
-#line 12800 "ImportPage.c"
+#line 12935 "ImportPage.c"
}
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12804 "ImportPage.c"
+#line 12939 "ImportPage.c"
gboolean _tmp25_ = FALSE;
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12815,13 +12950,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp25_;
-#line 12812 "ImportPage.c"
+#line 12947 "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 12818 "ImportPage.c"
+#line 12953 "ImportPage.c"
BackingPhotoRow* _tmp42_;
GFile* assoc_dest = NULL;
BackingPhotoRow* _tmp45_;
@@ -12863,7 +12998,7 @@ 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 12860 "ImportPage.c"
+#line 12995 "ImportPage.c"
goto __catch83_g_error;
}
#line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12876,7 +13011,7 @@ 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 12873 "ImportPage.c"
+#line 13008 "ImportPage.c"
}
goto __finally83;
__catch83_g_error:
@@ -12903,12 +13038,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 12899 "ImportPage.c"
+#line 13034 "ImportPage.c"
}
__finally83:
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12904 "ImportPage.c"
+#line 13039 "ImportPage.c"
gboolean _tmp41_ = FALSE;
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -12916,13 +13051,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_g_object_unref0 (dest_file);
#line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return _tmp41_;
-#line 12912 "ImportPage.c"
+#line 13047 "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 12918 "ImportPage.c"
+#line 13053 "ImportPage.c"
ImportPageCameraImportJob* _tmp43_;
const gchar* _tmp44_;
#line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12939,21 +13074,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 12935 "ImportPage.c"
+#line 13070 "ImportPage.c"
} else {
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 12939 "ImportPage.c"
+#line 13074 "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 12945 "ImportPage.c"
+#line 13080 "ImportPage.c"
}
#line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 12949 "ImportPage.c"
+#line 13084 "ImportPage.c"
}
#line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp45_ = self->priv->associated_file;
@@ -12967,7 +13102,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp48_ = assoc_dest;
#line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare");
-#line 12963 "ImportPage.c"
+#line 13098 "ImportPage.c"
{
GPContextWrapper* _tmp49_;
GPContext* _tmp50_;
@@ -12997,7 +13132,7 @@ 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 12993 "ImportPage.c"
+#line 13128 "ImportPage.c"
goto __finally84;
}
}
@@ -13008,11 +13143,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
_tmp57_ = assoc_dest;
#line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
library_monitor_unblacklist_file (_tmp57_);
-#line 13004 "ImportPage.c"
+#line 13139 "ImportPage.c"
}
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13008 "ImportPage.c"
+#line 13143 "ImportPage.c"
gboolean _tmp58_ = FALSE;
#line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_propagate_error (error, _inner_error_);
@@ -13022,11 +13157,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 13018 "ImportPage.c"
+#line 13153 "ImportPage.c"
}
#line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (assoc_dest);
-#line 13022 "ImportPage.c"
+#line 13157 "ImportPage.c"
}
#line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp59_ = dest_file;
@@ -13046,25 +13181,27 @@ 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 13042 "ImportPage.c"
+#line 13177 "ImportPage.c"
} else {
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (_vala_file_to_import);
-#line 13046 "ImportPage.c"
+#line 13181 "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 13052 "ImportPage.c"
+#line 13187 "ImportPage.c"
}
#line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13056 "ImportPage.c"
+#line 13191 "ImportPage.c"
}
-static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base) {
+static GFile*
+import_page_camera_import_job_real_get_associated_file (BatchImportJob* base)
+{
ImportPageCameraImportJob * self;
GFile* result = NULL;
BackingPhotoRow* _tmp0_;
@@ -13081,7 +13218,7 @@ static GFile* import_page_camera_import_job_real_get_associated_file (BatchImpor
result = NULL;
#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13077 "ImportPage.c"
+#line 13214 "ImportPage.c"
}
#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_tmp1_ = self->priv->associated_file;
@@ -13093,11 +13230,13 @@ static GFile* import_page_camera_import_job_real_get_associated_file (BatchImpor
result = _tmp3_;
#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13089 "ImportPage.c"
+#line 13226 "ImportPage.c"
}
-static void import_page_camera_import_job_class_init (ImportPageCameraImportJobClass * klass) {
+static void
+import_page_camera_import_job_class_init (ImportPageCameraImportJobClass * klass)
+{
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_camera_import_job_parent_class = g_type_class_peek_parent (klass);
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13126,22 +13265,26 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC
((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)->get_associated_file = (GFile* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_associated_file;
-#line 13122 "ImportPage.c"
+#line 13261 "ImportPage.c"
}
-static void import_page_camera_import_job_instance_init (ImportPageCameraImportJob * self) {
+static void
+import_page_camera_import_job_instance_init (ImportPageCameraImportJob * self)
+{
#line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv = IMPORT_PAGE_CAMERA_IMPORT_JOB_GET_PRIVATE (self);
#line 489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->associated = NULL;
#line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->associated_file = NULL;
-#line 13133 "ImportPage.c"
+#line 13274 "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);
@@ -13165,11 +13308,13 @@ 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 13161 "ImportPage.c"
+#line 13304 "ImportPage.c"
}
-static GType import_page_camera_import_job_get_type (void) {
+static GType
+import_page_camera_import_job_get_type (void)
+{
static volatile gsize import_page_camera_import_job_type_id__volatile = 0;
if (g_once_init_enter (&import_page_camera_import_job_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportPageCameraImportJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_camera_import_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageCameraImportJob), 0, (GInstanceInitFunc) import_page_camera_import_job_instance_init, NULL };
@@ -13181,7 +13326,9 @@ static GType import_page_camera_import_job_get_type (void) {
}
-static guint import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+import_page_import_page_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
ImportPageImportPageSearchViewFilter * self;
guint result = 0U;
#line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13190,158 +13337,147 @@ static guint import_page_import_page_search_view_filter_real_get_criteria (Searc
result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA);
#line 630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13186 "ImportPage.c"
+#line 13333 "ImportPage.c"
}
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+ const gchar* needle)
+{
gboolean result = FALSE;
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 13206 "ImportPage.c"
+#line 13353 "ImportPage.c"
}
-static gboolean import_page_import_page_search_view_filter_real_predicate (ViewFilter* base, DataView* view) {
+static gboolean
+import_page_import_page_search_view_filter_real_predicate (ViewFilter* base,
+ DataView* view)
+{
ImportPageImportPageSearchViewFilter * self;
gboolean result = FALSE;
ImportSource* source = NULL;
- DataView* _tmp0_;
- ImportSource* _tmp1_;
- gboolean _tmp2_ = FALSE;
- guint _tmp3_;
- guint _tmp26_;
+ ImportSource* _tmp0_;
+ gboolean _tmp1_ = FALSE;
#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER, ImportPageImportPageSearchViewFilter);
#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = view;
-#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
+ _tmp0_ = import_preview_get_import_source (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_IMPORT_PREVIEW, ImportPreview));
#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- source = _tmp1_;
-#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp3_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 13233 "ImportPage.c"
- gboolean _tmp4_;
+ source = _tmp0_;
#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp4_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+ if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)))) {
#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = _tmp4_;
-#line 13239 "ImportPage.c"
+ _tmp1_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+#line 13378 "ImportPage.c"
} else {
#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp2_ = FALSE;
-#line 13243 "ImportPage.c"
+ _tmp1_ = FALSE;
+#line 13382 "ImportPage.c"
}
#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp2_) {
-#line 13247 "ImportPage.c"
- ImportSource* _tmp5_;
+ if (_tmp1_) {
+#line 13386 "ImportPage.c"
+ ImportSource* _tmp2_;
#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp5_ = source;
+ _tmp2_ = source;
#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13253 "ImportPage.c"
- gboolean _tmp6_;
- gboolean _tmp7_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 13392 "ImportPage.c"
+ gboolean _tmp3_;
+ gboolean _tmp4_;
#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp6_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+ _tmp3_ = search_view_filter_get_show_media_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp4_ = _tmp3_;
#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp7_) {
+ if (!_tmp4_) {
#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13268 "ImportPage.c"
+#line 13407 "ImportPage.c"
}
} else {
- ImportSource* _tmp8_;
+ ImportSource* _tmp5_;
#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp8_ = source;
+ _tmp5_ = source;
#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13276 "ImportPage.c"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 13415 "ImportPage.c"
PhotoImportSource* photo = NULL;
- ImportSource* _tmp9_;
- PhotoImportSource* _tmp10_;
- PhotoImportSource* _tmp11_;
- PhotoFileFormat _tmp12_;
+ ImportSource* _tmp6_;
+ PhotoImportSource* _tmp7_;
+ PhotoImportSource* _tmp8_;
#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp9_ = source;
+ _tmp6_ = source;
#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL);
+ _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp6_) : NULL);
#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- photo = _tmp10_;
-#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp11_ = photo;
+ photo = _tmp7_;
#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp12_ = photo_import_source_get_file_format (_tmp11_);
+ _tmp8_ = photo;
#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13294 "ImportPage.c"
- PhotoImportSource* _tmp13_;
- PhotoImportSource* _tmp14_;
- PhotoImportSource* _tmp15_;
- gboolean _tmp16_;
+ if (photo_import_source_get_file_format (_tmp8_) == PHOTO_FILE_FORMAT_RAW) {
+#line 13430 "ImportPage.c"
+ PhotoImportSource* _tmp9_;
+ PhotoImportSource* _tmp10_;
+ PhotoImportSource* _tmp11_;
+ gboolean _tmp12_;
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp13_ = photo;
+ _tmp9_ = photo;
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp14_ = photo_import_source_get_associated (_tmp13_);
+ _tmp10_ = photo_import_source_get_associated (_tmp9_);
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp15_ = _tmp14_;
+ _tmp11_ = _tmp10_;
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp16_ = _tmp15_ != NULL;
+ _tmp12_ = _tmp11_ != NULL;
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp11_);
#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp16_) {
-#line 13311 "ImportPage.c"
- gboolean _tmp17_ = FALSE;
- gboolean _tmp18_;
- gboolean _tmp19_;
+ if (_tmp12_) {
+#line 13447 "ImportPage.c"
+ gboolean _tmp13_ = FALSE;
+ gboolean _tmp14_;
+ gboolean _tmp15_;
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp18_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+ _tmp14_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp15_ = _tmp14_;
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp19_) {
-#line 13321 "ImportPage.c"
- gboolean _tmp20_;
- gboolean _tmp21_;
+ if (!_tmp15_) {
+#line 13457 "ImportPage.c"
+ gboolean _tmp16_;
+ gboolean _tmp17_;
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp20_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+ _tmp16_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp21_ = _tmp20_;
+ _tmp17_ = _tmp16_;
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = !_tmp21_;
-#line 13330 "ImportPage.c"
+ _tmp13_ = !_tmp17_;
+#line 13466 "ImportPage.c"
} else {
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp17_ = FALSE;
-#line 13334 "ImportPage.c"
+ _tmp13_ = FALSE;
+#line 13470 "ImportPage.c"
}
#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp17_) {
+ if (_tmp13_) {
#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13350,17 +13486,17 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13346 "ImportPage.c"
+#line 13482 "ImportPage.c"
}
} else {
- gboolean _tmp22_;
- gboolean _tmp23_;
+ gboolean _tmp18_;
+ gboolean _tmp19_;
#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp22_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+ _tmp18_ = search_view_filter_get_show_media_raw (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp23_ = _tmp22_;
+ _tmp19_ = _tmp18_;
#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp23_) {
+ if (!_tmp19_) {
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13369,18 +13505,18 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13365 "ImportPage.c"
+#line 13501 "ImportPage.c"
}
}
} else {
- gboolean _tmp24_;
- gboolean _tmp25_;
+ gboolean _tmp20_;
+ gboolean _tmp21_;
#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp24_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
+ _tmp20_ = search_view_filter_get_show_media_photos (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp25_ = _tmp24_;
+ _tmp21_ = _tmp20_;
#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp25_) {
+ if (!_tmp21_) {
#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13389,85 +13525,77 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13385 "ImportPage.c"
+#line 13521 "ImportPage.c"
}
}
#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (photo);
-#line 13390 "ImportPage.c"
+#line 13526 "ImportPage.c"
}
}
}
#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp26_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13398 "ImportPage.c"
+ if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)))) {
+#line 13532 "ImportPage.c"
const gchar* keywords = NULL;
- ImportSource* _tmp27_;
- const gchar* _tmp28_;
- const gchar* _tmp29_;
- gboolean _tmp30_;
- gint _tmp31_;
- gchar** _tmp32_;
+ ImportSource* _tmp22_;
+ const gchar* _tmp23_;
+ const gchar* _tmp24_;
+ gint _tmp25_;
+ gchar** _tmp26_;
#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp27_ = source;
+ _tmp22_ = source;
#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp28_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_INDEXABLE, Indexable));
+ _tmp23_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_INDEXABLE, Indexable));
#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- keywords = _tmp28_;
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp29_ = keywords;
+ keywords = _tmp23_;
#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp30_ = is_string_empty (_tmp29_);
+ _tmp24_ = keywords;
#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (_tmp30_) {
+ if (is_string_empty (_tmp24_)) {
#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13424 "ImportPage.c"
+#line 13555 "ImportPage.c"
}
#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp32_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp31_);
-#line 13428 "ImportPage.c"
+ _tmp26_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp25_);
+#line 13559 "ImportPage.c"
{
gchar** word_collection = NULL;
gint word_collection_length1 = 0;
gint _word_collection_size_ = 0;
gint word_it = 0;
#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- word_collection = _tmp32_;
+ word_collection = _tmp26_;
#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- word_collection_length1 = _tmp31_;
+ word_collection_length1 = _tmp25_;
#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13440 "ImportPage.c"
+ for (word_it = 0; word_it < _tmp25_; word_it = word_it + 1) {
+#line 13571 "ImportPage.c"
const gchar* word = NULL;
#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
word = word_collection[word_it];
-#line 13444 "ImportPage.c"
+#line 13575 "ImportPage.c"
{
- const gchar* _tmp33_;
- const gchar* _tmp34_;
- gboolean _tmp35_;
+ const gchar* _tmp27_;
+ const gchar* _tmp28_;
#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp33_ = keywords;
+ _tmp27_ = keywords;
#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp34_ = word;
+ _tmp28_ = word;
#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp35_ = string_contains (_tmp33_, _tmp34_);
-#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- if (!_tmp35_) {
+ if (!string_contains (_tmp27_, _tmp28_)) {
#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
result = FALSE;
#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
_g_object_unref0 (source);
#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13463 "ImportPage.c"
+#line 13591 "ImportPage.c"
}
}
}
@@ -13479,43 +13607,53 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
_g_object_unref0 (source);
#line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13475 "ImportPage.c"
+#line 13603 "ImportPage.c"
}
-static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type) {
+static ImportPageImportPageSearchViewFilter*
+import_page_import_page_search_view_filter_construct (GType object_type)
+{
ImportPageImportPageSearchViewFilter* self = NULL;
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 13485 "ImportPage.c"
+#line 13615 "ImportPage.c"
}
-static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
+static ImportPageImportPageSearchViewFilter*
+import_page_import_page_search_view_filter_new (void)
+{
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_import_page_search_view_filter_construct (IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER);
-#line 13492 "ImportPage.c"
+#line 13624 "ImportPage.c"
}
-static void import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass) {
+static void
+import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass)
+{
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_import_page_search_view_filter_parent_class = g_type_class_peek_parent (klass);
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) import_page_import_page_search_view_filter_real_get_criteria;
#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_import_page_search_view_filter_real_predicate;
-#line 13503 "ImportPage.c"
+#line 13637 "ImportPage.c"
}
-static void import_page_import_page_search_view_filter_instance_init (ImportPageImportPageSearchViewFilter * self) {
+static void
+import_page_import_page_search_view_filter_instance_init (ImportPageImportPageSearchViewFilter * self)
+{
}
-static GType import_page_import_page_search_view_filter_get_type (void) {
+static GType
+import_page_import_page_search_view_filter_get_type (void)
+{
static volatile gsize import_page_import_page_search_view_filter_type_id__volatile = 0;
if (g_once_init_enter (&import_page_import_page_search_view_filter_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportPageImportPageSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_import_page_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageImportPageSearchViewFilter), 0, (GInstanceInitFunc) import_page_import_page_search_view_filter_instance_init, NULL };
@@ -13527,58 +13665,65 @@ 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) {
+static gboolean
+import_page_hide_imported_view_filter_real_predicate (ViewFilter* base,
+ DataView* view)
+{
ImportPageHideImportedViewFilter * self;
gboolean result = FALSE;
- DataView* _tmp0_;
- gboolean _tmp1_;
#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter);
#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp0_ = view;
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- _tmp1_ = import_preview_is_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
- result = !_tmp1_;
+ result = !import_preview_is_already_imported (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_IMPORT_PREVIEW, ImportPreview));
#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return result;
-#line 13540 "ImportPage.c"
+#line 13675 "ImportPage.c"
}
-static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type) {
+static ImportPageHideImportedViewFilter*
+import_page_hide_imported_view_filter_construct (GType object_type)
+{
ImportPageHideImportedViewFilter* self = NULL;
#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return self;
-#line 13550 "ImportPage.c"
+#line 13687 "ImportPage.c"
}
-static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
+static ImportPageHideImportedViewFilter*
+import_page_hide_imported_view_filter_new (void)
+{
#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13557 "ImportPage.c"
+#line 13696 "ImportPage.c"
}
-static void import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass) {
+static void
+import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass)
+{
#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass);
#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_hide_imported_view_filter_real_predicate;
-#line 13566 "ImportPage.c"
+#line 13707 "ImportPage.c"
}
-static void import_page_hide_imported_view_filter_instance_init (ImportPageHideImportedViewFilter * self) {
+static void
+import_page_hide_imported_view_filter_instance_init (ImportPageHideImportedViewFilter * self)
+{
}
-static GType import_page_hide_imported_view_filter_get_type (void) {
+static GType
+import_page_hide_imported_view_filter_get_type (void)
+{
static volatile gsize import_page_hide_imported_view_filter_type_id__volatile = 0;
if (g_once_init_enter (&import_page_hide_imported_view_filter_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportPageHideImportedViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_hide_imported_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPageHideImportedViewFilter), 0, (GInstanceInitFunc) import_page_hide_imported_view_filter_instance_init, NULL };
@@ -13590,7 +13735,9 @@ static GType import_page_hide_imported_view_filter_get_type (void) {
}
-static void import_page_class_init (ImportPageClass * klass) {
+static void
+import_page_class_init (ImportPageClass * klass)
+{
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
import_page_parent_class = g_type_class_peek_parent (klass);
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13621,11 +13768,13 @@ static void import_page_class_init (ImportPageClass * klass) {
((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) import_page_real_get_search_view_filter;
#line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
G_OBJECT_CLASS (klass)->finalize = import_page_finalize;
-#line 13617 "ImportPage.c"
+#line 13764 "ImportPage.c"
}
-static void import_page_instance_init (ImportPage * self) {
+static void
+import_page_instance_init (ImportPage * self)
+{
GtkLabel* _tmp0_;
GtkProgressBar* _tmp1_;
ImportPageImportPageSearchViewFilter* _tmp2_;
@@ -13668,11 +13817,13 @@ static void import_page_instance_init (ImportPage * self) {
self->priv->hide_imported_filter = _tmp3_;
#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
self->priv->claim_timeout = 500;
-#line 13664 "ImportPage.c"
+#line 13813 "ImportPage.c"
}
-static void import_page_finalize (GObject * obj) {
+static void
+import_page_finalize (GObject * obj)
+{
ImportPage * self;
LibraryPhotoSourceCollection* _tmp0_;
guint _tmp1_;
@@ -13722,11 +13873,13 @@ 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 13718 "ImportPage.c"
+#line 13869 "ImportPage.c"
}
-GType import_page_get_type (void) {
+GType
+import_page_get_type (void)
+{
static volatile gsize import_page_type_id__volatile = 0;
if (g_once_init_enter (&import_page_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (ImportPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportPage), 0, (GInstanceInitFunc) import_page_instance_init, NULL };
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 10:56:44 +0000